]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-21455 Highlight software quality breakdown cards even when rating is A
author7PH <benjamin.raymond@sonarsource.com>
Tue, 30 Jan 2024 17:44:38 +0000 (18:44 +0100)
committersonartech <sonartech@sonarsource.com>
Wed, 31 Jan 2024 20:03:37 +0000 (20:03 +0000)
server/sonar-web/src/main/js/apps/overview/branches/SoftwareImpactMeasureCard.tsx
server/sonar-web/src/main/js/apps/overview/branches/__tests__/BranchOverview-it.tsx

index b4d71c1b9ef114812f8c3227138998fc26728551..d0ea22018fb1ed29af8bc052f6b168be5abba0c2 100644 (file)
@@ -30,7 +30,7 @@ import {
 import * as React from 'react';
 import { useIntl } from 'react-intl';
 import { DEFAULT_ISSUES_QUERY } from '../../../components/shared/utils';
-import { formatMeasure, formatRating } from '../../../helpers/measures';
+import { formatMeasure } from '../../../helpers/measures';
 import { getComponentIssuesUrl } from '../../../helpers/urls';
 import {
   SoftwareImpactMeasureData,
@@ -62,22 +62,18 @@ export function SoftwareImpactMeasureCard(props: Readonly<SoftwareImpactBreakdow
 
   // Find rating measure
   const ratingMeasure = measures.find((m) => m.metric.key === ratingMetricKey);
-  const ratingLabel = ratingMeasure?.value ? formatRating(ratingMeasure.value) : undefined;
 
   const totalLinkHref = getComponentIssuesUrl(component.key, {
     ...DEFAULT_ISSUES_QUERY,
     impactSoftwareQualities: softwareQuality,
   });
 
-  // We highlight the highest severity breakdown card with non-zero count if the rating is not A
-  let highlightedSeverity: SoftwareImpactSeverity | undefined;
-  if (measure && (!ratingLabel || ratingLabel !== 'A')) {
-    highlightedSeverity = [
-      SoftwareImpactSeverity.High,
-      SoftwareImpactSeverity.Medium,
-      SoftwareImpactSeverity.Low,
-    ].find((severity) => measure[severity] > 0);
-  }
+  // We highlight the highest severity breakdown card with non-zero count
+  const highlightedSeverity =
+    measure &&
+    [SoftwareImpactSeverity.High, SoftwareImpactSeverity.Medium, SoftwareImpactSeverity.Low].find(
+      (severity) => measure[severity] > 0,
+    );
 
   return (
     <LightGreyCard
index ef86a35200461430174859a898f35956ca17ad53..a956a8b75e33329fbcde2d67468e006cfd5df504 100644 (file)
@@ -281,7 +281,7 @@ describe('project overview', () => {
         [SoftwareImpactSeverity.Medium]: 2,
         [SoftwareImpactSeverity.Low]: 1,
       },
-      [false, false, false],
+      [false, true, false],
     );
     ui.expectSoftwareImpactMeasureCard(
       SoftwareQuality.Maintainability,
@@ -327,7 +327,7 @@ describe('project overview', () => {
         [SoftwareImpactSeverity.Medium]: 2,
         [SoftwareImpactSeverity.Low]: 1,
       },
-      [false, false, false],
+      [false, true, false],
     );
 
     // Maintainability is not computed