Add latest changes from gitlab-org/gitlab@master

4 files changed, 2 insertions, 82 deletions

diff --git a/app/assets/javascripts/work_items/components/work_item_detail.vue b/app/assets/javascripts/work_items/components/work_item_detail.vue
index 9822a999ff3..c871489fc07 100644
--- a/app/assets/javascripts/work_items/components/work_item_detail.vue
+++ b/app/assets/javascripts/work_items/components/work_item_detail.vue
@@ -15,7 +15,6 @@ import { s__ } from '~/locale';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import { getParameterByName } from '~/lib/utils/url_utility';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
 import WorkItemTypeIcon from '~/work_items/components/work_item_type_icon.vue';
 import {
   i18n,
@@ -25,7 +24,6 @@ import {
   WIDGET_TYPE_START_AND_DUE_DATE,
   WIDGET_TYPE_WEIGHT,
   WIDGET_TYPE_HIERARCHY,
-  WORK_ITEM_VIEWED_STORAGE_KEY,
   WIDGET_TYPE_MILESTONE,
   WIDGET_TYPE_ITERATION,
   WORK_ITEM_TYPE_VALUE_ISSUE,
@@ -49,7 +47,6 @@ import WorkItemDueDate from './work_item_due_date.vue';
 import WorkItemAssignees from './work_item_assignees.vue';
 import WorkItemLabels from './work_item_labels.vue';
 import WorkItemMilestone from './work_item_milestone.vue';
-import WorkItemInformation from './work_item_information.vue';
 
 export default {
   i18n,
@@ -72,8 +69,6 @@ export default {
     WorkItemTitle,
     WorkItemState,
     WorkItemWeight: () => import('ee_component/work_items/components/work_item_weight.vue'),
-    WorkItemInformation,
-    LocalStorageSync,
     WorkItemTypeIcon,
     WorkItemIteration: () => import('ee_component/work_items/components/work_item_iteration.vue'),
     WorkItemMilestone,
@@ -108,7 +103,6 @@ export default {
       error: undefined,
       updateError: undefined,
       workItem: {},
-      showInfoBanner: true,
       updateInProgress: false,
     };
   },
@@ -276,18 +270,10 @@ export default {
           };
     },
   },
-  beforeDestroy() {
-    /** make sure that if the user has not even dismissed the alert ,
-     * should no be able to see the information next time and update the local storage * */
-    this.dismissBanner();
-  },
   methods: {
     isWidgetPresent(type) {
       return this.workItem?.widgets?.find((widget) => widget.type === type);
     },
-    dismissBanner() {
-      this.showInfoBanner = false;
-    },
     toggleConfidentiality(confidentialStatus) {
       this.updateInProgress = true;
       let updateMutation = updateWorkItemMutation;
@@ -341,7 +327,6 @@ export default {
       document.title = s__('404|Not found');
     },
   },
-  WORK_ITEM_VIEWED_STORAGE_KEY,
   WORK_ITEM_TYPE_VALUE_OBJECTIVE,
 };
 </script>
@@ -431,16 +416,6 @@ export default {
           @click="$emit('close')"
         />
       </div>
-      <local-storage-sync
-        v-model="showInfoBanner"
-        :storage-key="$options.WORK_ITEM_VIEWED_STORAGE_KEY"
-      >
-        <work-item-information
-          v-if="showInfoBanner && !error"
-          :show-info-banner="showInfoBanner"
-          @work-item-banner-dismissed="dismissBanner"
-        />
-      </local-storage-sync>
       <work-item-title
         v-if="workItem.title"
         :work-item-id="workItem.id"
@@ -485,7 +460,7 @@ export default {
         :work-item-type="workItemType"
         @error="updateError = $event"
       />
-      <template v-if="workItemsMvc2Enabled">
+      <template v-if="workItemsMvcEnabled">
         <work-item-milestone
           v-if="workItemMilestone"
           :work-item-id="workItem.id"
diff --git a/app/assets/javascripts/work_items/components/work_item_information.vue b/app/assets/javascripts/work_items/components/work_item_information.vue
deleted file mode 100644
index ce75cc98a75..00000000000
--- a/app/assets/javascripts/work_items/components/work_item_information.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<script>
-import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui';
-import { s__ } from '~/locale';
-import { helpPagePath } from '~/helpers/help_page_helper';
-
-export default {
-  i18n: {
-    learnTasksLinkText: s__('WorkItem|Learn about tasks.'),
-    tasksInformationTitle: s__('WorkItem|Introducing tasks'),
-    tasksInformationBody: s__(
-      'WorkItem|Use tasks to break down your work in an issue into smaller pieces. %{learnMoreLink}',
-    ),
-  },
-  helpPageLinks: {
-    tasksDocLinkPath: helpPagePath('user/tasks'),
-  },
-  components: {
-    GlAlert,
-    GlSprintf,
-    GlLink,
-  },
-  props: {
-    showInfoBanner: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
-  },
-  emits: ['work-item-banner-dismissed'],
-};
-</script>
-
-<template>
-  <section class="gl-display-block gl-mb-2">
-    <gl-alert
-      v-if="showInfoBanner"
-      variant="tip"
-      :title="$options.i18n.tasksInformationTitle"
-      data-testid="work-item-information"
-      class="gl-mt-3"
-      @dismiss="$emit('work-item-banner-dismissed')"
-    >
-      <gl-sprintf :message="$options.i18n.tasksInformationBody">
-        <template #learnMoreLink>
-          <gl-link :href="$options.helpPageLinks.tasksDocLinkPath">{{
-            $options.i18n.learnTasksLinkText
-          }}</gl-link>
-        </template>
-        ></gl-sprintf
-      >
-    </gl-alert>
-  </section>
-</template>
diff --git a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
index be1a1584a91..4fcdd19784d 100644
--- a/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
+++ b/app/assets/javascripts/work_items/components/work_item_links/work_item_links_form.vue
@@ -168,7 +168,7 @@ export default {
       return this.parentMilestone?.id;
     },
     associateMilestone() {
-      return this.parentMilestoneId && this.workItemsMvc2Enabled;
+      return this.parentMilestoneId && this.workItemsMvcEnabled;
     },
     isSubmitButtonDisabled() {
       return this.isCreateForm ? this.search.length === 0 : this.workItemsToAdd.length === 0;
diff --git a/app/assets/javascripts/work_items/constants.js b/app/assets/javascripts/work_items/constants.js
index e4a50de88e9..939cc416b9e 100644
--- a/app/assets/javascripts/work_items/constants.js
+++ b/app/assets/javascripts/work_items/constants.js
@@ -20,8 +20,6 @@ export const WIDGET_TYPE_HIERARCHY = 'HIERARCHY';
 export const WIDGET_TYPE_MILESTONE = 'MILESTONE';
 export const WIDGET_TYPE_ITERATION = 'ITERATION';
 
-export const WORK_ITEM_VIEWED_STORAGE_KEY = 'gl-show-work-item-banner';
-
 export const WORK_ITEM_TYPE_ENUM_INCIDENT = 'INCIDENT';
 export const WORK_ITEM_TYPE_ENUM_ISSUE = 'ISSUE';
 export const WORK_ITEM_TYPE_ENUM_TASK = 'TASK';