From 6e68ec11af3da60d550e297be7c6f580af9eae3f Mon Sep 17 00:00:00 2001
From: 7PH <benjamin.raymond@sonarsource.com>
Date: Thu, 1 Feb 2024 16:22:19 +0100
Subject: [PATCH] SONAR-21455 Always show required label on overview cards

---
 .../apps/overview/branches/MeasuresPanelPercentCards.tsx  | 8 ++++----
 .../js/apps/overview/branches/NewCodeMeasuresPanel.tsx    | 3 +--
 .../apps/overview/branches/OverallCodeMeasuresPanel.tsx   | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelPercentCards.tsx b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelPercentCards.tsx
index b27c94833ff..17d5cdc8520 100644
--- a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelPercentCards.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelPercentCards.tsx
@@ -32,14 +32,14 @@ interface Props {
   branch?: BranchLike;
   component: Component;
   measures: MeasureEnhanced[];
-  failedConditions: QualityGateStatusConditionEnhanced[];
+  conditions: QualityGateStatusConditionEnhanced[];
 }
 
 /**
  * Renders Coverage and Duplication cards for the Overview page.
  */
 export default function MeasuresPanelPercentCards(props: Readonly<Props>) {
-  const { useDiffMetric, branch, component, measures, failedConditions } = props;
+  const { useDiffMetric, branch, component, measures, conditions } = props;
 
   const isApp = isApplication(component.qualifier);
 
@@ -48,7 +48,7 @@ export default function MeasuresPanelPercentCards(props: Readonly<Props>) {
       <MeasuresCardPercent
         branchLike={branch}
         componentKey={component.key}
-        conditions={failedConditions}
+        conditions={conditions}
         measures={measures}
         measurementType={MeasurementType.Coverage}
         label="overview.quality_gate.coverage"
@@ -67,7 +67,7 @@ export default function MeasuresPanelPercentCards(props: Readonly<Props>) {
       <MeasuresCardPercent
         branchLike={branch}
         componentKey={component.key}
-        conditions={failedConditions}
+        conditions={conditions}
         measures={measures}
         measurementType={MeasurementType.Duplication}
         label="overview.quality_gate.duplications"
diff --git a/server/sonar-web/src/main/js/apps/overview/branches/NewCodeMeasuresPanel.tsx b/server/sonar-web/src/main/js/apps/overview/branches/NewCodeMeasuresPanel.tsx
index a127bf27f2d..c1fe8cfce32 100644
--- a/server/sonar-web/src/main/js/apps/overview/branches/NewCodeMeasuresPanel.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/branches/NewCodeMeasuresPanel.tsx
@@ -61,7 +61,6 @@ export default function NewCodeMeasuresPanel(props: Readonly<Props>) {
   const isApp = isApplication(component.qualifier);
 
   const conditions = qgStatuses?.flatMap((qg) => qg.conditions) ?? [];
-  const failedConditions = qgStatuses?.flatMap((qg) => qg.failedConditions) ?? [];
 
   const newIssues = getLeakValue(findMeasure(measures, MetricKey.new_violations));
   const newIssuesCondition = conditions.find((c) => c.metric === MetricKey.new_violations);
@@ -160,7 +159,7 @@ export default function NewCodeMeasuresPanel(props: Readonly<Props>) {
         branch={branch}
         component={component}
         measures={measures}
-        failedConditions={failedConditions}
+        conditions={conditions}
       />
 
       <MeasuresCardNumber
diff --git a/server/sonar-web/src/main/js/apps/overview/branches/OverallCodeMeasuresPanel.tsx b/server/sonar-web/src/main/js/apps/overview/branches/OverallCodeMeasuresPanel.tsx
index 5699c44722b..bd8357db46a 100644
--- a/server/sonar-web/src/main/js/apps/overview/branches/OverallCodeMeasuresPanel.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/branches/OverallCodeMeasuresPanel.tsx
@@ -57,7 +57,6 @@ export default function OverallCodeMeasuresPanel(props: Readonly<OverallCodeMeas
 
   const isApp = isApplication(component.qualifier);
   const conditions = qgStatuses?.flatMap((qg) => qg.conditions) ?? [];
-  const failedConditions = qgStatuses?.flatMap((qg) => qg.failedConditions) ?? [];
   const acceptedIssues = findMeasure(measures, MetricKey.accepted_issues)?.value;
   const securityHotspots = findMeasure(measures, MetricKey.security_hotspots)?.value;
   const securityRating = findMeasure(measures, MetricKey.security_review_rating)?.value;
@@ -114,7 +113,7 @@ export default function OverallCodeMeasuresPanel(props: Readonly<OverallCodeMeas
           branch={branch}
           component={component}
           measures={measures}
-          failedConditions={failedConditions}
+          conditions={conditions}
         />
 
         <MeasuresCardNumber
-- 
2.39.5