Skip to content

The Unified and Autonomous Development Platform

chore: Sort various dropdowns in filter editor

Robin Shen3ff5e40419fd
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java
index 445750815d..e5f710a7fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java
@@ -7,6 +7,7 @@ import static java.util.stream.Collectors.toList;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
@@ -146,7 +147,9 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {
@Override
protected Map<String, String> load() {
var map = new LinkedHashMap<String, String>();
- for (String jobName: getBuildManager().getAccessibleJobNames(getProject())) {
+ var jobNames = new ArrayList<>(getBuildManager().getAccessibleJobNames(getProject()));
+ Collections.sort(jobNames);
+ for (String jobName: jobNames) {
map.put(jobName, jobName);
}
return map;
@@ -169,47 +172,6 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {
});
add(jobChoice);
- var ranAgentChoice = new StringMultiChoice("ranAgent", new IModel<Collection<String>>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Collection<String> getObject() {
- var criterias = getMatchingCriterias(getModelObject().getCriteria(), RanOnCriteria.class, null);
- return criterias.stream().map(it->it.getValue()).collect(toList());
- }
-
- @Override
- public void setObject(Collection<String> object) {
- var criterias = Criteria.orCriterias(object.stream().map(it->new RanOnCriteria(it)).collect(toList()));
- var query = getModelObject();
- query.setCriteria(setMatchingCriteria(query.getCriteria(), RanOnCriteria.class, criterias, null));
- getModel().setObject(query);
- }
-
- }, new LoadableDetachableModel<Map<String, String>>() {
-
- @Override
- protected Map<String, String> load() {
- var map = new LinkedHashMap<String, String>();
- for (Agent agent: getAgentManager().query()) {
- map.put(agent.getName(), agent.getName());
- }
- return map;
- }
- }, false);
-
- ranAgentChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- }
-
- });
- add(ranAgentChoice);
-
var submittedByChoice = new UserMultiChoice("submittedBy", new IModel<Collection<User>>() {
@Override
@@ -234,7 +196,10 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {
@Override
protected List<User> load() {
- return getUserManager().query();
+ var users = getUserManager().query();
+ var cache = getUserManager().cloneCache();
+ users.sort(cache.comparingDisplayName(new ArrayList<>()));
+ return users;
}
}) {
@@ -299,6 +264,49 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {
});
add(labelChoice);
+ var ranAgentChoice = new StringMultiChoice("ranAgent", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), RanOnCriteria.class, null);
+ return criterias.stream().map(it->it.getValue()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new RanOnCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), RanOnCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ var agents = new ArrayList<>(getAgentManager().query());
+ agents.sort(Comparator.comparing(Agent::getName));
+ for (Agent agent: agents) {
+ map.put(agent.getName(), agent.getName());
+ }
+ return map;
+ }
+ }, false);
+
+ ranAgentChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(ranAgentChoice);
+
var submittedAfterPicker = new DatePicker("submittedAfter", new IModel<Date>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java
index b6ffaa77ef..4c3f9b69c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java
@@ -4,6 +4,7 @@ import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.I
import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.IsUntil;
import static java.util.stream.Collectors.toList;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.LinkedHashMap;
@@ -117,7 +118,10 @@ class CodeCommentFilterPanel extends FilterEditPanel<CodeComment> {
@Override
protected List<User> load() {
- return getUserManager().query();
+ var users = getUserManager().query();
+ var cache = getUserManager().cloneCache();
+ users.sort(cache.comparingDisplayName(new ArrayList<>()));
+ return users;
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
index e87e27c010..3f0ec12ffc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
@@ -146,7 +146,11 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {
@Override
protected Map<String, String> load() {
- return choiceValues.stream().collect(Collectors.toMap(it -> it, it -> it));
+ var map = new LinkedHashMap<String, String>();
+ for (var value: choiceValues) {
+ map.put(value, value);
+ }
+ return map;
}
}, false);
@@ -344,7 +348,10 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {
@Override
protected List<User> load() {
- return getUserManager().query();
+ var users = getUserManager().query();
+ var cache = getUserManager().cloneCache();
+ users.sort(cache.comparingDisplayName(new ArrayList<>()));
+ return users;
}
}) {
@@ -389,7 +396,11 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {
@Override
protected Map<String, String> load() {
- return getProject().getHierarchyIterations().stream().collect(Collectors.toMap(it -> it.getName(), it -> it.getName()));
+ var map = new LinkedHashMap<String, String>();
+ for (var iteration: getProject().getSortedHierarchyIterations()) {
+ map.put(iteration.getName(), iteration.getName());
+ }
+ return map;
}
}, false);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index f7f92a2014..aa344ee315 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -483,7 +483,7 @@ public abstract class IssueListPanel extends Panel {
protected List<Project> load() {
List<Project> projects = new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
- ProjectCache cache = getProjectManger().cloneCache();
+ ProjectCache cache = getProjectManager().cloneCache();
CollectionUtils.filter(projects, new Predicate<Project>() {
@Override
@@ -1495,7 +1495,7 @@ public abstract class IssueListPanel extends Panel {
private List<Project> getTargetProjects(boolean excludeCurrent) {
Collection<Project> collection = SecurityUtils.getAuthorizedProjects(new AccessProject());
- ProjectCache cache = getProjectManger().cloneCache();
+ ProjectCache cache = getProjectManager().cloneCache();
CollectionUtils.filter(collection, new Predicate<Project>() {
@@ -1902,7 +1902,7 @@ public abstract class IssueListPanel extends Panel {
setOutputMarkupId(true);
}
- private ProjectManager getProjectManger() {
+ private ProjectManager getProjectManager() {
return OneDev.getInstance(ProjectManager.class);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java
index ff587e98fe..cb1adb1f85 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java
@@ -121,7 +121,10 @@ class PackFilterPanel extends FilterEditPanel<Pack> {
@Override
protected List<Project> load() {
- return new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ var projects = new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ var cache = getProjectManager().cloneCache();
+ projects.sort(cache.comparingPath());
+ return projects;
}
}) {
@@ -166,7 +169,10 @@ class PackFilterPanel extends FilterEditPanel<Pack> {
@Override
protected List<User> load() {
- return getUserManager().query();
+ var users = getUserManager().query();
+ var cache = getUserManager().cloneCache();
+ users.sort(cache.comparingDisplayName(new ArrayList<>()));
+ return users;
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java
index 980c23854a..fa9244c6e8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java
@@ -138,7 +138,10 @@ class ProjectFilterPanel extends FilterEditPanel<Project> {
@Override
protected List<Project> load() {
- return new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ var projects = new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ var cache = getProjectManager().cloneCache();
+ projects.sort(cache.comparingPath());
+ return projects;
}
}) {
@@ -183,8 +186,12 @@ class ProjectFilterPanel extends FilterEditPanel<Project> {
@Override
protected List<Project> load() {
- return new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ var projects = new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ var cache = getProjectManager().cloneCache();
+ projects.sort(cache.comparingPath());
+ return projects;
}
+
}) {
@Override
@@ -227,8 +234,11 @@ class ProjectFilterPanel extends FilterEditPanel<Project> {
}, new LoadableDetachableModel<List<User>>() {
@Override
- protected List<User> load() {
- return getUserManager().query();
+ protected List<User> load() {
+ var users = getUserManager().query();
+ var cache = getUserManager().cloneCache();
+ users.sort(cache.comparingDisplayName(new ArrayList<>()));
+ return users;
}
}) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java
index 2364f8205b..2c134b40ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java
@@ -127,7 +127,10 @@ class PullRequestFilterPanel extends FilterEditPanel<PullRequest> {
@Override
protected List<User> load() {
- return getUserManager().query();
+ var users = getUserManager().query();
+ var cache = getUserManager().cloneCache();
+ users.sort(cache.comparingDisplayName(new ArrayList<>()));
+ return users;
}
}) {
@@ -172,7 +175,10 @@ class PullRequestFilterPanel extends FilterEditPanel<PullRequest> {
@Override
protected List<User> load() {
- return getUserManager().query();
+ var users = getUserManager().query();
+ var cache = getUserManager().cloneCache();
+ users.sort(cache.comparingDisplayName(new ArrayList<>()));
+ return users;
}
}) {