The Unified and Autonomous Development Platform
feat: allow running job without code read access (#1383)
Robin Shen690a6ed5dd67
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex b2f1a8d172..16777189cb 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -835,14 +835,18 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel}@Nullable- public RefFacade getBranchRef(String revision) {+ public RefFacade getBranchRef(@Nullable String revision) {+ if (revision == null)+ return null;if (!revision.startsWith(Constants.R_HEADS))revision = GitUtils.branch2ref(revision);return getRef(revision);}@Nullable- public RefFacade getTagRef(String revision) {+ public RefFacade getTagRef(@Nullable String revision) {+ if (revision == null)+ return null;if (!revision.startsWith(Constants.R_TAGS))revision = GitUtils.tag2ref(revision);return getRef(revision);diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 4f9abc7c43..a5bdda1f9f 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -2,6 +2,10 @@ package io.onedev.server.model;import com.google.common.collect.Lists;import io.onedev.server.OneDev;+import io.onedev.server.annotation.ChoiceProvider;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.RoleName;+import io.onedev.server.annotation.ShowCondition;import io.onedev.server.entitymanager.LinkSpecManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.role.AllIssueFields;@@ -12,18 +16,11 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.*;import io.onedev.server.util.EditContext;import io.onedev.server.util.facade.RoleFacade;-import io.onedev.server.validation.Validatable;-import io.onedev.server.annotation.ClassValidating;-import io.onedev.server.annotation.RoleName;-import io.onedev.server.annotation.ChoiceProvider;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.ShowCondition;import org.apache.shiro.authz.Permission;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import javax.persistence.*;-import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.NotEmpty;import javax.validation.constraints.NotNull;import java.util.*;@@ -35,9 +32,8 @@ import java.util.*;@Entity@Table(indexes={@Index(columnList="name")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-@ClassValidating@Editable-public class Role extends AbstractEntity implements Permission, Validatable {+public class Role extends AbstractEntity implements Permission {private static final long serialVersionUID = 1L;@@ -374,33 +370,5 @@ public class Role extends AbstractEntity implements Permission, Validatable {return permissions;}-- @Override- public boolean isValid(ConstraintValidatorContext context) {- boolean isValid = true;- if (!isManageProject() && !isManagePullRequests() && !isManageCodeComments() && getCodePrivilege() == CodePrivilege.NONE) {- if (isManageBuilds()) {- isValid = false;- context.disableDefaultConstraintViolation();- context.buildConstraintViolationWithTemplate("Code read privilege is required to manage builds")- .addPropertyNode("manageBuilds").addConstraintViolation();- } else {- for (JobPrivilege privilege: getJobPrivileges()) {- if (privilege.isManageJob()) {- isValid = false;- context.disableDefaultConstraintViolation();- context.buildConstraintViolationWithTemplate("Code read privilege is required to manage jobs")- .addPropertyNode("jobPrivileges").addConstraintViolation();- } else if (privilege.isRunJob()) {- isValid = false;- context.disableDefaultConstraintViolation();- context.buildConstraintViolationWithTemplate("Code read privilege is required to run jobs")- .addPropertyNode("jobPrivileges").addConstraintViolation();- }- }- }- }- return isValid;- }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.javaindex 719c5d4493..1c754da2ca 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java@@ -23,11 +23,12 @@ public class JobPermission implements Permission {jobNamesPatternSet = PatternSet.parse(jobNames);return jobNamesPatternSet;}+@Overridepublic boolean implies(Permission p) {if (p instanceof JobPermission) {JobPermission jobPermission = (JobPermission) p;- return getJobNamesPatternSet().matches(new StringMatcher(), jobPermission.jobNames)+ return (jobPermission.jobNames == null || getJobNamesPatternSet().matches(new StringMatcher(), jobPermission.jobNames))&& privilege.implies(jobPermission.privilege);}return false;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex dfd34a91c5..664c9a4067 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -1,14 +1,17 @@<wicket:panel><div class="build-list card"><div class="card-body">- <form wicket:id="query" class="clearable-wrapper mb-4">- <div class="input-group">- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order builds here">- <span class="input-group-append">- <button wicket:id="submit" type="submit" class="btn btn-icon btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>- </span>- </div>- </form>+ <div class="d-flex mb-4">+ <form wicket:id="query" class="clearable-wrapper flex-grow-1">+ <div class="input-group">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order builds here">+ <span class="input-group-append">+ <button wicket:id="submit" type="submit" class="btn btn-icon btn-outline-secondary" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>+ </span>+ </div>+ </form>+ <a wicket:id="runJob" class="btn btn-primary btn-icon flex-shrink-0 ml-3" title="Run job"><wicket:svg href="play" class="icon"/></a>+ </div><div class="mb-4"><a wicket:id="showSavedQueries" class="show-saved-queries text-gray d-inline-block mb-2 mr-4 text-nowrap"><wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queriesdiff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex dfbbcfc3cf..1e083fe240 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -1,53 +1,6 @@package io.onedev.server.web.component.build.list;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;--import io.onedev.server.git.GitUtils;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-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.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.OddEvenItem;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;-import com.google.common.collect.Sets;-import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;@@ -56,6 +9,7 @@ import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.GitUtils;import io.onedev.server.job.JobManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;@@ -64,12 +18,10 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.search.entity.build.BuildQueryLexer;-import io.onedev.server.search.entity.build.JobCriteria;-import io.onedev.server.search.entity.build.NumberCriteria;-import io.onedev.server.search.entity.build.VersionCriteria;+import io.onedev.server.search.entity.build.*;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.JobPermission;+import io.onedev.server.security.permission.RunJob;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.criteria.Criteria;@@ -83,8 +35,12 @@ import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;+import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.Alignment;+import io.onedev.server.web.component.floating.ComponentTarget;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.job.JobDefLink;+import io.onedev.server.web.component.job.runselector.JobRunSelector;import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.menu.MenuItem;@@ -93,16 +49,57 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;+import io.onedev.server.web.component.project.selector.ProjectSelector;+import io.onedev.server.web.component.revision.RevisionSelector;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+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.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.OddEvenItem;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;++import javax.annotation.Nullable;+import java.util.*;@SuppressWarnings("serial")public abstract class BuildListPanel extends Panel {@@ -132,6 +129,8 @@ public abstract class BuildListPanel extends Panel {private TextField<String> queryInput;+ private Component runJobLink;+private WebMarkupContainer body;private Component saveQueryLink;@@ -894,6 +893,48 @@ public abstract class BuildListPanel extends Panel {});add(queryForm);++ if (getProject() == null) {+ add(runJobLink = new DropdownLink("runJob") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new ProjectSelector(id, new LoadableDetachableModel<>() {++ @Override+ protected List<Project> load() {+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ List<Project> projects = new ArrayList<>(projectManager.getPermittedProjects(new JobPermission(null, new RunJob())));+ projects.sort(projectManager.cloneCache().comparingPath());+ return projects;+ }++ }) {+ @Override+ protected String getTitle() {+ return "Select Project";+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Project project) {+ dropdown.close();+ newRevisionSelector(target, project);+ }++ }.add(AttributeAppender.append("class", "no-current"));+ }++ });+ } else {+ add(runJobLink = new AjaxLink<Void>("runJob") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ newRevisionSelector(target, getProject());+ }++ });+ }dataProvider = new LoadableDetachableDataProvider<Build, Void>() {@@ -1194,6 +1235,60 @@ public abstract class BuildListPanel extends Panel {setOutputMarkupId(true);}+ private void newRevisionSelector(AjaxRequestTarget target, Project project) {+ var projectId = project.getId();++ var placement = new AlignPlacement(100, 100, 100, 0, 0);+ Alignment alignment = new Alignment(new ComponentTarget(runJobLink), placement);+ new FloatingPanel(target, alignment, true, true, null) {++ private Project getRevisionProject() {+ return OneDev.getInstance(ProjectManager.class).load(projectId);+ }++ @Override+ protected Component newContent(String id) {+ return new RevisionSelector(id, new LoadableDetachableModel<>() {+ @Override+ protected Project load() {+ return getRevisionProject();+ }+ }, null, false) {++ @Override+ protected String getTitle() {+ return "Select Branch/Tag";+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, String revision) {+ close();++ new FloatingPanel(target, alignment, true, true, null) {++ @Override+ protected Component newContent(String id) {+ return new JobRunSelector(id, revision) {+ @Override+ protected void onSelect(AjaxRequestTarget target, String jobName) {+ close();+ }++ @Override+ protected Project getProject() {+ return getRevisionProject();+ }+ };+ }++ };+ }+ };+ }++ };+ }+private List<String> getListParams() {if (getProject() != null)return getProject().getBuildSetting().getListParams(true);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.javaindex 03496320f8..d8bb26ca8e 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@@ -450,7 +450,12 @@ public abstract class IssueListPanel extends Panel {}}) {-++ @Override+ protected String getTitle() {+ return "Select Project";+ }+@Overrideprotected void onSelect(AjaxRequestTarget target, Project project) {PageParameters params = NewIssuePage.paramsOf(project, getBaseQuery().toString());diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.html b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.htmlnew file mode 100644index 0000000000..73cfdf5cbb--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.html@@ -0,0 +1,15 @@+<wicket:panel>+ <div class="job-run-selector py-4 px-3">+ <div class="mb-3 font-weight-bold font-size-lg border-bottom pb-3">Select Job</div>+ <div class="d-flex align-items-center">+ <input wicket:id="search" class="form-control form-control-sm job" placeholder="Search job"></input>+ <wicket:svg href="magnify" class="icon text-muted icon-magnify"></wicket:svg>+ </div>+ <ul wicket:id="jobs" class="list-unstyled jobs overflow-auto mb-0 mt-3">+ <li wicket:id="jobs" class="job selectable">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </li>+ </ul>+ <div wicket:id="noJobs" class="no-jobs mb-0 mt-4"><div class=" alert alert-notice alert-light-warning">No jobs found</div></div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.javanew file mode 100644index 0000000000..69d0d0fff2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelector.java@@ -0,0 +1,215 @@+package io.onedev.server.web.component.job.runselector;++import io.onedev.server.git.service.RefFacade;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;+import io.onedev.server.web.behavior.InputChangeBehavior;+import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;+import io.onedev.server.web.component.job.RunJobLink;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+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.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.jetbrains.annotations.Nullable;++import java.util.ArrayList;+import java.util.List;+import java.util.UUID;++public abstract class JobRunSelector extends Panel {++ private final String revision;++ private final IModel<List<String>> jobsModel = new LoadableDetachableModel<>() {+ @Override+ protected List<String> load() {+ List<String> jobNames = new ArrayList<>();+ var buildSpec = getProject().getBuildSpec(getCommitId());+ if (buildSpec != null) {+ for (var job: buildSpec.getJobs()) {+ var jobName = job.getName();+ if (SecurityUtils.canRunJob(getProject(), jobName)+ && (searchInput == null || jobName.toLowerCase().contains(searchInput.toLowerCase()))) {+ jobNames.add(jobName);+ }+ }+ }+ return jobNames;+ }+ };++ private RepeatingView jobsView;++ private TextField<String> searchField;++ private String searchInput;++ public JobRunSelector(String id, String revision) {+ super(id);+ this.revision = revision;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var jobsContainer = new WebMarkupContainer("jobs") {++ @Override+ protected void onBeforeRender() {+ jobsView = new RepeatingView("jobs");+ int index = 0;+ for (var jobName: getJobs()) {+ Component item = newItem(jobsView.newChildId(), jobName);+ if (index == 0)+ item.add(AttributeAppender.append("class", "active"));+ jobsView.add(item);+ if (++index >= WebConstants.PAGE_SIZE)+ break;+ }+ addOrReplace(jobsView);++ super.onBeforeRender();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getJobs().isEmpty());+ }+ };+ jobsContainer.setOutputMarkupPlaceholderTag(true);+ add(jobsContainer);++ jobsContainer.add(new InfiniteScrollBehavior(WebConstants.PAGE_SIZE) {++ @Override+ protected void appendMore(AjaxRequestTarget target, int offset, int count) {+ for (int i=offset; i<offset+count; i++) {+ if (i >= getJobs().size())+ break;+ var jobName = getJobs().get(i);++ Component item = newItem(jobsView.newChildId(), jobName);+ jobsView.add(item);+ String script = String.format("$('#%s').append('<li id=\"%s\"></li>');",+ jobsContainer.getMarkupId(), item.getMarkupId());+ target.prependJavaScript(script);+ target.add(item);+ }+ }++ });++ var noJobsContainer = new WebMarkupContainer("noJobs") {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getJobs().isEmpty());+ }+ };+ noJobsContainer.setOutputMarkupPlaceholderTag(true);+ add(noJobsContainer);++ 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);+ }++ });+ }++ private Component newItem(String componentId, String jobName) {+ WebMarkupContainer item = new WebMarkupContainer(componentId);++ RefFacade branchRef, tagRef;++ String refName;+ if ((branchRef = getProject().getBranchRef(revision)) != null)+ refName = branchRef.getName();+ else if ((tagRef = getProject().getTagRef(revision)) != null)+ refName = tagRef.getName();+ else+ refName = null;+ var jobLink = new RunJobLink("link", getCommitId(), jobName, refName) {+ @Override+ public void onClick(AjaxRequestTarget target) {+ onSelect(target, jobName);+ super.onClick(target);+ }++ @Override+ protected Project getProject() {+ return JobRunSelector.this.getProject();+ }++ @Override+ protected String getPipeline() {+ return UUID.randomUUID().toString();+ }++ @Nullable+ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ };+ jobLink.add(new Label("label", jobName));+ item.add(jobLink);++ return item;+ }++ private ObjectId getCommitId() {+ return getProject().getRevCommit(revision, true).copy();+ }++ @Override+ protected void onDetach() {+ super.onDetach();+ jobsModel.detach();+ }++ private List<String> getJobs() {+ return jobsModel.getObject();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new SelectByTypingResourceReference()));+ response.render(CssHeaderItem.forReference(new JobRunSelectorCssResourceReference()));+ String script = String.format("$('#%s').selectByTyping($('#%s'));", searchField.getMarkupId(), getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ protected abstract Project getProject();++ protected void onSelect(AjaxRequestTarget target, String jobName) {+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelectorCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelectorCssResourceReference.javanew file mode 100644index 0000000000..647dd2e283--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/JobRunSelectorCssResourceReference.java@@ -0,0 +1,9 @@+package io.onedev.server.web.component.job.runselector;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class JobRunSelectorCssResourceReference extends BaseDependentCssResourceReference {+ public JobRunSelectorCssResourceReference() {+ super(JobRunSelectorCssResourceReference.class, "job-run-selector.css");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/runselector/job-run-selector.css b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/job-run-selector.cssnew file mode 100644index 0000000000..f86912a4f7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/runselector/job-run-selector.css@@ -0,0 +1,13 @@+.job-run-selector .jobs, .job-run-selector .no-jobs {+ height: 400px;+}++.job-run-selector {+ min-width: 250px;+}+.job-run-selector input {+ padding-right: 2rem;+}+.job-run-selector input+.icon {+ margin-left: -1.8rem;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.htmlindex 9b15248ee2..1e75a5a570 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.html@@ -1,18 +1,17 @@-<wicket:panel>- <div class="project-selector p-4">- <wicket:enclosure child="search">- <div class="d-flex align-items-center">- <input wicket:id="search" class="form-control form-control-sm branch" placeholder="Search project"></input>- <wicket:svg href="magnify" class="icon text-muted icon-magnify"></wicket:svg>- </div>- </wicket:enclosure>- <ul wicket:id="projects" class="list-unstyled projects overflow-auto mb-0 mt-3">- <li wicket:id="projects" class="project selectable">- <a wicket:id="link">- <wicket:svg href="tick" class="icon mr-2"/> <img wicket:id="avatar" class="mr-1"> <span wicket:id="path"></span>- </a>- </li>- </ul>- <div wicket:id="noProjects" class="no-projects mb-0 mt-4"><div class=" alert alert-notice alert-light-warning">No Projects Found</div></div>- </div>+<wicket:panel>+ <div class="project-selector p-4">+ <div wicket:id="title" class="font-weight-bold font-size-lg mb-3"></div>+ <div class="d-flex align-items-center">+ <input wicket:id="search" class="form-control form-control-sm project" placeholder="Search project"></input>+ <wicket:svg href="magnify" class="icon text-muted icon-magnify"></wicket:svg>+ </div>+ <ul wicket:id="projects" class="list-unstyled projects overflow-auto mb-0 mt-3">+ <li wicket:id="projects" class="project selectable">+ <a wicket:id="link">+ <wicket:svg href="tick" class="icon mr-2"/> <img wicket:id="avatar" class="mr-1"> <span wicket:id="path"></span>+ </a>+ </li>+ </ul>+ <div wicket:id="noProjects" class="no-projects mb-0 mt-4"><div class=" alert alert-notice alert-light-warning">No projects found</div></div>+ </div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.javaindex d9b3126c42..930fb23038 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java@@ -1,9 +1,17 @@package io.onedev.server.web.component.project.selector;-import java.util.List;--import javax.annotation.Nullable;-+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.util.Similarities;+import io.onedev.server.util.facade.ProjectCache;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;+import io.onedev.server.web.behavior.InputChangeBehavior;+import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;+import io.onedev.server.web.component.link.PreventDefaultAjaxLink;+import io.onedev.server.web.component.project.ProjectAvatar;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -18,23 +26,14 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.Project;-import io.onedev.server.util.Similarities;-import io.onedev.server.util.facade.ProjectCache;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;-import io.onedev.server.web.behavior.InputChangeBehavior;-import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;-import io.onedev.server.web.component.link.PreventDefaultAjaxLink;-import io.onedev.server.web.component.project.ProjectAvatar;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import javax.annotation.Nullable;+import java.util.List;@SuppressWarnings("serial")public abstract class ProjectSelector extends Panel {@@ -75,6 +74,18 @@ public abstract class ProjectSelector extends Panel {protected void onInitialize() {super.onInitialize();+ add(new Label("title", new AbstractReadOnlyModel<>() {+ @Override+ public Object getObject() {+ return getTitle();+ }+ }) {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getTitle() != null);+ }+ });WebMarkupContainer projectsContainer = new WebMarkupContainer("projects") {@Override@@ -137,7 +148,7 @@ public abstract class ProjectSelector extends Panel {noProjectsContainer.setOutputMarkupPlaceholderTag(true);add(noProjectsContainer);- searchField = new TextField<String>("search", Model.of(""));+ searchField = new TextField<>("search", Model.of(""));add(searchField);searchField.add(new InputChangeBehavior() {@@ -211,6 +222,11 @@ public abstract class ProjectSelector extends Panel {return null;}+ @Nullable+ protected String getTitle() {+ return null;+ }+protected abstract void onSelect(AjaxRequestTarget target, Project project);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 5d32d28592..0290e0cea0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -1,49 +1,5 @@package io.onedev.server.web.component.pullrequest.list;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Iterator;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-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.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;@@ -88,11 +44,45 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-import io.onedev.server.web.util.Cursor;-import io.onedev.server.web.util.LoadableDetachableDataProvider;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.web.util.QuerySaveSupport;-import io.onedev.server.web.util.ReferenceTransformer;+import io.onedev.server.web.util.*;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.*;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+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.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Iterator;+import java.util.List;@SuppressWarnings("serial")public abstract class PullRequestListPanel extends Panel {@@ -645,7 +635,11 @@ public abstract class PullRequestListPanel extends Panel {}}) {-+ @Override+ protected String getTitle() {+ return "Select Project";+ }+@Overrideprotected void onSelect(AjaxRequestTarget target, Project project) {setResponsePage(NewPullRequestPage.class, NewPullRequestPage.paramsOf(project));diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.html b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.htmlindex 5de8b1ee23..4ac6e1defa 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.html+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.html@@ -1,5 +1,6 @@<wicket:panel><div class="revision-selector p-4">+ <div wicket:id="title" class="mb-3 font-weight-bold font-size-lg"></div><div class="d-flex align-items-center"><input wicket:id="revision" class="form-control form-control-sm revision" placeholder="Input revision"></input><wicket:svg href="magnify" class="icon text-muted icon-magnify"></wicket:svg>diff --git a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.javaindex 4d43b6f3ad..d36ec8bb04 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revision/RevisionSelector.java@@ -21,10 +21,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;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.apache.wicket.model.PropertyModel;+import org.apache.wicket.model.*;import org.eclipse.jgit.errors.AmbiguousObjectException;import org.eclipse.jgit.errors.IncorrectObjectTypeException;import org.eclipse.jgit.errors.RevisionSyntaxException;@@ -147,6 +144,19 @@ public abstract class RevisionSelector extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();++ add(new Label("title", new AbstractReadOnlyModel<>() {+ @Override+ public Object getObject() {+ return getTitle();+ }+ }) {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getTitle() != null);+ }+ });revField = new TextField<String>("revision", Model.of(""));revField.add(AttributeModifier.replace("placeholder", new LoadableDetachableModel<String>() {@@ -475,6 +485,11 @@ public abstract class RevisionSelector extends Panel {response.render(OnDomReadyHeaderItem.forScript(script));}+ @Nullable+ protected String getTitle() {+ return null;+ }+protected abstract void onSelect(AjaxRequestTarget target, String revision);@Override