correctly order components when drilldown on "new_" measures

diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureDrilldownList.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureDrilldownList.js
index d0f68256d3c28575a0e3421a3f6fd15034fb5bb0..3610b3d0bb47dbd7e74a57822ca7e34a7487067f 100644 (file)
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureDrilldownList.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureDrilldownList.js
@@ -49,11 +49,19 @@ export default class MeasureDrilldownList extends React.Component {
     const { metric, store, updateStore } = this.props;
     const asc = metric.direction === 1;
 
-    const options = {
-      s: 'metric,name',
-      metricSort: metric.key,
-      asc
-    };
+    const options = { asc };
+    if (metric.key.indexOf('new_') === 0) {
+      Object.assign(options, {
+        s: 'metricPeriod,name',
+        metricSort: metric.key,
+        metricPeriodSort: 1
+      });
+    } else {
+      Object.assign(options, {
+        s: 'metric,name',
+        metricSort: metric.key
+      });
+    }
 
     updateStore({
       list: {

diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureDrilldownTree.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureDrilldownTree.js
index f6da317ad5bda5fee9540c109cf653efaf135510..11501e990c7d9438d7ac4f52d7bce3350da6194e 100644 (file)
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureDrilldownTree.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureDrilldownTree.js
@@ -49,11 +49,19 @@ export default class MeasureDrilldownTree extends React.Component {
     const { metric, store, updateStore } = this.props;
     const asc = metric.direction === 1;
 
-    const options = {
-      s: 'metric,name',
-      metricSort: metric.key,
-      asc
-    };
+    const options = { asc };
+    if (metric.key.indexOf('new_') === 0) {
+      Object.assign(options, {
+        s: 'metricPeriod,name',
+        metricSort: metric.key,
+        metricPeriodSort: 1
+      });
+    } else {
+      Object.assign(options, {
+        s: 'metric,name',
+        metricSort: metric.key
+      });
+    }
 
     const componentKey = baseComponent.refKey || baseComponent.key;