SONAR-8392 Order components by name ascending as default ordering for equalities

3 files changed, 16 insertions, 1 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java
index cab59985488..af94995abd0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ComponentTreeSort.java
@@ -86,6 +86,7 @@ public class ComponentTreeSort {
         primaryOrdering = primaryOrdering.compound(secondaryOrdering);
       }
     }
+    primaryOrdering = primaryOrdering.compound(componentNameOrdering(true));
 
     return primaryOrdering.immutableSortedCopy(components);
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java
index 43e47e025a1..a829d11a989 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeSortTest.java
@@ -138,6 +138,20 @@ public class ComponentTreeSortTest {
   }
 
   @Test
+  public void sort_by_name_ascending_in_case_of_equality() {
+    components = newArrayList(
+      newComponentWithoutSnapshotId("PROJECT 12", Qualifiers.PROJECT, "PROJECT_PATH_1"),
+      newComponentWithoutSnapshotId("PROJECT 11", Qualifiers.PROJECT, "PROJECT_PATH_1"),
+      newComponentWithoutSnapshotId("PROJECT 0", Qualifiers.PROJECT, "PROJECT_PATH_2"));
+
+    ComponentTreeWsRequest wsRequest = newRequest(newArrayList(PATH_SORT), false, null);
+
+    List<ComponentDto> result = sortComponents(wsRequest);
+
+    assertThat(result).extracting("name").containsExactly("PROJECT 0", "PROJECT 11", "PROJECT 12");
+  }
+
+  @Test
   public void sort_by_alert_status_ascending() {
     components = newArrayList(
       newComponentWithoutSnapshotId("PROJECT OK 1", Qualifiers.PROJECT, "PROJECT_OK_PATH_1"),
diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
index 16ba5d4ba82..12f3616697d 100644
--- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
+++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.js
@@ -133,7 +133,7 @@ export default class MeasureContent extends React.PureComponent {
       opts.asc = metric.direction === 1;
       opts.ps = 100;
       opts.metricSort = metric.key;
-      opts.s = isDiff ? 'metricPeriod,name' : 'metric,name';
+      opts.s = isDiff ? 'metricPeriod' : 'metric';
     }
     return { metricKeys, opts: { ...opts, ...options }, strategy };
   };