Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 8 deletions

diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue
index 245d71ce55f..e1f9d858f2b 100644
--- a/app/assets/javascripts/incidents/components/incidents_list.vue
+++ b/app/assets/javascripts/incidents/components/incidents_list.vue
@@ -310,7 +310,7 @@ export default {
           category="primary"
           variant="success"
           :href="newIncidentPath"
-          @click="redirecting = true"
+          @click="navigateToCreateNewIncident"
         >
           {{ $options.i18n.createIncidentBtnLabel }}
         </gl-button>
diff --git a/app/assets/javascripts/incidents/constants.js b/app/assets/javascripts/incidents/constants.js
index 9c31a5702a2..b82980b5628 100644
--- a/app/assets/javascripts/incidents/constants.js
+++ b/app/assets/javascripts/incidents/constants.js
@@ -34,6 +34,13 @@ export const INCIDENT_STATUS_TABS = [
   },
 ];
 
+export const DEFAULT_PAGE_SIZE = 20;
+export const TH_CREATED_AT_TEST_ID = { 'data-testid': 'incident-management-created-at-sort' };
+export const TH_SEVERITY_TEST_ID = { 'data-testid': 'incident-management-severity-sort' };
+export const TH_INCIDENT_SLA_TEST_ID = { 'data-testid': 'incident-management-sla' };
+export const TH_PUBLISHED_TEST_ID = { 'data-testid': 'incident-management-published-sort' };
+export const INCIDENT_DETAILS_PATH = 'incident';
+
 /**
  * Tracks snowplow event when user clicks create new incident
  */
@@ -43,16 +50,17 @@ export const trackIncidentCreateNewOptions = {
 };
 
 /**
- * Tracks snowplow event when user views incident list
+ * Tracks snowplow event when user views incidents list
  */
 export const trackIncidentListViewsOptions = {
   category: 'Incident Management',
   action: 'view_incidents_list',
 };
 
-export const DEFAULT_PAGE_SIZE = 20;
-export const TH_CREATED_AT_TEST_ID = { 'data-testid': 'incident-management-created-at-sort' };
-export const TH_SEVERITY_TEST_ID = { 'data-testid': 'incident-management-severity-sort' };
-export const TH_INCIDENT_SLA_TEST_ID = { 'data-testid': 'incident-management-sla' };
-export const TH_PUBLISHED_TEST_ID = { 'data-testid': 'incident-management-published-sort' };
-export const INCIDENT_DETAILS_PATH = 'incident';
+/**
+ * Tracks snowplow event when user views incident details
+ */
+export const trackIncidentDetailsViewsOptions = {
+  category: 'Incident Management',
+  action: 'view_incident_details',
+};