SONAR-9640 Reorder coverage and duplications graphs on the project activity page

server/sonar-web/src/main/js/apps/projectActivity/__tests__/utils-test.js

@@ -187,8 +187,8 @@ describe('getDisplayedHistoryMetrics', () => {
       'vulnerabilities'
     ]);
     expect(utils.getDisplayedHistoryMetrics('coverage', customMetrics)).toEqual([
-      'uncovered_lines',
-      'lines_to_cover'
+      'lines_to_cover',
+      'uncovered_lines'
     ]);
   });
   it('should return all custom metrics for the custom graph', () => {
@@ -208,8 +208,8 @@ describe('getHistoryMetrics', () => {
       'sqale_rating'
     ]);
     expect(utils.getHistoryMetrics('coverage', customMetrics)).toEqual([
-      'uncovered_lines',
       'lines_to_cover',
+      'uncovered_lines',
       'coverage'
     ]);
     expect(utils.getHistoryMetrics('custom', customMetrics)).toEqual(customMetrics);

server/sonar-web/src/main/js/apps/projectActivity/utils.js

@@ -40,8 +40,8 @@ export const DEFAULT_GRAPH = 'issues';
 export const GRAPH_TYPES = ['issues', 'coverage', 'duplications', 'custom'];
 export const GRAPHS_METRICS_DISPLAYED = {
   issues: ['bugs', 'code_smells', 'vulnerabilities'],
-  coverage: ['uncovered_lines', 'lines_to_cover'],
-  duplications: ['duplicated_lines', 'ncloc']
+  coverage: ['lines_to_cover', 'uncovered_lines'],
+  duplications: ['ncloc', 'duplicated_lines']
 };
 export const GRAPHS_METRICS = {
   issues: GRAPHS_METRICS_DISPLAYED['issues'].concat([
@@ -125,7 +125,8 @@ export function generateSeries(
           type: metric ? metric.type : 'INT'
         };
       }),
-    serie => displayedMetrics.indexOf(serie.name)
+    serie =>
+      displayedMetrics.indexOf(serie.name === 'covered_lines' ? 'uncovered_lines' : serie.name)
   );
 }
 

server/sonar-web/src/main/less/components/graphics.less

@@ -101,8 +101,8 @@
 /*
  * Line Chart
  */
-@defaultSerieColor: @darkBlue;
-@serieColor1: @blue;
+@defaultSerieColor: @blue;
+@serieColor1: @darkBlue;
 @serieColor2: #24c6e0;
 
 .line-chart {