]> source.dussan.org Git - sonarqube.git/commitdiff
sort pull requests by key
authorStas Vilchik <stas.vilchik@sonarsource.com>
Tue, 27 Mar 2018 08:47:58 +0000 (10:47 +0200)
committerSonarTech <sonartech@sonarsource.com>
Wed, 28 Mar 2018 18:20:58 +0000 (20:20 +0200)
server/sonar-web/src/main/js/helpers/branches.ts

index 510ed8c3f85481723729dce80b0e55f00739443d..cb930b0a80b1558294fc04153d605c97a6ac9635 100644 (file)
@@ -120,8 +120,8 @@ export function sortBranchesAsTree(branchLikes: BranchLike[]) {
 
   // finally all orhpan pull requests and branches
   result.push(
-    ...pullRequests.filter(pr => pr.isOrphan),
-    ...shortLivingBranches.filter(branch => branch.isOrphan)
+    ...sortBy(pullRequests.filter(pr => pr.isOrphan), pullRequest => pullRequest.key),
+    ...sortBy(shortLivingBranches.filter(branch => branch.isOrphan), branch => branch.name)
   );
 
   return result;
@@ -139,11 +139,11 @@ export function sortBranchesAsTree(branchLikes: BranchLike[]) {
       i++;
     }
 
-    return sortBy(found, 'name');
+    return sortBy(found, branch => branch.name);
   }
 
   function getPullRequests(base: string) {
-    return pullRequests.filter(pr => pr.base === base);
+    return sortBy(pullRequests.filter(pr => pr.base === base), pullRequest => pullRequest.key);
   }
 }