The Unified and Autonomous Development Platform
chore: Do not autofocus on various filter edit panels
Robin Shenffb591bfb45e
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.javaindex 1d867a1122..9ed7465e34 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@@ -14,18 +14,14 @@ import java.util.List;import java.util.Objects;import java.util.function.Predicate;-import org.jspecify.annotations.Nullable;-+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import org.jspecify.annotations.Nullable;import io.onedev.server.OneDev;-import io.onedev.server.service.AgentService;-import io.onedev.server.service.BuildService;-import io.onedev.server.service.LabelSpecService;-import io.onedev.server.service.UserService;import io.onedev.server.model.Agent;import io.onedev.server.model.Build;import io.onedev.server.model.Project;@@ -47,6 +43,10 @@ import io.onedev.server.search.entity.build.SuccessfulCriteria;import io.onedev.server.search.entity.build.TimedOutCriteria;import io.onedev.server.search.entity.build.WaitingCriteria;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.AgentService;+import io.onedev.server.service.BuildService;+import io.onedev.server.service.LabelSpecService;+import io.onedev.server.service.UserService;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.datepicker.DatePicker;@@ -365,7 +365,9 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {}});- add(submittedBeforePicker);+ add(submittedBeforePicker);++ add(AttributeModifier.append("class", "no-autofocus"));}@Nullablediff --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.javaindex d1cfba8484..766fb09000 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@@ -11,6 +11,7 @@ import java.util.List;import java.util.Objects;import java.util.function.Predicate;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;@@ -19,7 +20,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.service.UserService;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;@@ -29,6 +29,7 @@ import io.onedev.server.search.entity.codecomment.LastActivityDateCriteria;import io.onedev.server.search.entity.codecomment.ResolvedCriteria;import io.onedev.server.search.entity.codecomment.StatusCriteria;import io.onedev.server.search.entity.codecomment.UnresolvedCriteria;+import io.onedev.server.service.UserService;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.datepicker.DatePicker;@@ -211,6 +212,8 @@ class CodeCommentFilterPanel extends FilterEditPanel<CodeComment> {});add(notActiveSincePicker);++ add(AttributeModifier.append("class", "no-autofocus"));}private static UserService getUserService() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.htmlindex 00b19b62e4..3ca759f77e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="commit-filter-edit">+ <div class="commit-filter-edit no-autofocus"><div class="mb-3 font-size-sm text-muted"><wicket:svg href="bulb" class="icon"/><wicket:t>Below are some common criterias. Type in search box above to view the complete list and available combinations.</wicket:t>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.javaindex 30975e4a0d..f436a539c0 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@@ -12,8 +12,7 @@ import java.util.List;import java.util.Objects;import java.util.function.Predicate;-import org.jspecify.annotations.Nullable;-+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -23,13 +22,11 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import org.jspecify.annotations.Nullable;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.service.GroupService;-import io.onedev.server.service.SettingService;-import io.onedev.server.service.UserService;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;@@ -51,6 +48,9 @@ import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.search.entity.issue.SubmittedByCriteria;import io.onedev.server.search.entity.issue.SubmittedByUserCriteria;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.GroupService;+import io.onedev.server.service.SettingService;+import io.onedev.server.service.UserService;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.datepicker.DatePicker;@@ -503,6 +503,8 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {});add(notActiveSincePicker);++ add(AttributeModifier.append("class", "no-autofocus"));}@Nullablediff --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.javaindex b7c2de7a18..0fe4dacfbd 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@@ -12,15 +12,13 @@ import java.util.List;import java.util.Objects;import java.util.function.Predicate;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.service.LabelSpecService;-import io.onedev.server.service.ProjectService;-import io.onedev.server.service.UserService;import io.onedev.server.model.Pack;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -35,6 +33,9 @@ import io.onedev.server.search.entity.pack.PublishedViaProjectCriteria;import io.onedev.server.search.entity.pack.TypeCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.service.LabelSpecService;+import io.onedev.server.service.ProjectService;+import io.onedev.server.service.UserService;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.datepicker.DatePicker;@@ -300,6 +301,8 @@ class PackFilterPanel extends FilterEditPanel<Pack> {});add(publishedBeforePicker);++ add(AttributeModifier.append("class", "no-autofocus"));}private ProjectService getProjectService() {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.javaindex 5196dda44f..fe65a4ec0e 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@@ -13,6 +13,7 @@ import java.util.List;import java.util.Objects;import java.util.function.Predicate;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.markup.html.form.CheckBox;@@ -20,9 +21,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.service.LabelSpecService;-import io.onedev.server.service.ProjectService;-import io.onedev.server.service.UserService;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;@@ -36,6 +34,9 @@ import io.onedev.server.search.entity.project.OwnedByUserCriteria;import io.onedev.server.search.entity.project.RootsCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.service.LabelSpecService;+import io.onedev.server.service.ProjectService;+import io.onedev.server.service.UserService;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.datepicker.DatePicker;@@ -371,6 +372,7 @@ class ProjectFilterPanel extends FilterEditPanel<Project> {});add(notActiveSincePicker);+ add(AttributeModifier.append("class", "no-autofocus"));}private LabelSpecService getLabelSpecService() {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.javaindex cfc48dc588..f7daa9ab7f 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@@ -14,14 +14,13 @@ import java.util.List;import java.util.Objects;import java.util.function.Predicate;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.service.LabelSpecService;-import io.onedev.server.service.UserService;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;@@ -35,6 +34,8 @@ import io.onedev.server.search.entity.pullrequest.OpenCriteria;import io.onedev.server.search.entity.pullrequest.StatusCriteria;import io.onedev.server.search.entity.pullrequest.SubmittedByCriteria;import io.onedev.server.search.entity.pullrequest.SubmittedByUserCriteria;+import io.onedev.server.service.LabelSpecService;+import io.onedev.server.service.UserService;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.datepicker.DatePicker;@@ -315,6 +316,8 @@ class PullRequestFilterPanel extends FilterEditPanel<PullRequest> {});add(notActiveSincePicker);++ add(AttributeModifier.append("class", "no-autofocus"));}private LabelSpecService getLabelSpecService() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.javaindex ffbdc0efd3..35a2fa85f3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java@@ -10,6 +10,7 @@ import java.util.Date;import java.util.LinkedHashMap;import java.util.List;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.markup.html.form.CheckBox;@@ -18,7 +19,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import io.onedev.server.OneDev;-import io.onedev.server.service.AgentService;import io.onedev.server.model.Agent;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.agent.AgentQueryLexer;@@ -31,6 +31,7 @@ import io.onedev.server.search.entity.agent.OsArchCriteria;import io.onedev.server.search.entity.agent.OsCriteria;import io.onedev.server.search.entity.agent.PausedCriteria;import io.onedev.server.search.entity.agent.StatusCriteria;+import io.onedev.server.service.AgentService;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.datepicker.DatePicker;@@ -294,6 +295,8 @@ class AgentFilterPanel extends FilterEditPanel<Agent> {});add(notUsedSincePicker);++ add(AttributeModifier.append("class", "no-autofocus"));}private static AgentService getAgentService() {