From bcd383c14f055053b9cf639ed932b7f00b3b4bc8 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 19 Jan 2024 10:46:45 +0000
Subject: [PATCH] Fixes the merge checks ordering on Firefox
---
.../components/merge_checks.vue | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue b/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue
index 89095a55a117f..9afed170097ed 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/merge_checks.vue
@@ -99,15 +99,11 @@ export default {
return this.state.mergeabilityChecks || [];
},
sortedChecks() {
- return [...this.checks]
- .sort((a, b) => {
- if (a.status === 'FAILED' && b.status !== 'FAILED') return -1;
- if (a.status === 'SUCCESS' && b.status !== 'SUCCESS')
- return b.status === 'FAILED' ? 1 : -1;
+ const order = ['FAILED', 'SUCCESS'];
- return 0;
- })
- .filter((s) => s.status !== 'INACTIVE');
+ return [...this.checks]
+ .filter((s) => s.status !== 'INACTIVE')
+ .sort((a, b) => order.indexOf(a.status) - order.indexOf(b.status));
},
failedChecks() {
return this.checks.filter((c) => c.status.toLowerCase() === 'failed');
--
GitLab