Add latest changes from gitlab-org/gitlab@master

5 files changed, 12 insertions, 15 deletions

diff --git a/app/assets/javascripts/packages_and_registries/harbor_registry/components/list/harbor_list_header.vue b/app/assets/javascripts/packages_and_registries/harbor_registry/components/list/harbor_list_header.vue
index f9aefeeb46f..db66ebef937 100644
--- a/app/assets/javascripts/packages_and_registries/harbor_registry/components/list/harbor_list_header.vue
+++ b/app/assets/javascripts/packages_and_registries/harbor_registry/components/list/harbor_list_header.vue
@@ -5,6 +5,7 @@ import {
   HARBOR_REGISTRY_TITLE,
   LIST_INTRO_TEXT,
   imagesCountInfoText,
+  HARBOR_REGISTRY_HELP_PAGE_PATH,
 } from '~/packages_and_registries/harbor_registry/constants';
 import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue';
 
@@ -20,11 +21,6 @@ export default {
       default: 0,
       required: false,
     },
-    helpPagePath: {
-      type: String,
-      default: '',
-      required: false,
-    },
     metadataLoading: {
       type: Boolean,
       required: false,
@@ -40,7 +36,7 @@ export default {
       return sprintf(pluralisedString, { count: this.imagesCount });
     },
     infoMessages() {
-      return [{ text: LIST_INTRO_TEXT, link: this.helpPagePath }];
+      return [{ text: LIST_INTRO_TEXT, link: HARBOR_REGISTRY_HELP_PAGE_PATH }];
     },
   },
 };
diff --git a/app/assets/javascripts/packages_and_registries/harbor_registry/constants/common.js b/app/assets/javascripts/packages_and_registries/harbor_registry/constants/common.js
index 89866320215..7f3c3da02b0 100644
--- a/app/assets/javascripts/packages_and_registries/harbor_registry/constants/common.js
+++ b/app/assets/javascripts/packages_and_registries/harbor_registry/constants/common.js
@@ -1,4 +1,5 @@
 import { s__, __ } from '~/locale';
+import { helpPagePath } from '~/helpers/help_page_helper';
 
 export const ROOT_IMAGE_TEXT = s__('HarborRegistry|Root image');
 export const NAME_SORT_FIELD = { orderBy: 'NAME', label: __('Name') };
@@ -17,3 +18,7 @@ export const SORT_FIELD_MAPPING = {
 };
 
 export const DEFAULT_PER_PAGE = 10;
+
+export const HARBOR_REGISTRY_HELP_PAGE_PATH = helpPagePath(
+  'user/packages/harbor_container_registry/index',
+);
diff --git a/app/assets/javascripts/packages_and_registries/harbor_registry/constants/list.js b/app/assets/javascripts/packages_and_registries/harbor_registry/constants/list.js
index 6a51d14d570..33950993125 100644
--- a/app/assets/javascripts/packages_and_registries/harbor_registry/constants/list.js
+++ b/app/assets/javascripts/packages_and_registries/harbor_registry/constants/list.js
@@ -7,7 +7,7 @@ export const HARBOR_REGISTRY_TITLE = s__('HarborRegistry|Harbor Registry');
 
 export const CONNECTION_ERROR_TITLE = s__('HarborRegistry|Harbor connection error');
 export const CONNECTION_ERROR_MESSAGE = s__(
-  `HarborRegistry|We are having trouble connecting to the Harbor Registry. Please try refreshing the page. If this error persists, please review  %{docLinkStart}the troubleshooting documentation%{docLinkEnd}.`,
+  `HarborRegistry|We are having trouble connecting to the Harbor Registry. Please try refreshing the page. If this error persists, please review %{docLinkStart}the documentation%{docLinkEnd}.`,
 );
 
 export const FETCH_IMAGES_LIST_ERROR_MESSAGE = s__(
diff --git a/app/assets/javascripts/packages_and_registries/harbor_registry/index.js b/app/assets/javascripts/packages_and_registries/harbor_registry/index.js
index 70238e43ad6..6185e4c7bc6 100644
--- a/app/assets/javascripts/packages_and_registries/harbor_registry/index.js
+++ b/app/assets/javascripts/packages_and_registries/harbor_registry/index.js
@@ -70,7 +70,6 @@ export default (id) => {
           projectName,
           containersErrorImage,
           noContainersImage,
-          helpPagePath: '',
         };
       },
       render(createElement) {
diff --git a/app/assets/javascripts/packages_and_registries/harbor_registry/pages/list.vue b/app/assets/javascripts/packages_and_registries/harbor_registry/pages/list.vue
index b9ec625171e..931a99649cb 100644
--- a/app/assets/javascripts/packages_and_registries/harbor_registry/pages/list.vue
+++ b/app/assets/javascripts/packages_and_registries/harbor_registry/pages/list.vue
@@ -23,6 +23,7 @@ import {
   FETCH_IMAGES_LIST_ERROR_MESSAGE,
   EMPTY_IMAGES_TITLE,
   EMPTY_IMAGES_MESSAGE,
+  HARBOR_REGISTRY_HELP_PAGE_PATH,
 } from '~/packages_and_registries/harbor_registry/constants';
 import Tracking from '~/tracking';
 import { getHarborRepositoriesList } from '~/rest_api';
@@ -52,7 +53,6 @@ export default {
     'connectionError',
     'invalidPathError',
     'containersErrorImage',
-    'helpPagePath',
     'noContainersImage',
   ],
   loader: {
@@ -65,6 +65,7 @@ export default {
     connectionErrorMessage: CONNECTION_ERROR_MESSAGE,
   },
   searchConfig: SORT_FIELDS,
+  helpPagePath: HARBOR_REGISTRY_HELP_PAGE_PATH,
   data() {
     return {
       images: [],
@@ -168,7 +169,7 @@ export default {
         <p>
           <gl-sprintf :message="$options.i18n.connectionErrorMessage">
             <template #docLink="{ content }">
-              <gl-link :href="`${helpPagePath}#docker-connection-error`" target="_blank">
+              <gl-link :href="$options.helpPagePath" target="_blank">
                 {{ content }}
               </gl-link>
             </template>
@@ -177,11 +178,7 @@ export default {
       </template>
     </gl-empty-state>
     <template v-else>
-      <harbor-list-header
-        :metadata-loading="isLoading"
-        :images-count="totalCount"
-        :help-page-path="helpPagePath"
-      >
+      <harbor-list-header :metadata-loading="isLoading" :images-count="totalCount">
         <template #commands>
           <cli-commands
             v-if="showCommands"