diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:10:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:10:20 +0300 |
commit | 3f96425b0b9f0b4885b70db01dcd76b311ea87ab (patch) | |
tree | 0f42e42ca0876d9deca1d9cda83165ec510876e5 /app/assets/javascripts/packages_and_registries | |
parent | ba2e4183d9b07237657595821cd06689667e6762 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/packages_and_registries')
-rw-r--r-- | app/assets/javascripts/packages_and_registries/package_registry/constants.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/packages_and_registries/package_registry/pages/list.vue | 29 |
2 files changed, 30 insertions, 2 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 4e35176c757..006164fd462 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/constants.js +++ b/app/assets/javascripts/packages_and_registries/package_registry/constants.js @@ -177,6 +177,9 @@ 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 ed9ab0367dd..ea1432299ce 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,16 +1,18 @@ <script> -import { GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; +import { GlBanner, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui'; import { createAlert, VARIANT_INFO } from '~/flash'; -import { historyReplaceState } from '~/lib/utils/common_utils'; +import { getCookie, historyReplaceState, parseBoolean, setCookie } 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, 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'; @@ -21,6 +23,7 @@ import PackageList from '~/packages_and_registries/package_registry/components/l export default { components: { + GlBanner, GlEmptyState, GlLink, GlSprintf, @@ -36,6 +39,7 @@ export default { sort: '', filters: {}, mutationLoading: false, + showSurveyBanner: !parseBoolean(getCookie(HIDE_PACKAGE_MIGRATION_SURVEY_COOKIE)), }; }, apollo: { @@ -114,6 +118,10 @@ export default { this.sort = sort; this.filters = { ...filters }; }, + hideSurvey() { + this.showSurveyBanner = false; + setCookie(HIDE_PACKAGE_MIGRATION_SURVEY_COOKIE, 'true'); + }, updateQuery(_, { fetchMoreResult }) { return fetchMoreResult; }, @@ -151,16 +159,33 @@ 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> <template> <div> + <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 @update="handleSearchUpdate" /> |