aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2016-08-10 14:19:17 +0200
committerStas Vilchik <vilchiks@gmail.com>2016-08-10 14:19:17 +0200
commit7bb8cfe63cffa2f0e6eb33c902320e53cfd4cf21 (patch)
treefd1c69d70be7e84ac0719c03e2279a4f7791381a
parent143f3c560bcf7ceac9585c1dfea7311f037834cb (diff)
downloadsonarqube-7bb8cfe63cffa2f0e6eb33c902320e53cfd4cf21.tar.gz
sonarqube-7bb8cfe63cffa2f0e6eb33c902320e53cfd4cf21.zip
SONAR-7920 sort links
-rw-r--r--server/sonar-web/src/main/js/apps/overview/meta/MetaLinks.js6
-rw-r--r--server/sonar-web/src/main/js/apps/project-admin/links/utils.js2
2 files changed, 5 insertions, 3 deletions
diff --git a/server/sonar-web/src/main/js/apps/overview/meta/MetaLinks.js b/server/sonar-web/src/main/js/apps/overview/meta/MetaLinks.js
index 1bc4b5ce256..067b04483c5 100644
--- a/server/sonar-web/src/main/js/apps/overview/meta/MetaLinks.js
+++ b/server/sonar-web/src/main/js/apps/overview/meta/MetaLinks.js
@@ -19,7 +19,7 @@
*/
import React from 'react';
import { getProjectLinks } from '../../../api/projectLinks';
-import { isProvided } from '../../project-admin/links/utils';
+import { isProvided, orderLinks } from '../../project-admin/links/utils';
export default class MetaLinks extends React.Component {
static propTypes = {
@@ -64,9 +64,11 @@ export default class MetaLinks extends React.Component {
return null;
}
+ const orderedLinks = orderLinks(links);
+
return (
<ul className="overview-meta-list big-spacer-bottom">
- {links.map(link => (
+ {orderedLinks.map(link => (
<li key={link.id}>
<a className="link-with-icon" href={link.url} target="_blank">
{this.renderLinkIcon(link)}
diff --git a/server/sonar-web/src/main/js/apps/project-admin/links/utils.js b/server/sonar-web/src/main/js/apps/project-admin/links/utils.js
index 9a34509d38b..d04c67a4c89 100644
--- a/server/sonar-web/src/main/js/apps/project-admin/links/utils.js
+++ b/server/sonar-web/src/main/js/apps/project-admin/links/utils.js
@@ -36,7 +36,7 @@ export function orderLinks (links) {
const [provided, unknown] = partition(links, isProvided);
return [
...sortBy(provided, link => PROVIDED_TYPES.indexOf(link.type)),
- ...sortBy(unknown, link => link.name)
+ ...sortBy(unknown, link => link.name.toLowerCase())
];
}