Merge branch '358885-remove-info-message-from-package-interfaces' into 'master'

Resolve "Remove helper text from Package interfaces"

See merge request !86071

app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/registry_header.vue

@@ -7,7 +7,6 @@ import TitleArea from '~/vue_shared/components/registry/title_area.vue';
 
 import {
   CONTAINER_REGISTRY_TITLE,
-  LIST_INTRO_TEXT,
   EXPIRATION_POLICY_WILL_RUN_IN,
   EXPIRATION_POLICY_DISABLED_TEXT,
   SET_UP_CLEANUP,
@@ -87,19 +86,12 @@ export default {
         ? sprintf(EXPIRATION_POLICY_WILL_RUN_IN, { time: this.timeTillRun })
         : EXPIRATION_POLICY_DISABLED_TEXT;
     },
-    infoMessages() {
-      return [{ text: LIST_INTRO_TEXT, link: this.helpPagePath }];
-    },
   },
 };
 </script>
 
 <template>
-  <title-area
-    :title="$options.i18n.CONTAINER_REGISTRY_TITLE"
-    :info-messages="infoMessages"
-    :metadata-loading="metadataLoading"
-  >
+  <title-area :title="$options.i18n.CONTAINER_REGISTRY_TITLE" :metadata-loading="metadataLoading">
     <template #right-actions>
       <slot name="commands"></slot>
     </template>

app/assets/javascripts/packages_and_registries/container_registry/explorer/constants/list.js

