sort components by qualifier on code page

diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentName.js b/server/sonar-web/src/main/js/apps/code/components/ComponentName.js
index 5f667b8576e9facbad5d8c16cc20acaef23e9d1b..cfe56f473814a3a2dd39de34195cbdf93da55242 100644 (file)
--- a/server/sonar-web/src/main/js/apps/code/components/ComponentName.js
+++ b/server/sonar-web/src/main/js/apps/code/components/ComponentName.js
@@ -61,7 +61,13 @@ const Component = ({ component, rootComponent, previous, canBrowse }) => {
   let inner = null;
 
   if (component.refKey) {
-    inner = <a href={getComponentUrl(component.refKey)}>{name}</a>;
+    inner = (
+        <a className="link-with-icon" href={getComponentUrl(component.refKey)}>
+          <QualifierIcon qualifier={component.qualifier}/>
+          {' '}
+          <span>{name}</span>
+        </a>
+    );
   } else {
     if (canBrowse) {
       const query = { id: rootComponent.key };

diff --git a/server/sonar-web/src/main/js/apps/code/utils.js b/server/sonar-web/src/main/js/apps/code/utils.js
index b0a6e4b2ad04c20822b3de2d8f742460b30188c8..80788455d4f39c3669c1e5cb71bf1d09f60191fc 100644 (file)
--- a/server/sonar-web/src/main/js/apps/code/utils.js
+++ b/server/sonar-web/src/main/js/apps/code/utils.js
@@ -155,7 +155,7 @@ export function retrieveComponentChildren (componentKey, isView) {
 
   const metrics = getMetrics(isView);
 
-  return getChildren(componentKey, metrics, { ps: PAGE_SIZE, s: 'name' })
+  return getChildren(componentKey, metrics, { ps: PAGE_SIZE, s: 'qualifier,name' })
       .then(prepareChildren)
       .then(expandRootDir(metrics))
       .then(r => {