Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 30 deletions

diff --git a/app/assets/javascripts/packages_and_registries/package_registry/constants.js b/app/assets/javascripts/packages_and_registries/package_registry/constants.js
index b731cd77e66..d4e55edf2a3 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/constants.js
+++ b/app/assets/javascripts/packages_and_registries/package_registry/constants.js
@@ -184,9 +184,6 @@ export const PACKAGE_TYPES = [
   s__('PackageRegistry|Helm'),
 ];
 
-export const HIDE_PACKAGE_MIGRATION_SURVEY_COOKIE = 'hide_package_registry_migration_survey';
-export const SURVEY_LINK = 'https://gitlab.fra1.qualtrics.com/jfe/form/SV_cHomH9FPzOaiDTU';
-
 // links
 
 export const EMPTY_LIST_HELP_URL = helpPagePath('user/packages/package_registry/index');
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue b/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue
index 8b5d51cb856..6521d56ad4d 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue
@@ -1,20 +1,18 @@
 <script>
-import { GlAlert, GlBanner, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui';
+import { GlAlert, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui';
 import { createAlert, VARIANT_INFO } from '~/flash';
-import { getCookie, historyReplaceState, parseBoolean, setCookie } from '~/lib/utils/common_utils';
+import { historyReplaceState } from '~/lib/utils/common_utils';
 import { s__ } from '~/locale';
 import { SHOW_DELETE_SUCCESS_ALERT } from '~/packages_and_registries/shared/constants';
 import {
   PROJECT_RESOURCE_TYPE,
   GROUP_RESOURCE_TYPE,
   GRAPHQL_PAGE_SIZE,
-  HIDE_PACKAGE_MIGRATION_SURVEY_COOKIE,
   DELETE_PACKAGE_SUCCESS_MESSAGE,
   DELETE_PACKAGES_ERROR_MESSAGE,
   DELETE_PACKAGES_SUCCESS_MESSAGE,
   EMPTY_LIST_HELP_URL,
   PACKAGE_HELP_URL,
-  SURVEY_LINK,
 } from '~/packages_and_registries/package_registry/constants';
 import getPackagesQuery from '~/packages_and_registries/package_registry/graphql/queries/get_packages.query.graphql';
 import destroyPackagesMutation from '~/packages_and_registries/package_registry/graphql/mutations/destroy_packages.mutation.graphql';
@@ -27,7 +25,6 @@ import DeleteModal from '~/packages_and_registries/package_registry/components/d
 export default {
   components: {
     GlAlert,
-    GlBanner,
     GlEmptyState,
     GlLink,
     GlSprintf,
@@ -46,7 +43,6 @@ export default {
       sort: '',
       filters: {},
       mutationLoading: false,
-      showSurveyBanner: !parseBoolean(getCookie(HIDE_PACKAGE_MIGRATION_SURVEY_COOKIE)),
     };
   },
   apollo: {
@@ -164,10 +160,6 @@ export default {
       this.sort = sort;
       this.filters = { ...filters };
     },
-    hideSurvey() {
-      this.showSurveyBanner = false;
-      setCookie(HIDE_PACKAGE_MIGRATION_SURVEY_COOKIE, 'true');
-    },
     updateQuery(_, { fetchMoreResult }) {
       return fetchMoreResult;
     },
@@ -208,17 +200,11 @@ export default {
     noResultsText: s__(
       'PackageRegistry|Learn how to %{noPackagesLinkStart}publish and share your packages%{noPackagesLinkEnd} with GitLab.',
     ),
-    surveyBannerTitle: s__('PackageRegistry|Help us learn about your registry migration needs'),
-    surveyBannerDescription: s__(
-      'PackageRegistry|If you are interested in migrating packages from your private registry to the GitLab Package Registry, take our survey and tell us more about your needs.',
-    ),
-    surveyBannerPrimaryButtonText: s__('PackageRegistry|Take survey'),
   },
   links: {
     EMPTY_LIST_HELP_URL,
     PACKAGE_HELP_URL,
   },
-  surveyLink: SURVEY_LINK,
 };
 </script>
 
@@ -233,17 +219,6 @@ export default {
     >
       {{ alertVariables.message }}
     </gl-alert>
-    <gl-banner
-      v-if="showSurveyBanner"
-      :title="$options.i18n.surveyBannerTitle"
-      :button-text="$options.i18n.surveyBannerPrimaryButtonText"
-      :button-link="$options.surveyLink"
-      class="gl-mt-3"
-      @primary="hideSurvey"
-      @close="hideSurvey"
-    >
-      <p>{{ $options.i18n.surveyBannerDescription }}</p>
-    </gl-banner>
     <package-title :help-url="$options.links.PACKAGE_HELP_URL" :count="packagesCount" />
     <package-search class="gl-mb-5" @update="handleSearchUpdate" />