Add latest changes from gitlab-org/gitlab@master

4 files changed, 22 insertions, 53 deletions

diff --git a/app/assets/javascripts/ml/experiment_tracking/components/incubation_alert.vue b/app/assets/javascripts/ml/experiment_tracking/components/incubation_alert.vue
deleted file mode 100644
index 42f6394ed68..00000000000
--- a/app/assets/javascripts/ml/experiment_tracking/components/incubation_alert.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<script>
-import { GlAlert, GlLink } from '@gitlab/ui';
-import { __ } from '~/locale';
-
-export default {
-  i18n: {
-    titleLabel: __('Machine Learning Experiment Tracking is in Incubating Phase'),
-    contentLabel: __(
-      'GitLab incubates features to explore new use cases. These features are updated regularly, and support is limited',
-    ),
-    learnMoreLabel: __('Learn more'),
-    feedbackLabel: __('Feedback'),
-  },
-  name: 'MlopsIncubationAlert',
-  components: { GlAlert, GlLink },
-  data() {
-    return {
-      isAlertDismissed: false,
-    };
-  },
-  computed: {
-    shouldShowAlert() {
-      return !this.isAlertDismissed;
-    },
-  },
-  methods: {
-    dismissAlert() {
-      this.isAlertDismissed = true;
-    },
-  },
-};
-</script>
-
-<template>
-  <gl-alert
-    v-if="shouldShowAlert"
-    :title="$options.i18n.titleLabel"
-    variant="warning"
-    :primary-button-text="$options.i18n.feedbackLabel"
-    primary-button-link="https://gitlab.com/gitlab-org/gitlab/-/issues/381660"
-    @dismiss="dismissAlert"
-  >
-    {{ $options.i18n.contentLabel }}
-    <gl-link href="https://about.gitlab.com/handbook/engineering/incubation/" target="_blank">{{
-      $options.i18n.learnMoreLabel
-    }}</gl-link>
-  </gl-alert>
-</template>
diff --git a/app/assets/javascripts/ml/experiment_tracking/components/ml_candidate.vue b/app/assets/javascripts/ml/experiment_tracking/components/ml_candidate.vue
index 0bb2a913dec..a199b8414ba 100644
--- a/app/assets/javascripts/ml/experiment_tracking/components/ml_candidate.vue
+++ b/app/assets/javascripts/ml/experiment_tracking/components/ml_candidate.vue
@@ -1,7 +1,8 @@
 <script>
 import { GlLink } from '@gitlab/ui';
 import { __ } from '~/locale';
-import IncubationAlert from './incubation_alert.vue';
+import { FEATURE_NAME, FEATURE_FEEDBACK_ISSUE } from '~/ml/experiment_tracking/constants';
+import IncubationAlert from '~/vue_shared/components/incubation/incubation_alert.vue';
 
 export default {
   name: 'MlCandidate',
@@ -39,12 +40,17 @@ export default {
       ];
     },
   },
+  FEATURE_NAME,
+  FEATURE_FEEDBACK_ISSUE,
 };
 </script>
 
 <template>
   <div>
-    <incubation-alert />
+    <incubation-alert
+      :feature-name="$options.FEATURE_NAME"
+      :link-to-feedback-issue="$options.FEATURE_FEEDBACK_ISSUE"
+    />
 
     <h3>
       {{ $options.i18n.titleLabel }}
diff --git a/app/assets/javascripts/ml/experiment_tracking/components/ml_experiment.vue b/app/assets/javascripts/ml/experiment_tracking/components/ml_experiment.vue
index 4b3f491266d..c09aabb0d40 100644
--- a/app/assets/javascripts/ml/experiment_tracking/components/ml_experiment.vue
+++ b/app/assets/javascripts/ml/experiment_tracking/components/ml_experiment.vue
@@ -7,12 +7,14 @@ import {
   LIST_KEY_CREATED_AT,
   BASE_SORT_FIELDS,
   METRIC_KEY_PREFIX,
+  FEATURE_NAME,
+  FEATURE_FEEDBACK_ISSUE,
 } from '~/ml/experiment_tracking/constants';
 import { s__ } from '~/locale';
 import { queryToObject, setUrlParams, visitUrl } from '~/lib/utils/url_utility';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
 import KeysetPagination from '~/vue_shared/components/incubation/pagination.vue';
-import IncubationAlert from './incubation_alert.vue';
+import IncubationAlert from '~/vue_shared/components/incubation/incubation_alert.vue';
 
 export default {
   name: 'MlExperiment',
@@ -119,12 +121,17 @@ export default {
     noDataContent: s__('MlExperimentTracking|-'),
     filterCandidatesLabel: s__('MlExperimentTracking|Filter candidates'),
   },
+  FEATURE_NAME,
+  FEATURE_FEEDBACK_ISSUE,
 };
 </script>
 
 <template>
   <div>
-    <incubation-alert />
+    <incubation-alert
+      :feature-name="$options.FEATURE_NAME"
+      :link-to-feedback-issue="$options.FEATURE_FEEDBACK_ISSUE"
+    />
 
     <h3>
       {{ $options.i18n.titleLabel }}
diff --git a/app/assets/javascripts/ml/experiment_tracking/constants.js b/app/assets/javascripts/ml/experiment_tracking/constants.js
index c9bdc78b69a..4092180b988 100644
--- a/app/assets/javascripts/ml/experiment_tracking/constants.js
+++ b/app/assets/javascripts/ml/experiment_tracking/constants.js
@@ -1,4 +1,4 @@
-import { __ } from '~/locale';
+import { __, s__ } from '~/locale';
 
 export const METRIC_KEY_PREFIX = 'metric.';
 
@@ -14,3 +14,7 @@ export const BASE_SORT_FIELDS = Object.freeze([
     label: __('Created at'),
   },
 ]);
+
+export const FEATURE_NAME = s__('MlExperimentTracking|Machine learning experiment tracking');
+
+export const FEATURE_FEEDBACK_ISSUE = 'https://gitlab.com/gitlab-org/gitlab/-/issues/381660';