Merge branch '207223-fix-self-monitoring-project' into 'master'

Fix self monitoring project link

See merge request gitlab-org/gitlab!25516

app/assets/javascripts/self_monitor/components/self_monitor_form.vue

@@ -129,7 +129,7 @@ export default {
     </div>
     <div class="settings-content">
       <form name="self-monitoring-form">
-        <p v-html="selfMonitoringFormText"></p>
+        <p ref="selfMonitoringFormText" v-html="selfMonitoringFormText"></p>
         <gl-form-group :label="$options.formLabels.createProject" label-for="self-monitor-toggle">
           <gl-toggle
             v-model="selfMonitorEnabled"

app/assets/javascripts/self_monitor/store/state.js

@@ -9,7 +9,7 @@ export default (initialState = {}) => ({
   deleteProjectStatusEndpoint: initialState.statusDeleteSelfMonitoringProjectPath || '',
   selfMonitorProjectPath: initialState.selfMonitoringProjectFullPath || '',
   showAlert: false,
-  projectPath: '',
+  projectPath: initialState.selfMonitoringProjectFullPath || '',
   loading: false,
   alertContent: {},
 });

changelogs/unreleased/207223-fix-self-monitoring-project.yml

+---
+title: Fix self monitoring project link
+merge_request: 25516
+author:
+type: fixed

spec/frontend/self_monitor/components/self_monitor_form_spec.js

@@ -72,11 +72,17 @@ describe('self monitor component', () => {
           selfMonitoringProjectExists: true,
           createSelfMonitoringProjectPath: '/create',
           deleteSelfMonitoringProjectPath: '/delete',
+          selfMonitoringProjectFullPath: 'instance-administrators-random/gitlab-self-monitoring',
         });
 
         wrapper = shallowMount(SelfMonitor, { store });
 
-        expect(wrapper.vm.selfMonitoringFormText).toContain('<a href="http://localhost/">');
+        expect(
+          wrapper
+            .find({ ref: 'selfMonitoringFormText' })
+            .find('a')
+            .attributes('href'),
+        ).toEqual('http://localhost/instance-administrators-random/gitlab-self-monitoring');
       });
     });
   });