@@ -8,9 +8,6 @@ export const CONNECTION_ERROR_TITLE = s__('ContainerRegistry|Docker connection e
 export const CONNECTION_ERROR_MESSAGE = s__(
   `ContainerRegistry|We are having trouble connecting to the Container Registry. Please try refreshing the page. If this error persists, please review  %{docLinkStart}the troubleshooting documentation%{docLinkEnd}.`,
 );
-export const LIST_INTRO_TEXT = s__(
-  `ContainerRegistry|With the GitLab Container Registry, every project can have its own space to store images. %{docLinkStart}More information%{docLinkEnd}`,
-);
 export const LIST_DELETE_BUTTON_DISABLED = s__(
   'ContainerRegistry|Missing or insufficient permission, delete button disabled',
 );

app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue

@@ -16,10 +16,7 @@ import Api from '~/api';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import TitleArea from '~/vue_shared/components/registry/title_area.vue';
 import ManifestsList from '~/packages_and_registries/dependency_proxy/components/manifests_list.vue';
-import {
-  DEPENDENCY_PROXY_SETTINGS_DESCRIPTION,
-  DEPENDENCY_PROXY_DOCS_PATH,
-} from '~/packages_and_registries/settings/group/constants';
+import { DEPENDENCY_PROXY_DOCS_PATH } from '~/packages_and_registries/settings/group/constants';
 import { GRAPHQL_PAGE_SIZE } from '~/packages_and_registries/dependency_proxy/constants';
 
 import getDependencyProxyDetailsQuery from '~/packages_and_registries/dependency_proxy/graphql/queries/get_dependency_proxy_details.query.graphql';
@@ -89,15 +86,6 @@ export default {
     },
   },
   computed: {
-    infoMessages() {
-      return [
-        {
-          text: DEPENDENCY_PROXY_SETTINGS_DESCRIPTION,
-          link: DEPENDENCY_PROXY_DOCS_PATH,
-        },
-      ];
-    },
-
     queryVariables() {
       return { fullPath: this.groupPath, first: GRAPHQL_PAGE_SIZE };
     },
@@ -181,7 +169,7 @@ export default {
     >
       {{ deleteCacheAlertMessage }}
     </gl-alert>
-    <title-area :title="$options.i18n.pageTitle" :info-messages="infoMessages">
+    <title-area :title="$options.i18n.pageTitle">
       <template v-if="showDeleteDropdown" #right-actions>
         <gl-dropdown
           icon="ellipsis_v"

app/assets/javascripts/packages_and_registries/package_registry/components/list/package_title.vue

@@ -27,21 +27,15 @@ export default {
     packageAmountText() {
       return n__(`%d Package`, `%d Packages`, this.count);
     },
-    infoMessages() {
-      return [{ text: this.$options.i18n.LIST_INTRO_TEXT, link: this.helpUrl }];
-    },
   },
   i18n: {
     LIST_TITLE_TEXT: s__('PackageRegistry|Package Registry'),
-    LIST_INTRO_TEXT: s__(
-      'PackageRegistry|Publish and share packages for a variety of common package managers. %{docLinkStart}More information%{docLinkEnd}',
-    ),
   },
 };
 </script>
 
 <template>
-  <title-area :title="$options.i18n.LIST_TITLE_TEXT" :info-messages="infoMessages">
+  <title-area :title="$options.i18n.LIST_TITLE_TEXT">
     <template #metadata-amount>
       <metadata-item v-if="showPackageCount" icon="package" :text="packageAmountText" />
     </template>

app/assets/javascripts/packages_and_registries/settings/group/components/dependency_proxy_settings.vue

@@ -13,7 +13,6 @@ import {
 
 import {
   DEPENDENCY_PROXY_HEADER,
-  DEPENDENCY_PROXY_SETTINGS_DESCRIPTION,
   DEPENDENCY_PROXY_DOCS_PATH,
 } from '~/packages_and_registries/settings/group/constants';
 
@@ -28,7 +27,6 @@ export default {
   },
   i18n: {
     DEPENDENCY_PROXY_HEADER,
-    DEPENDENCY_PROXY_SETTINGS_DESCRIPTION,
     enabledProxyLabel: s__('DependencyProxy|Enable Dependency Proxy'),
     enabledProxyHelpText: s__(
       'DependencyProxy|To see the image prefix and what is in the cache, visit the %{linkStart}Dependency Proxy%{linkEnd}',
@@ -140,19 +138,6 @@ export default {
     data-qa-selector="dependency_proxy_settings_content"
   >
     <template #title> {{ $options.i18n.DEPENDENCY_PROXY_HEADER }} </template>
-    <template #description>
-      <span data-testid="description">
-        <gl-sprintf :message="$options.i18n.DEPENDENCY_PROXY_SETTINGS_DESCRIPTION">
-          <template #docLink="{ content }">
-            <gl-link
-              data-testid="description-link"
-              :href="$options.links.DEPENDENCY_PROXY_DOCS_PATH"
-              >{{ content }}</gl-link
-            >
-          </template>
-        </gl-sprintf>
-      </span>
-    </template>
     <template #default>
       <div>
         <gl-toggle

app/assets/javascripts/packages_and_registries/settings/group/constants.js

@@ -19,9 +19,6 @@ export const DUPLICATES_SETTINGS_EXCEPTION_LEGEND = s__(
 );
 
 export const DEPENDENCY_PROXY_HEADER = s__('DependencyProxy|Dependency Proxy');
-export const DEPENDENCY_PROXY_SETTINGS_DESCRIPTION = s__(
-  'DependencyProxy|Create a local proxy for storing frequently used upstream images. %{docLinkStart}Learn more%{docLinkEnd} about dependency proxies.',
-);
 
 // Parameters
 

locale/gitlab.pot

@@ -10035,9 +10035,6 @@ msgstr ""
 msgid "ContainerRegistry|With the Container Registry, every project can have its own space to store its Docker images. Push at least one Docker image in one of this group's projects in order to show up here. %{docLinkStart}More Information%{docLinkEnd}"
 msgstr ""
-msgid "ContainerRegistry|With the GitLab Container Registry, every project can have its own space to store images. %{docLinkStart}More information%{docLinkEnd}"
-msgstr ""
-
 msgid "ContainerRegistry|You are about to remove %{item} tags. Are you sure?"
 msgstr ""
@@ -12312,9 +12309,6 @@ msgstr ""
 msgid "DependencyProxy|Copy prefix"
 msgstr ""
-msgid "DependencyProxy|Create a local proxy for storing frequently used upstream images. %{docLinkStart}Learn more%{docLinkEnd} about dependency proxies."
-msgstr ""
-
 msgid "DependencyProxy|Dependency Proxy"
 msgstr ""
@@ -27038,9 +27032,6 @@ msgstr ""
 msgid "PackageRegistry|Project-level"
 msgstr ""
-msgid "PackageRegistry|Publish and share packages for a variety of common package managers. %{docLinkStart}More information%{docLinkEnd}"
-msgstr ""
-
 msgid "PackageRegistry|Publish packages if their name or version matches this regex."
 msgstr ""

spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/registry_header_spec.js

@@ -4,7 +4,6 @@ import { nextTick } from 'vue';
 import Component from '~/packages_and_registries/container_registry/explorer/components/list_page/registry_header.vue';
 import {
   CONTAINER_REGISTRY_TITLE,
-  LIST_INTRO_TEXT,
   EXPIRATION_POLICY_DISABLED_TEXT,
   SET_UP_CLEANUP,
 } from '~/packages_and_registries/container_registry/explorer/constants';
@@ -135,9 +134,7 @@ describe('registry_header', () => {
       it('is correctly bound to title_area props', () => {
         mountComponent({ helpPagePath: 'foo' });
 
-        expect(findTitleArea().props('infoMessages')).toEqual([
-          { text: LIST_INTRO_TEXT, link: 'foo' },
-        ]);
+        expect(findTitleArea().props('infoMessages')).toEqual([]);
       });
     });
   });

spec/frontend/packages_and_registries/package_registry/components/list/packages_title_spec.js

@@ -37,7 +37,7 @@ describe('PackageTitle', () => {
 
       expect(findTitleArea().props()).toMatchObject({
         title: PackageTitle.i18n.LIST_TITLE_TEXT,
-        infoMessages: [{ text: PackageTitle.i18n.LIST_INTRO_TEXT, link: 'foo' }],
+        infoMessages: [],
       });
     });
   });

spec/frontend/packages_and_registries/settings/group/components/dependency_proxy_settings_spec.js

@@ -6,11 +6,7 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 
 import component from '~/packages_and_registries/settings/group/components/dependency_proxy_settings.vue';
-import {
-  DEPENDENCY_PROXY_HEADER,
-  DEPENDENCY_PROXY_SETTINGS_DESCRIPTION,
-  DEPENDENCY_PROXY_DOCS_PATH,
-} from '~/packages_and_registries/settings/group/constants';
+import { DEPENDENCY_PROXY_HEADER } from '~/packages_and_registries/settings/group/constants';
 
 import updateDependencyProxySettings from '~/packages_and_registries/settings/group/graphql/mutations/update_dependency_proxy_settings.mutation.graphql';
 import updateDependencyProxyImageTtlGroupPolicy from '~/packages_and_registries/settings/group/graphql/mutations/update_dependency_proxy_image_ttl_group_policy.mutation.graphql';
@@ -91,8 +87,6 @@ describe('DependencyProxySettings', () => {
 
   const findSettingsBlock = () => wrapper.findComponent(SettingsBlock);
   const findSettingsTitles = () => wrapper.findComponent(SettingsTitles);
-  const findDescription = () => wrapper.findByTestId('description');
-  const findDescriptionLink = () => wrapper.findByTestId('description-link');
   const findEnableProxyToggle = () => wrapper.findByTestId('dependency-proxy-setting-toggle');
   const findEnableTtlPoliciesToggle = () =>
     wrapper.findByTestId('dependency-proxy-ttl-policies-toggle');
@@ -126,21 +120,6 @@ describe('DependencyProxySettings', () => {
     expect(wrapper.text()).toContain(DEPENDENCY_PROXY_HEADER);
   });
 
-  it('has the correct description text', () => {
-    mountComponent();
-
-    expect(findDescription().text()).toMatchInterpolatedText(DEPENDENCY_PROXY_SETTINGS_DESCRIPTION);
-  });
-
-  it('has the correct link', () => {
-    mountComponent();
-
-    expect(findDescriptionLink().attributes()).toMatchObject({
-      href: DEPENDENCY_PROXY_DOCS_PATH,
-    });
-    expect(findDescriptionLink().text()).toBe('Learn more');
-  });
-
   describe('enable toggle', () => {
     it('exists', () => {
       mountComponent();