diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/javascripts/incidents | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/javascripts/incidents')
-rw-r--r-- | app/assets/javascripts/incidents/components/incidents_list.vue | 25 | ||||
-rw-r--r-- | app/assets/javascripts/incidents/constants.js | 1 |
2 files changed, 18 insertions, 8 deletions
diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index 324797ad645..bfc5bd823a2 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -33,6 +33,7 @@ import { TH_CREATED_AT_TEST_ID, TH_INCIDENT_SLA_TEST_ID, TH_SEVERITY_TEST_ID, + TH_ESCALATION_STATUS_TEST_ID, TH_PUBLISHED_TEST_ID, INCIDENT_DETAILS_PATH, trackIncidentCreateNewOptions, @@ -67,8 +68,11 @@ export default { { key: 'escalationStatus', label: s__('IncidentManagement|Status'), - thClass: `${thClass} gl-w-eighth gl-pointer-events-none`, - tdClass, + thClass: `${thClass} gl-w-eighth`, + tdClass: `${tdClass} sortable-cell`, + actualSortKey: 'ESCALATION_STATUS', + sortable: true, + thAttr: TH_ESCALATION_STATUS_TEST_ID, }, { key: 'createdAt', @@ -354,7 +358,7 @@ export default { :loading="redirecting" :disabled="redirecting" category="primary" - variant="success" + variant="confirm" :href="newIncidentPath" @click="navigateToCreateNewIncident" > @@ -388,19 +392,24 @@ export default { </template> <template #cell(title)="{ item }"> - <div :class="{ 'gl-display-flex gl-align-items-center': item.state === 'closed' }"> + <div + :class="{ + 'gl-display-flex gl-align-items-center gl-max-w-full': item.state === 'closed', + }" + > <gl-link - v-gl-tooltip - :title="item.title" data-testid="incident-link" :href="showIncidentLink(item)" + class="gl-min-w-0" > - {{ item.title }} + <tooltip-on-truncate :title="item.title" class="gl-text-truncate gl-display-block"> + {{ item.title }} + </tooltip-on-truncate> </gl-link> <gl-icon v-if="item.state === 'closed'" name="issue-close" - class="gl-mx-1 gl-fill-blue-500 gl-flex-shrink-0" + class="gl-ml-2 gl-fill-blue-500 gl-flex-shrink-0" :size="16" data-testid="incident-closed" /> diff --git a/app/assets/javascripts/incidents/constants.js b/app/assets/javascripts/incidents/constants.js index 21cdbef05a1..ee3f30de880 100644 --- a/app/assets/javascripts/incidents/constants.js +++ b/app/assets/javascripts/incidents/constants.js @@ -47,6 +47,7 @@ export const ESCALATION_STATUSES = { 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_ESCALATION_STATUS_TEST_ID = { 'data-testid': 'incident-management-status-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'; |