correctly order components when drilldown on "new_" measures

2 files changed, 26 insertions, 10 deletions

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 d0f68256d3c..3610b3d0bb4 100644
--- 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 f6da317ad5b..11501e990c7 100644
--- 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;