SONAR-23298 Deprecate quality_issues in favor of software_quality_issues

4 files changed, 30 insertions, 27 deletions

diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx
index 4f74bc8ede3..54e36c96443 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx
+++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx
@@ -100,9 +100,7 @@ export default function SourceViewerHeader(props: Readonly<Props>) {
               const measure = componentMeasures.find(
                 (m) => m.metric === (areCCTMeasuresComputed ? metric : deprecatedMetric),
               );
-              const measureValue = areCCTMeasuresComputed
-                ? JSON.parse(measure?.value ?? 'null').total
-                : (measure?.value ?? 0);
+              const measureValue = measure?.value ?? 0;
 
               const linkUrl = getComponentIssuesUrl(project, {
                 ...getBranchLikeQuery(branchLike),
diff --git a/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewer-it.tsx b/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewer-it.tsx
index a1b5a0a8657..d2a9dc2c0ff 100644
--- a/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewer-it.tsx
+++ b/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewer-it.tsx
@@ -345,14 +345,18 @@ it('should show software quality measures in header', async () => {
   renderSourceViewer({ componentMeasures: generateMeasures(), showMeasures: true });
 
   expect(
-    await byLabelText('source_viewer.issue_link_x.3.metric.security_issues.short_name').find(),
+    await byLabelText(
+      'source_viewer.issue_link_x.3.metric.software_quality_security_issues.short_name',
+    ).find(),
   ).toBeInTheDocument();
   expect(
-    await byLabelText('source_viewer.issue_link_x.3.metric.reliability_issues.short_name').find(),
+    await byLabelText(
+      'source_viewer.issue_link_x.3.metric.software_quality_reliability_issues.short_name',
+    ).find(),
   ).toBeInTheDocument();
   expect(
     await byLabelText(
-      'source_viewer.issue_link_x.3.metric.maintainability_issues.short_name',
+      'source_viewer.issue_link_x.3.metric.software_quality_maintainability_issues.short_name',
     ).find(),
   ).toBeInTheDocument();
 });
@@ -366,14 +370,18 @@ it('should show old issue measures in header', async () => {
   });
 
   expect(
-    await byLabelText('source_viewer.issue_link_x.1.metric.security_issues.short_name').find(),
+    await byLabelText(
+      'source_viewer.issue_link_x.1.metric.software_quality_security_issues.short_name',
+    ).find(),
   ).toBeInTheDocument();
   expect(
-    await byLabelText('source_viewer.issue_link_x.1.metric.reliability_issues.short_name').find(),
+    await byLabelText(
+      'source_viewer.issue_link_x.1.metric.software_quality_reliability_issues.short_name',
+    ).find(),
   ).toBeInTheDocument();
   expect(
     await byLabelText(
-      'source_viewer.issue_link_x.1.metric.maintainability_issues.short_name',
+      'source_viewer.issue_link_x.1.metric.software_quality_maintainability_issues.short_name',
     ).find(),
   ).toBeInTheDocument();
 });
@@ -396,12 +404,10 @@ it('should show correct message when component does not exist', async () => {
 function generateMeasures(qualitiesValue = '3.0', overallValue = '1.0', newValue = '2.0') {
   return [
     ...[
-      MetricKey.security_issues,
-      MetricKey.reliability_issues,
-      MetricKey.maintainability_issues,
-    ].map((metric) =>
-      mockMeasure({ metric, value: JSON.stringify({ total: qualitiesValue }), period: undefined }),
-    ),
+      MetricKey.software_quality_security_issues,
+      MetricKey.software_quality_reliability_issues,
+      MetricKey.software_quality_maintainability_issues,
+    ].map((metric) => mockMeasure({ metric, value: qualitiesValue, period: undefined })),
     ...[
       MetricKey.ncloc,
       MetricKey.new_lines,
diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/ActivityGraph-it.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/ActivityGraph-it.tsx
index e144fcf2929..5e76f3e45c8 100644
--- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/ActivityGraph-it.tsx
+++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/ActivityGraph-it.tsx
@@ -55,7 +55,7 @@ describe('rendering', () => {
   });
 
   it.each([
-    ['MQR', 'true', MetricKey.maintainability_issues],
+    ['MQR', 'true', MetricKey.software_quality_maintainability_issues],
     ['Standard', 'false', MetricKey.code_smells],
   ])('should show the correct legend items in %s mode', async (_, mode, metric) => {
     settingsHandler.set(SettingsKey.MQRMode, mode);
@@ -125,9 +125,9 @@ it.each([
   [
     'MQR',
     'true',
-    MetricKey.reliability_issues,
-    MetricKey.maintainability_issues,
-    MetricKey.security_issues,
+    MetricKey.software_quality_reliability_issues,
+    MetricKey.software_quality_maintainability_issues,
+    MetricKey.software_quality_security_issues,
   ],
   ['Standard', 'false', MetricKey.bugs, MetricKey.code_smells, MetricKey.vulnerabilities],
 ])(
@@ -204,7 +204,9 @@ function getPageObject() {
 
     // Add/remove metrics.
     addMetricBtn: byRole('button', { name: 'project_activity.graphs.custom.add' }),
-    maintainabilityIssuesCheckbox: byRole('checkbox', { name: MetricKey.maintainability_issues }),
+    maintainabilityIssuesCheckbox: byRole('checkbox', {
+      name: MetricKey.software_quality_maintainability_issues,
+    }),
     newBugsCheckbox: byRole('checkbox', { name: MetricKey.new_bugs }),
     burnedBudgetCheckbox: byRole('checkbox', { name: MetricKey.burned_budget }),
     hiddenOptionsAlert: byText('project_activity.graphs.custom.type_x_message', {
@@ -284,9 +286,9 @@ function renderActivityGraph(
       MetricKey.bugs,
       MetricKey.code_smells,
       MetricKey.vulnerabilities,
-      MetricKey.maintainability_issues,
-      MetricKey.reliability_issues,
-      MetricKey.security_issues,
+      MetricKey.software_quality_maintainability_issues,
+      MetricKey.software_quality_reliability_issues,
+      MetricKey.software_quality_security_issues,
       MetricKey.blocker_violations,
       MetricKey.lines_to_cover,
       MetricKey.uncovered_lines,
diff --git a/server/sonar-web/src/main/js/components/activity-graph/utils.ts b/server/sonar-web/src/main/js/components/activity-graph/utils.ts
index 9b6562d018b..06ef722bd9e 100644
--- a/server/sonar-web/src/main/js/components/activity-graph/utils.ts
+++ b/server/sonar-web/src/main/js/components/activity-graph/utils.ts
@@ -167,11 +167,8 @@ export function generateSeries(
         );
         return {
           data: measure.history.map((analysis) => {
-            let { value } = analysis;
+            const { value } = analysis;
 
-            if (value !== undefined && isSoftwareQualityMetric) {
-              value = JSON.parse(value).total;
-            }
             return {
               x: analysis.date,
               y: metric?.type === MetricType.Level ? value : Number(value),