The Unified and Autonomous Development Platform
Sort tags reversely when import build spec from other projects
Robin Shenb6a5f4556dbe
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 6af05d05b8..3528991349 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -136,12 +136,13 @@ public class SuggestionUtils {@Overridepublic List<InputSuggestion> suggest(Project project, String matchWith) {if (SecurityUtils.canReadCode(project)) {- List<String> tagNames = project.getTagRefs()+ List<String> tags = project.getTagRefs().stream()- .map(it->GitUtils.ref2tag(it.getName())).sorted()+ .map(it->GitUtils.ref2tag(it.getName())).collect(Collectors.toList());- return SuggestionUtils.suggest(tagNames, matchWith);+ Collections.reverse(tags);+ return SuggestionUtils.suggest(tags, matchWith);} else {return new ArrayList<>();}@@ -156,17 +157,28 @@ public class SuggestionUtils {@Overridepublic List<InputSuggestion> suggest(Project project, String matchWith) {if (SecurityUtils.canReadCode(project)) {- List<String> revisions = new ArrayList<>();- revisions.addAll(project.getBranchRefs()+ List<String> branches = project.getBranchRefs().stream()- .map(it->GitUtils.ref2branch(it.getName())).sorted()- .collect(Collectors.toList()));- revisions.addAll(project.getTagRefs()+ .map(it->GitUtils.ref2branch(it.getName()))+ .collect(Collectors.toList());+ Collections.reverse(branches);+ if (project.getDefaultBranch() != null) {+ branches.remove(project.getDefaultBranch());+ branches.add(0, project.getDefaultBranch());+ }++ List<String> tags = project.getTagRefs().stream()- .map(it->GitUtils.ref2tag(it.getName())).sorted()- .collect(Collectors.toList()));+ .map(it->GitUtils.ref2tag(it.getName()))+ .collect(Collectors.toList());+ Collections.reverse(tags);++ List<String> revisions = new ArrayList<>();+ revisions.addAll(branches);+ revisions.addAll(tags);+return SuggestionUtils.suggest(revisions, matchWith);} else {return new ArrayList<>();