Skip to content

The Unified and Autonomous Development Platform

feat(job-list): add search filter to job list panel

Work Horse9608fd727092
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html
index d661dc4117..28670211a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html
@@ -1,6 +1,10 @@
<wicket:panel>
- <div class="job-list">
- <div wicket:id="jobs" class="job">
+ <div class="job-list py-3 px-3">
+ <div class="d-flex align-items-center mb-3">
+ <input wicket:id="search" class="form-control form-control-sm" t:placeholder="Search job"/>
+ <wicket:svg href="magnify" class="icon text-muted icon-magnify"/>
+ </div>
+ <div wicket:id="jobs" class="job">
<div class="head text-nowrap d-flex align-items-center px-3 py-2 bg-light border-top">
<a wicket:id="name" class="name d-flex align-items-center mr-auto"><b wicket:id="label"></b></a>
<a wicket:id="showInList" class="ml-2 d-flex align-items-center" t:data-tippy-content="Show in build list"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
@@ -10,5 +14,6 @@
<div wicket:id="detail"></div>
</div>
</div>
+ <div wicket:id="noJobs" class="no-jobs mb-0 mt-2"><div class="alert alert-notice alert-light-warning">No jobs found</div></div>
</div>
-</wicket:panel>
\ No newline at end of file
+</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
index 42a24c0124..7120a51b15 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
@@ -12,14 +12,17 @@ import javax.inject.Inject;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.ObjectId;
import org.jspecify.annotations.Nullable;
@@ -34,6 +37,7 @@ import io.onedev.server.service.BuildService;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.ProjectScopedCommitAware;
import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.behavior.InputChangeBehavior;
import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;
import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.job.RunJobLink;
@@ -49,6 +53,14 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitA
private final String refName;
private final List<Job> jobs;
+
+ private WebMarkupContainer jobsContainer;
+
+ private WebMarkupContainer noJobsContainer;
+
+ private TextField<String> searchField;
+
+ private String searchInput;
public JobListPanel(String id, ObjectId commitId, @Nullable String refName, List<Job> jobs) {
super(id);
@@ -67,72 +79,113 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitA
@Override
protected void onInitialize() {
super.onInitialize();
+
+ searchField = new TextField<>("search", Model.of(""));
+ add(searchField);
+ searchField.add(new InputChangeBehavior() {
+
+ @Override
+ protected void onInputChange(AjaxRequestTarget target) {
+ searchInput = searchField.getInput();
+ target.add(jobsContainer);
+ target.add(noJobsContainer);
+ }
+
+ });
+
+ jobsContainer = new WebMarkupContainer("jobs") {
+
+ @Override
+ protected void onBeforeRender() {
+ RepeatingView jobsView = new RepeatingView("jobs");
+ for (Job job: getFilteredJobs()) {
+ WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());
+ Status status = getProject().getCommitStatuses(commitId, getPullRequest(), refName).get(job.getName());
+
+ Link<Void> defLink = new JobDefLink("name", commitId, job.getName()) {
+
+ @Override
+ protected Project getProject() {
+ return JobListPanel.this.getProject();
+ }
+
+ };
+ defLink.add(new Label("label", job.getName()));
+ jobItem.add(defLink);
- RepeatingView jobsView = new RepeatingView("jobs");
- add(jobsView);
- for (Job job: jobs) {
- WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());
- Status status = getProject().getCommitStatuses(commitId, getPullRequest(), refName).get(job.getName());
+ jobItem.add(new RunJobLink("run", commitId, job.getName(), refName) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ onRunJob(target);
+ }
+
+ @Override
+ protected Project getProject() {
+ return JobListPanel.this.getProject();
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return JobListPanel.this.getPullRequest();
+ }
+
+ });
- Link<Void> defLink = new JobDefLink("name", commitId, job.getName()) {
-
- @Override
- protected Project getProject() {
- return JobListPanel.this.getProject();
- }
+ jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,
+ ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName(), refName, getPullRequest()), 0)) {
- };
- defLink.add(new Label("label", job.getName()));
- jobItem.add(defLink);
-
- jobItem.add(new RunJobLink("run", commitId, job.getName(), refName) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
- onRunJob(target);
- }
-
- @Override
- protected Project getProject() {
- return JobListPanel.this.getProject();
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(status != null);
+ }
+
+ });
+
+ IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {
+
+ @Override
+ protected List<Build> load() {
+ List<Build> builds = new ArrayList<>(buildService.query(getProject(),
+ commitId, job.getName(), refName, Optional.ofNullable(getPullRequest()),
+ null, new HashMap<>()));
+ builds.sort(Comparator.comparing(Build::getNumber));
+ return builds;
+ }
+
+ };
+ jobItem.add(new MiniBuildListPanel("detail", buildsModel));
+
+ jobItem.setOutputMarkupId(true);
+ jobsView.add(jobItem);
}
+ addOrReplace(jobsView);
+ super.onBeforeRender();
+ }
- @Override
- protected PullRequest getPullRequest() {
- return JobListPanel.this.getPullRequest();
- }
-
- });
-
- jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,
- ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName(), refName, getPullRequest()), 0)) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(status != null);
- }
-
- });
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getFilteredJobs().isEmpty());
+ }
- IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {
-
- @Override
- protected List<Build> load() {
- List<Build> builds = new ArrayList<>(buildService.query(getProject(),
- commitId, job.getName(), refName, Optional.ofNullable(getPullRequest()),
- null, new HashMap<>()));
- builds.sort(Comparator.comparing(Build::getNumber));
- return builds;
- }
-
- };
- jobItem.add(new MiniBuildListPanel("detail", buildsModel));
+ };
+ jobsContainer.setOutputMarkupId(true);
+ add(jobsContainer);
+
+ noJobsContainer = new WebMarkupContainer("noJobs") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getFilteredJobs().isEmpty());
+ }
- jobItem.setOutputMarkupId(true);
- jobsView.add(jobItem);
- }
+ };
+ noJobsContainer.setOutputMarkupPlaceholderTag(true);
+ add(noJobsContainer);
add(new ChangeObserver() {
@@ -143,6 +196,18 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitA
});
}
+
+ private List<Job> getFilteredJobs() {
+ if (searchInput == null || searchInput.isBlank())
+ return jobs;
+ String query = searchInput.toLowerCase();
+ List<Job> filtered = new ArrayList<>();
+ for (Job job : jobs) {
+ if (job.getName().toLowerCase().contains(query))
+ filtered.add(job);
+ }
+ return filtered;
+ }
private Collection<String> getChangeObservables() {
return Sets.newHashSet(Build.getCommitStatusChangeObservable(getProject().getId(), commitId.name()));
@@ -158,6 +223,8 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitA
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new JobListCssResourceReference()));
+ String script = String.format("$('#%s').focus();", searchField.getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css
index 84ac993a61..5fa58761ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css
@@ -1,3 +1,9 @@
.job-list .no-builds {
margin: 0.5rem 1rem !important;
-}
\ No newline at end of file
+}
+.job-list input {
+ padding-right: 2rem;
+}
+.job-list input+.icon {
+ margin-left: -1.8rem;
+}