Merge branch 'alert-incident-url-follow' into 'master'

Feat(incidents): allow alert to link to incidents

See merge request gitlab-org/gitlab!55426

app/assets/javascripts/alert_management/components/alert_management_table.vue

@@ -225,7 +225,7 @@ export default {
     getIssueMeta({ issue: { iid, state } }) {
       return {
         state: state === 'closed' ? `(${this.$options.i18n.closed})` : '',
-        link: joinPaths('/', this.projectPath, '-', 'issues', iid),
+        link: joinPaths('/', this.projectPath, '-', 'issues/incident', iid),
       };
     },
     tbodyTrClass(item) {

app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue

@@ -222,7 +222,9 @@ export default {
         });
     },
     incidentPath(issueId) {
-      return joinPaths(this.projectIssuesPath, issueId);
+      return this.isThreatMonitoringPage
+        ? joinPaths(this.projectIssuesPath, issueId)
+        : joinPaths(this.projectIssuesPath, 'incident', issueId);
     },
     trackPageViews() {
       const { category, action } = this.trackAlertsDetailsViewsOptions;

changelogs/unreleased/alert-incident-url-follow.yml

+---
+title: Allow alert to link to incidents
+merge_request: 55426
+author:
+type: changed

spec/frontend/alert_management/components/alert_management_table_spec.js

@@ -251,7 +251,7 @@ describe('AlertManagementTable', () => {
         const tooltip = getBinding(issueField.element, 'gl-tooltip');
 
         expect(issueField.text()).toBe(`#1 (closed)`);
-        expect(issueField.attributes('href')).toBe('/gitlab-org/gitlab/-/issues/1');
+        expect(issueField.attributes('href')).toBe('/gitlab-org/gitlab/-/issues/incident/1');
         expect(issueField.attributes('title')).toBe('My test issue');
         expect(tooltip).not.toBe(undefined);
       });

spec/frontend/vue_shared/alert_details/alert_details_spec.js

@@ -188,6 +188,18 @@ describe('AlertDetails', () => {
         });
         expect(findMetricsTab().exists()).toBe(false);
       });
+
+      it('should display "View incident" button that links the issues page when incident exists', () => {
+        const iid = '3';
+        mountComponent({
+          data: { alert: { ...mockAlert, issue: { iid } }, sidebarStatus: false },
+          provide: { isThreatMonitoringPage: true },
+        });
+
+        expect(findViewIncidentBtn().exists()).toBe(true);
+        expect(findViewIncidentBtn().attributes('href')).toBe(joinPaths(projectIssuesPath, iid));
+        expect(findCreateIncidentBtn().exists()).toBe(false);
+      });
     });
 
     describe('Create incident from alert', () => {
@@ -198,7 +210,9 @@ describe('AlertDetails', () => {
         });
 
         expect(findViewIncidentBtn().exists()).toBe(true);
-        expect(findViewIncidentBtn().attributes('href')).toBe(joinPaths(projectIssuesPath, iid));
+        expect(findViewIncidentBtn().attributes('href')).toBe(
+          joinPaths(projectIssuesPath, 'incident', iid),
+        );
         expect(findCreateIncidentBtn().exists()).toBe(false);
       });