Merge branch...

Merge branch '296945-update-the-container-registry-ui-header-copy-to-remove-expiration-policy-text' into 'master'

Remove Expiration Policy text from container registry header

See merge request gitlab-org/gitlab!54665

app/assets/javascripts/registry/explorer/components/list_page/registry_header.vue

@@ -9,7 +9,6 @@ import {
   LIST_INTRO_TEXT,
   EXPIRATION_POLICY_WILL_RUN_IN,
   EXPIRATION_POLICY_DISABLED_TEXT,
-  EXPIRATION_POLICY_DISABLED_MESSAGE,
 } from '../../constants/index';
 
 export default {
@@ -34,11 +33,6 @@ export default {
       default: '',
       required: false,
     },
-    expirationPolicyHelpPagePath: {
-      type: String,
-      default: '',
-      required: false,
-    },
     hideExpirationPolicyData: {
       type: Boolean,
       required: false,
@@ -79,19 +73,8 @@ export default {
         ? sprintf(EXPIRATION_POLICY_WILL_RUN_IN, { time: this.timeTillRun })
         : EXPIRATION_POLICY_DISABLED_TEXT;
     },
-    showExpirationPolicyTip() {
-      return (
-        !this.expirationPolicyEnabled && this.imagesCount > 0 && !this.hideExpirationPolicyData
-      );
-    },
     infoMessages() {
-      const base = [{ text: LIST_INTRO_TEXT, link: this.helpPagePath }];
-      return this.showExpirationPolicyTip
-        ? [
-            ...base,
-            { text: EXPIRATION_POLICY_DISABLED_MESSAGE, link: this.expirationPolicyHelpPagePath },
-          ]
-        : base;
+      return [{ text: LIST_INTRO_TEXT, link: this.helpPagePath }];
     },
   },
 };

app/assets/javascripts/registry/explorer/constants/expiration_policies.js

@@ -6,9 +6,6 @@ export const EXPIRATION_POLICY_WILL_RUN_IN = s__(
 export const EXPIRATION_POLICY_DISABLED_TEXT = s__(
   'ContainerRegistry|Expiration policy is disabled',
 );
-export const EXPIRATION_POLICY_DISABLED_MESSAGE = s__(
-  'ContainerRegistry|Expiration policies help manage the storage space used by the Container Registry, but the expiration policies for this registry are disabled. Contact your administrator to enable. %{docLinkStart}More information%{docLinkEnd}',
-);
 export const DELETE_ALERT_TITLE = s__('ContainerRegistry|Some tags were not deleted');
 export const DELETE_ALERT_LINK_TEXT = s__(
   'ContainerRegistry|The cleanup policy timed out before it could delete all tags. An administrator can %{adminLinkStart}manually run cleanup now%{adminLinkEnd} or you can wait for the cleanup policy to automatically run again. %{docLinkStart}More information%{docLinkEnd}',

app/assets/javascripts/registry/explorer/pages/list.vue

@@ -288,7 +288,6 @@ export default {
         :images-count="containerRepositoriesCount"
         :expiration-policy="config.expirationPolicy"
         :help-page-path="config.helpPagePath"
-        :expiration-policy-help-page-path="config.expirationPolicyHelpPagePath"
         :hide-expiration-policy-data="config.isGroupPage"
       >
         <template #commands>

app/views/groups/registry/repositories/index.html.haml

@@ -12,7 +12,6 @@
     "registry_host_url_with_port" => escape_once(registry_config.host_port),
     "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
     "run_cleanup_policies_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'run-the-cleanup-policy-now'),
-    "cleanup_policies_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'how-the-cleanup-policy-works'),
     "is_admin": current_user&.admin.to_s,
     is_group_page: "true",
     "group_path": @group.full_path,

app/views/projects/registry/repositories/index.html.haml

@@ -15,7 +15,6 @@
     "expiration_policy_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'expiration-policy'),
     "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'),
     "run_cleanup_policies_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'run-the-cleanup-policy-now'),
-    "cleanup_policies_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'how-the-cleanup-policy-works'),
     "project_path": @project.full_path,
     "gid_prefix": container_repository_gid_prefix,
     "is_admin": current_user&.admin.to_s,

changelogs/unreleased/296945-update-the-container-registry-ui-header-copy-to-remove-expiration-.yml

+---
+title: Remove Expiration Policy text from container registry header
+merge_request: 54665
+author:
+type: changed

locale/gitlab.pot

@@ -7960,9 +7960,6 @@ msgstr ""
 msgid "ContainerRegistry|Docker connection error"
 msgstr ""
 
-msgid "ContainerRegistry|Expiration policies help manage the storage space used by the Container Registry, but the expiration policies for this registry are disabled. Contact your administrator to enable. %{docLinkStart}More information%{docLinkEnd}"
-msgstr ""
-
 msgid "ContainerRegistry|Expiration policy is disabled"
 msgstr ""
 

spec/frontend/registry/explorer/components/list_page/registry_header_spec.js

@@ -4,7 +4,6 @@ import Component from '~/registry/explorer/components/list_page/registry_header.
 import {
   CONTAINER_REGISTRY_TITLE,
   LIST_INTRO_TEXT,
-  EXPIRATION_POLICY_DISABLED_MESSAGE,
   EXPIRATION_POLICY_DISABLED_TEXT,
 } from '~/registry/explorer/constants';
 import TitleArea from '~/vue_shared/components/registry/title_area.vue';
@@ -132,41 +131,5 @@ describe('registry_header', () => {
         ]);
       });
     });
-
-    describe('expiration policy info message', () => {
-      describe('when there are images', () => {
-        describe('when expiration policy is disabled', () => {
-          beforeEach(() => {
-            return mountComponent({
-              expirationPolicy: { enabled: false },
-              expirationPolicyHelpPagePath: 'foo',
-              imagesCount: 1,
-            });
-          });
-
-          it('the prop is correctly bound', () => {
-            expect(findTitleArea().props('infoMessages')).toEqual([
-              { text: LIST_INTRO_TEXT, link: '' },
-              { text: EXPIRATION_POLICY_DISABLED_MESSAGE, link: 'foo' },
-            ]);
-          });
-        });
-
-        describe.each`
-          desc                                                   | props
-          ${'when there are no images'}                          | ${{ expirationPolicy: { enabled: false }, imagesCount: 0 }}
-          ${'when expiration policy is enabled'}                 | ${{ expirationPolicy: { enabled: true }, imagesCount: 1 }}
-          ${'when the expiration policy is completely disabled'} | ${{ expirationPolicy: { enabled: false }, imagesCount: 1, hideExpirationPolicyData: true }}
-        `('$desc', ({ props }) => {
-          it('message does not exist', () => {
-            mountComponent(props);
-
-            expect(findTitleArea().props('infoMessages')).toEqual([
-              { text: LIST_INTRO_TEXT, link: '' },
-            ]);
-          });
-        });
-      });
-    });
   });
 });