diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 18:09:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 18:09:52 +0300 |
commit | 41aebff8ec728c167298aa44e037d8e324e00e8d (patch) | |
tree | f51c379dd4b78f9ecb57175e9dc073d6debe74e5 /app/assets/javascripts/incidents | |
parent | 8c438dd7a6063d7f59bce4d79cc7ca49a31a8346 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/incidents')
-rw-r--r-- | app/assets/javascripts/incidents/components/incidents_list.vue | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index af99341b11f..4d34daa43ba 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -10,6 +10,7 @@ import { GlIcon, GlEmptyState, } from '@gitlab/ui'; +import { isValidSlaDueAt } from 'ee_else_ce/vue_shared/components/incidents/utils'; import { visitUrl, mergeUrlParams, joinPaths } from '~/lib/utils/url_utility'; import { s__ } from '~/locale'; import { INCIDENT_SEVERITY } from '~/sidebar/components/severity/constants'; @@ -287,6 +288,7 @@ export default { errorAlertDismissed() { this.isErrorAlertDismissed = true; }, + isValidSlaDueAt, }, }; </script> @@ -367,7 +369,13 @@ export default { </template> <template v-if="slaFeatureAvailable" #cell(incidentSla)="{ item }"> - <service-level-agreement-cell :sla-due-at="item.slaDueAt" data-testid="incident-sla" /> + <service-level-agreement-cell + v-if="isValidSlaDueAt(item.slaDueAt)" + :issue-iid="item.iid" + :project-path="projectPath" + :sla-due-at="item.slaDueAt" + data-testid="incident-sla" + /> </template> <template #cell(assignees)="{ item }"> |