Add latest changes from gitlab-org/gitlab@master

4 files changed, 9 insertions, 28 deletions

diff --git a/app/assets/javascripts/analytics/devops_report/components/devops_score.vue b/app/assets/javascripts/analytics/devops_report/components/devops_score.vue
index be38b32c119..238081cc3c0 100644
--- a/app/assets/javascripts/analytics/devops_report/components/devops_score.vue
+++ b/app/assets/javascripts/analytics/devops_report/components/devops_score.vue
@@ -1,6 +1,7 @@
 <script>
 import { GlBadge, GlTable, GlLink, GlEmptyState } from '@gitlab/ui';
 import { GlSingleStat } from '@gitlab/ui/dist/charts';
+import { helpPagePath } from '~/helpers/help_page_helper';
 import { sprintf, s__ } from '~/locale';
 import DevopsScoreCallout from './devops_score_callout.vue';
 
@@ -22,9 +23,6 @@ export default {
     devopsScoreMetrics: {
       default: null,
     },
-    devopsReportDocsPath: {
-      default: '',
-    },
     noDataImagePath: {
       default: '',
     },
@@ -42,6 +40,7 @@ export default {
       return this.devopsScoreMetrics.averageScore === undefined;
     },
   },
+  devopsReportDocsPath: helpPagePath('user/admin_area/analytics/dev_ops_report'),
   tableHeaderFields: [
     {
       key: 'title',
@@ -76,7 +75,7 @@ export default {
     >
       <template #description>
         <p class="gl-mb-0">{{ __('It may be several days before you see feature usage data.') }}</p>
-        <gl-link :href="devopsReportDocsPath">{{
+        <gl-link :href="$options.devopsReportDocsPath">{{
           __('See example DevOps Score page in our documentation.')
         }}</gl-link>
       </template>
diff --git a/app/assets/javascripts/analytics/devops_report/components/service_ping_disabled.vue b/app/assets/javascripts/analytics/devops_report/components/service_ping_disabled.vue
index 7c14cf3767f..400326e41e1 100644
--- a/app/assets/javascripts/analytics/devops_report/components/service_ping_disabled.vue
+++ b/app/assets/javascripts/analytics/devops_report/components/service_ping_disabled.vue
@@ -1,5 +1,6 @@
 <script>
 import { GlEmptyState, GlSprintf, GlLink, GlButton } from '@gitlab/ui';
+import { helpPagePath } from '~/helpers/help_page_helper';
 
 export default {
   components: {
@@ -15,13 +16,11 @@ export default {
     svgPath: {
       default: '',
     },
-    docsLink: {
-      default: '',
-    },
     primaryButtonPath: {
       default: '',
     },
   },
+  docsLink: helpPagePath('development/service_ping/index.md'),
 };
 </script>
 <template>
@@ -36,7 +35,7 @@ export default {
         "
       >
         <template #docLink="{ content }">
-          <gl-link :href="docsLink" target="_blank" data-testid="docs-link">{{ content }}</gl-link>
+          <gl-link :href="$options.docsLink" target="_blank">{{ content }}</gl-link>
         </template>
       </gl-sprintf>
       <template v-else>
@@ -44,12 +43,7 @@ export default {
           {{ s__('ServicePing|Turn on service ping to review instance-level analytics.') }}
         </p>
 
-        <gl-button
-          category="primary"
-          variant="success"
-          :href="primaryButtonPath"
-          data-testid="power-on-button"
-        >
+        <gl-button category="primary" variant="success" :href="primaryButtonPath">
           {{ s__('ServicePing|Turn on service ping') }}
         </gl-button>
       </template>
diff --git a/app/assets/javascripts/analytics/devops_report/devops_score.js b/app/assets/javascripts/analytics/devops_report/devops_score.js
index 20e9fc776bc..0bf98b65ed5 100644
--- a/app/assets/javascripts/analytics/devops_report/devops_score.js
+++ b/app/assets/javascripts/analytics/devops_report/devops_score.js
@@ -6,18 +6,12 @@ export default () => {
 
   if (!el) return false;
 
-  const {
-    devopsScoreMetrics,
-    devopsReportDocsPath,
-    noDataImagePath,
-    devopsScoreIntroImagePath,
-  } = el.dataset;
+  const { devopsScoreMetrics, noDataImagePath, devopsScoreIntroImagePath } = el.dataset;
 
   return new Vue({
     el,
     provide: {
       devopsScoreMetrics: JSON.parse(devopsScoreMetrics),
-      devopsReportDocsPath,
       noDataImagePath,
       devopsScoreIntroImagePath,
     },
diff --git a/app/assets/javascripts/analytics/devops_report/devops_score_disabled_service_ping.js b/app/assets/javascripts/analytics/devops_report/devops_score_disabled_service_ping.js
index 63b36f35247..eb2992422a4 100644
--- a/app/assets/javascripts/analytics/devops_report/devops_score_disabled_service_ping.js
+++ b/app/assets/javascripts/analytics/devops_report/devops_score_disabled_service_ping.js
@@ -11,12 +11,7 @@ export default () => {
 
   if (!emptyStateContainer) return false;
 
-  const {
-    isAdmin,
-    emptyStateSvgPath,
-    enableServicePingPath,
-    docsLink,
-  } = emptyStateContainer.dataset;
+  const { isAdmin, emptyStateSvgPath, enableServicePingPath } = emptyStateContainer.dataset;
 
   return new Vue({
     el: emptyStateContainer,
@@ -24,7 +19,6 @@ export default () => {
       isAdmin: parseBoolean(isAdmin),
       svgPath: emptyStateSvgPath,
       primaryButtonPath: enableServicePingPath,
-      docsLink,
     },
     render(h) {
       return h(ServicePingDisabled);