From b39512ed755239198a9c294b6a45e65c05900235 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Aug 2022 08:17:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-3-stable-ee --- .../components/graph/job_group_dropdown.vue | 5 +- .../pipelines/components/graph/job_item.vue | 3 ++ .../components/performance_insights_modal.vue | 9 ++-- .../pipelines/components/pipeline_tabs.vue | 18 ++++--- .../pipelines_list/empty_state/ci_templates.vue | 14 ++++-- .../pipelines_list/pipeline_multi_actions.vue | 40 ++++++++++------ .../components/test_reports/test_reports.vue | 26 +++++----- .../components/test_reports/test_suite_table.vue | 16 +++---- .../components/test_reports/test_summary.vue | 55 ++++++++++------------ .../components/test_reports/test_summary_table.vue | 54 ++++++++++----------- app/assets/javascripts/pipelines/constants.js | 2 +- .../pipelines/mixins/pipelines_mixin.js | 13 +++-- app/assets/javascripts/pipelines/pipeline_tabs.js | 33 ++++++++++++- .../pipelines/stores/test_reports/actions.js | 1 - 14 files changed, 176 insertions(+), 113 deletions(-) (limited to 'app/assets/javascripts/pipelines') diff --git a/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue b/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue index 795ba91a164..8d764fad0c5 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue @@ -46,6 +46,9 @@ export default { const { name, status } = this.group; return `${name} - ${status.label}`; }, + jobGroupClasses() { + return [this.cssClassJobName, `job-${this.group.status.group}`]; + }, }, errorCaptured(err, _vm, info) { reportToSentry('job_group_dropdown', `error: ${err}, info: ${info}`); @@ -68,7 +71,7 @@ export default { type="button" data-toggle="dropdown" data-display="static" - :class="cssClassJobName" + :class="jobGroupClasses" class="dropdown-menu-toggle gl-pipeline-job-width! gl-pr-4!" >
diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue index 362571930d6..377f21b299f 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_item.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue @@ -200,6 +200,9 @@ export default { }, { 'gl-rounded-lg': this.isBridge }, this.cssClassJobName, + { + [`job-${this.status.group}`]: this.isSingleItem, + }, ]; }, }, diff --git a/app/assets/javascripts/pipelines/components/performance_insights_modal.vue b/app/assets/javascripts/pipelines/components/performance_insights_modal.vue index ae6b9186930..fdbf0ca19bc 100644 --- a/app/assets/javascripts/pipelines/components/performance_insights_modal.vue +++ b/app/assets/javascripts/pipelines/components/performance_insights_modal.vue @@ -97,13 +97,16 @@ export default {