SONAR-7177 sort files before directories

diff --git a/server/sonar-web/src/main/js/apps/code/reducers/index.js b/server/sonar-web/src/main/js/apps/code/reducers/index.js
index 0e697778d32f8f78ec7a7374c3b28f47d59fae85..988140f717bd652c229b40c0e44fe81187550a09 100644 (file)
--- a/server/sonar-web/src/main/js/apps/code/reducers/index.js
+++ b/server/sonar-web/src/main/js/apps/code/reducers/index.js
@@ -55,7 +55,7 @@ function compare (a, b) {
 }
 
 function sortChildren (children) {
-  const QUALIFIERS_ORDER = ['DIR', 'FIL', 'UTS'];
+  const QUALIFIERS_ORDER = ['FIL', 'UTS', 'DIR'];
   const temp = [...children];
   temp.sort((a, b) => {
     const qualifierA = QUALIFIERS_ORDER.indexOf(a.qualifier);

diff --git a/server/sonar-web/tests/apps/code/store-test.js b/server/sonar-web/tests/apps/code/store-test.js
index 04b1e179835a24dec03aafab102879ae27ea18fa..613eee6517e2827c3c543fa4ea289f8986b71bc6 100644 (file)
--- a/server/sonar-web/tests/apps/code/store-test.js
+++ b/server/sonar-web/tests/apps/code/store-test.js
@@ -78,12 +78,12 @@ describe('Code :: Store', () => {
         it('should sort components by qualifier and then by name', () => {
           const component = {};
           const componentsBefore = [
-            { key: 'A', name: 'A', qualifier: 'FIL' },
-            { key: 'B', name: 'B', qualifier: 'DIR' }
+            { key: 'A', name: 'A', qualifier: 'DIR' },
+            { key: 'B', name: 'B', qualifier: 'FIL' }
           ];
           const componentsAfter = [
-            { key: 'B', name: 'B', qualifier: 'DIR' },
-            { key: 'A', name: 'A', qualifier: 'FIL' }
+            { key: 'B', name: 'B', qualifier: 'FIL' },
+            { key: 'A', name: 'A', qualifier: 'DIR' }
           ];
           expect(current(initialState, browseAction(component, componentsBefore)).components)
               .to.deep.equal(componentsAfter);