The Unified and Autonomous Development Platform
fix issue #117: Show latest build result in PR list/title
Robin Shen279cdd38b1cd
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.javaindex a74342c2cf..6d60536f6c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java@@ -1,6 +1,6 @@package io.onedev.server.entitymanager;-import java.util.List;+import java.util.Collection;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;@@ -14,6 +14,6 @@ public interface IssueFieldManager extends EntityManager<IssueField> {void onRenameGroup(String oldName, String newName);- void populateFields(List<Issue> issues);+ void populateFields(Collection<Issue> issues);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex e8d8b1c3b1..4a051ca331 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -33,7 +33,7 @@ public interface IssueManager extends EntityManager<Issue> {void open(Issue issue);List<Issue> query(@Nullable Project project, EntityQuery<Issue> issueQuery,- int firstResult, int maxResults);+ int firstResult, int maxResults, boolean loadFields);int count(@Nullable Project project, @Nullable IssueCriteria issueCriteria);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex e7da99860e..5226a05733 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -72,8 +72,8 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void checkQuality(PullRequest request, List<User> unpreferableReviewers);- List<PullRequest> query(@Nullable Project targetProject,- EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults);+ List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,+ int firstResult, int maxResults, boolean loadReviews, boolean loadVerifications);int count(@Nullable Project targetProject, EntityCriteria<PullRequest> requestCriteria);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.javaindex 63428500f5..5b7877a19a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java@@ -1,5 +1,6 @@package io.onedev.server.entitymanager;+import java.util.Collection;import java.util.List;import javax.annotation.Nullable;@@ -21,4 +22,7 @@ public interface PullRequestReviewManager extends EntityManager<PullRequestRevieboolean removeReviewer(PullRequestReview review, List<User> unpreferableReviewers);void saveReviews(PullRequest request);++ void populateReviews(Collection<PullRequest> requests);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.javaindex f286b6d4d0..85ebc383bf 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestVerificationManager.java@@ -1,5 +1,7 @@package io.onedev.server.entitymanager;+import java.util.Collection;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestVerification;import io.onedev.server.persistence.dao.EntityManager;@@ -8,4 +10,6 @@ public interface PullRequestVerificationManager extends EntityManager<PullRequesvoid saveVerifications(PullRequest request);+ void populateVerifications(Collection<PullRequest> requests);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex 505ac0593c..94448d7f2b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -293,7 +293,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangequery = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());Build.push(build);try {- for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {+ for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE, true)) {issue.removeFields(transition.getRemoveFields());changeState(issue, transition.getToState(), new HashMap<>(), null);}@@ -357,7 +357,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangequery = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());PullRequest.push(request);try {- for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {+ for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE, true)) {issue.removeFields(transition.getRemoveFields());changeState(issue, transition.getToState(), new HashMap<>(), null);}@@ -491,7 +491,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange});try {- for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {+ for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE, true)) {issue.removeFields(transition.getRemoveFields());changeState(issue, transition.getToState(), new HashMap<>(), null);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.javaindex fe6f537ee8..77f4c79170 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java@@ -3,14 +3,12 @@ package io.onedev.server.entitymanager.impl;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;-import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.Query;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Expression;import javax.persistence.criteria.Root;import io.onedev.server.entitymanager.IssueFieldManager;@@ -77,16 +75,15 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>@Sessional@Override- public void populateFields(List<Issue> issues) {+ public void populateFields(Collection<Issue> issues) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<IssueField> query = builder.createQuery(IssueField.class);Root<IssueField> root = query.from(IssueField.class);query.select(root);- root.join("issue");+ root.join(IssueField.PROP_ISSUE);- Expression<String> issueExpr = root.get("issue");- query.where(issueExpr.in(issues));+ query.where(root.get(IssueField.PROP_ISSUE).in(issues));for (Issue issue: issues)issue.setFields(new ArrayList<>());diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex fe69b68259..4be568cc86 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -258,13 +258,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Overridepublic List<Issue> query(@Nullable Project project, EntityQuery<Issue> issueQuery,- int firstResult, int maxResults) {+ int firstResult, int maxResults, boolean loadFields) {CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(project, getSession(), issueQuery);Query<Issue> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);List<Issue> issues = query.getResultList();- if (!issues.isEmpty())+ if (loadFields && !issues.isEmpty())issueFieldManager.populateFields(issues);return issues;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex e2ab6e9728..3933db51f1 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -1023,13 +1023,20 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public List<PullRequest> query(@Nullable Project targetProject,- EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {+ public List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,+ int firstResult, int maxResults, boolean loadReviews, boolean loadVerifiations) {CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, requestQuery);Query<PullRequest> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);- return query.getResultList();++ List<PullRequest> requests = query.getResultList();+ if (!requests.isEmpty()) {+ pullRequestReviewManager.populateReviews(requests);+ pullRequestVerificationManager.populateVerifications(requests);+ }++ return requests;}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.javaindex 6b9e8141df..28129132ca 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java@@ -1,5 +1,6 @@package io.onedev.server.entitymanager.impl;+import java.util.ArrayList;import java.util.Collection;import java.util.Date;import java.util.List;@@ -8,6 +9,9 @@ import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.Query;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Root;import org.hibernate.criterion.Restrictions;@@ -24,6 +28,7 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveDimport io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;+import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -139,4 +144,24 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRfor (PullRequestReview review: request.getReviews())save(review);}++ @Sessional+ @Override+ public void populateReviews(Collection<PullRequest> requests) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<PullRequestReview> query = builder.createQuery(PullRequestReview.class);++ Root<PullRequestReview> root = query.from(PullRequestReview.class);+ query.select(root);+ root.join(PullRequestReview.PROP_REQUEST);++ query.where(root.get(PullRequestReview.PROP_REQUEST).in(requests));++ for (PullRequest request: requests)+ request.setReviews(new ArrayList<>());++ for (PullRequestReview review: getSession().createQuery(query).getResultList())+ review.getRequest().getReviews().add(review);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.javaindex 66273f929e..432ee8e279 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestVerificationManager.java@@ -1,11 +1,15 @@package io.onedev.server.entitymanager.impl;+import java.util.ArrayList;import java.util.Collection;import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.Query;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Root;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.server.entitymanager.PullRequestVerificationManager;@@ -52,4 +56,22 @@ public class DefaultPullRequestVerificationManager extends AbstractEntityManager}}+ @Override+ public void populateVerifications(Collection<PullRequest> requests) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<PullRequestVerification> query = builder.createQuery(PullRequestVerification.class);++ Root<PullRequestVerification> root = query.from(PullRequestVerification.class);+ query.select(root);+ root.join(PullRequestVerification.PROP_REQUEST);++ query.where(root.get(PullRequestVerification.PROP_REQUEST).in(requests));++ for (PullRequest request: requests)+ request.setVerifications(new ArrayList<>());++ for (PullRequestVerification verification: getSession().createQuery(query).getResultList())+ verification.getRequest().getVerifications().add(verification);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/IssueField.java b/server-core/src/main/java/io/onedev/server/model/IssueField.javaindex 059e775871..0576499077 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueField.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueField.java@@ -21,6 +21,8 @@ public class IssueField extends AbstractEntity {private static final long serialVersionUID = 1L;+ public static final String PROP_ISSUE = "issue";+public static final String PROP_NAME = "name";public static final String PROP_VALUE = "value";diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 4ed038ad92..1f3b8a92e2 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -12,6 +12,7 @@ import java.nio.channels.IllegalSelectorException;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;+import java.util.Comparator;import java.util.Date;import java.util.HashSet;import java.util.LinkedHashSet;@@ -293,6 +294,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate transient List<PullRequestUpdate> sortedUpdates;+ private transient List<PullRequestReview> sortedReviews;+private transient Optional<MergePreview> mergePreviewOpt;private transient Boolean valid;@@ -578,6 +581,25 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}return sortedUpdates;}++ public List<PullRequestReview> getSortedReviews() {+ if (sortedReviews == null) {+ sortedReviews = new ArrayList<>(reviews);++ Collections.sort(sortedReviews, new Comparator<PullRequestReview>() {++ @Override+ public int compare(PullRequestReview o1, PullRequestReview o2) {+ if (o1.getId() != null && o2.getId() != null)+ return o1.getId().compareTo(o1.getId());+ else+ return 0;+ }++ });+ }+ return sortedReviews;+ }public MergeStrategy getMergeStrategy() {return mergeStrategy;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.javaindex cd0a747b5a..10887f1a11 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java@@ -23,6 +23,8 @@ public class PullRequestReview extends AbstractEntity {private static final long serialVersionUID = 1L;+ public static final String PROP_REQUEST = "request";+public static final String PROP_USER = "user";public static final String PROP_RESULT = "result";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 18662f24b0..417424ffb9 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@@ -492,7 +492,7 @@ public abstract class IssueListPanel extends Panel {public Iterator<? extends Issue> iterator(long first, long count) {try {return getIssueManager().query(getProject(), parsedQueryModel.getObject(),- (int)first, (int)count).iterator();+ (int)first, (int)count, true).iterator();} catch (OneException e) {error(e.getMessage());return new ArrayList<Issue>().iterator();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex e33c28e682..5c96e6b7a1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -103,7 +103,7 @@ public abstract class IssueSidePanel extends Panel {@Overrideprotected List<Issue> query(EntityQuery<Issue> query, int offset, int count, boolean inProject) {- return getIssueManager().query(inProject?getProject():null, query, offset, count);+ return getIssueManager().query(inProject?getProject():null, query, offset, count, false);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.javaindex afbe9aa296..c3ca359db8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java@@ -3,7 +3,6 @@ package io.onedev.server.web.component.pullrequest.assignment;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestAssignmentManager;@@ -14,14 +13,19 @@ import io.onedev.server.web.component.select2.SelectToAddChoice;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;@SuppressWarnings("serial")-public class AssigneeChoice extends SelectToAddChoice<User> {+public abstract class AssigneeChoice extends SelectToAddChoice<User> {- private final IModel<PullRequest> requestModel;-- public AssigneeChoice(String id, IModel<PullRequest> requestModel) {- super(id, new AssigneeProvider(requestModel));+ public AssigneeChoice(String id) {+ super(id);- this.requestModel = requestModel;+ setProvider(new AssigneeProvider() {++ @Override+ protected PullRequest getPullRequest() {+ return AssigneeChoice.this.getPullRequest();+ }++ });}@Override@@ -40,25 +44,18 @@ public class AssigneeChoice extends SelectToAddChoice<User> {response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));}-- @Override- protected void onDetach() {- requestModel.detach();-- super.onDetach();- }@Overrideprotected void onSelect(AjaxRequestTarget target, User user) {- PullRequest request = requestModel.getObject();PullRequestAssignment assignment = new PullRequestAssignment();- assignment.setRequest(request);+ assignment.setRequest(getPullRequest());assignment.setUser(user);- if (!request.isNew())+ if (!getPullRequest().isNew())OneDev.getInstance(PullRequestAssignmentManager.class).addAssignee(assignment);else- request.getAssignments().add(assignment);+ getPullRequest().getAssignments().add(assignment);};+ protected abstract PullRequest getPullRequest();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.javaindex e865b97229..95b28e9513 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeProvider.java@@ -5,8 +5,6 @@ import static io.onedev.server.util.match.MatchScoreUtils.filterAndSort;import java.util.List;import java.util.stream.Collectors;-import org.apache.wicket.model.IModel;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.PullRequest;@@ -19,19 +17,13 @@ import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.ResponseFiller;import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;-public class AssigneeProvider extends AbstractUserChoiceProvider {+public abstract class AssigneeProvider extends AbstractUserChoiceProvider {private static final long serialVersionUID = 1L;- private final IModel<PullRequest> requestModel;-- public AssigneeProvider(IModel<PullRequest> requestModel) {- this.requestModel = requestModel;- }-@Overridepublic void query(String term, int page, Response<User> response) {- PullRequest request = requestModel.getObject();+ PullRequest request = getPullRequest();List<User> assignees = OneDev.getInstance(UserManager.class).queryAndSort(request.getParticipants());assignees.retainAll(SecurityUtils.getAuthorizedUsers(request.getTargetProject(), new WriteCode()));assignees.removeAll(request.getAssignments().stream().map(it->it.getUser()).collect(Collectors.toSet()));@@ -48,11 +40,6 @@ public class AssigneeProvider extends AbstractUserChoiceProvider {}), page, WebConstants.PAGE_SIZE);}- @Override- public void detach() {- requestModel.detach();-- super.detach();- }-+ protected abstract PullRequest getPullRequest();+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.javaindex 1b1255bfff..7db22da396 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java@@ -14,7 +14,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -32,12 +32,12 @@ import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;@SuppressWarnings("serial")-public class AssignmentListPanel extends GenericPanel<PullRequest> {+public abstract class AssignmentListPanel extends Panel {private final IModel<List<PullRequestAssignment>> assignmentsModel;- public AssignmentListPanel(String id, IModel<PullRequest> model) {- super(id, model);+ public AssignmentListPanel(String id) {+ super(id);assignmentsModel = new LoadableDetachableModel<List<PullRequestAssignment>>() {@@ -64,9 +64,7 @@ public class AssignmentListPanel extends GenericPanel<PullRequest> {};}- private PullRequest getPullRequest() {- return getModelObject();- }+ protected abstract PullRequest getPullRequest();@Overrideprotected void onDetach() {@@ -132,7 +130,7 @@ public class AssignmentListPanel extends GenericPanel<PullRequest> {});- add(new AssigneeChoice("addAssignee", getModel()) {+ add(new AssigneeChoice("addAssignee") {@Overrideprotected void onConfigure() {@@ -147,6 +145,11 @@ public class AssignmentListPanel extends GenericPanel<PullRequest> {if (getPullRequest().isNew())target.add(AssignmentListPanel.this);}++ @Override+ protected PullRequest getPullRequest() {+ return AssignmentListPanel.this.getPullRequest();+ }});diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsCssResourceReference.javanew file mode 100644index 0000000000..8bcdc6b542--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.pullrequest.build;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class PullRequestJobsCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public PullRequestJobsCssResourceReference() {+ super(PullRequestJobsCssResourceReference.class, "pull-request-jobs.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.htmlnew file mode 100644index 0000000000..dbc765a526--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="pull-request-jobs clearfix">+ <wicket:container wicket:id="jobs">+ <a wicket:id="job" class="job pull-left">+ <span wicket:id="status" class="status"></span>+ <span wicket:id="name" class="name"></span>+ <i class="fa fa-angle-down"></i>+ </a>+ </wicket:container>+ </div>+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.javanew file mode 100644index 0000000000..3086ac28c3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java@@ -0,0 +1,220 @@+package io.onedev.server.web.component.pullrequest.build;++import static io.onedev.server.model.Build.NAME_JOB;+import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;+import static io.onedev.server.search.entity.build.BuildQueryLexer.And;+import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;+import static io.onedev.server.util.criteria.Criteria.quote;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import org.apache.wicket.Component;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+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.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.unbescape.html.HtmlEscape;++import com.google.common.collect.Sets;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.model.Build;+import io.onedev.server.model.Build.Status;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestVerification;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.behavior.WebSocketObserver;+import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;+import io.onedev.server.web.component.build.status.BuildStatusIcon;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;++@SuppressWarnings("serial")+public abstract class PullRequestJobsPanel extends Panel {++ public PullRequestJobsPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ListView<JobBuildInfo>("jobs", new LoadableDetachableModel<List<JobBuildInfo>>() {++ @Override+ protected List<JobBuildInfo> load() {+ PullRequest request = getPullRequest();+ Map<String, List<PullRequestVerification>> map = new HashMap<>();+ for (PullRequestVerification verification: request.getVerifications()) {+ String jobName = verification.getBuild().getJobName();+ List<PullRequestVerification> list = map.get(jobName);+ if (list == null) {+ list = new ArrayList<>();+ map.put(jobName, list);+ }+ list.add(verification);+ }+ List<JobBuildInfo> listOfJobBuildInfo = new ArrayList<>();+ for (Map.Entry<String, List<PullRequestVerification>> entry: map.entrySet()) {+ if (SecurityUtils.canAccess(getPullRequest().getTargetProject(), entry.getKey())) {+ List<Build> builds = entry.getValue().stream().map(it->it.getBuild()).collect(Collectors.toList());+ Collections.sort(builds);+ listOfJobBuildInfo.add(new JobBuildInfo(entry.getKey(), entry.getValue().iterator().next().isRequired(), builds));+ }+ }+ Collections.sort(listOfJobBuildInfo, new Comparator<JobBuildInfo>() {++ @Override+ public int compare(JobBuildInfo o1, JobBuildInfo o2) {+ return o1.getBuilds().iterator().next().getId().compareTo(o2.getBuilds().iterator().next().getId());+ }++ });+ return listOfJobBuildInfo;+ }++ }) {++ @Override+ protected void populateItem(ListItem<JobBuildInfo> item) {+ JobBuildInfo jobBuilds = item.getModelObject();++ String jobName = jobBuilds.getJobName();+ Status status = Status.getOverallStatus(jobBuilds.getBuilds()+ .stream()+ .map(it->it.getStatus())+ .collect(Collectors.toSet()));++ WebMarkupContainer link = new DropdownLink("job") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new SimpleBuildListPanel(id, new LoadableDetachableModel<List<Build>>() {++ @Override+ protected List<Build> load() {+ return item.getModelObject().getBuilds();+ }++ }) {++ @Override+ protected Component newListLink(String componentId) {+ String query = ""+ + getRuleName(AssociatedWithPullRequest) + " " + quote("#" + getPullRequest().getNumber())+ + " " + getRuleName(And) + " "+ + quote(NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);+ return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,+ ProjectBuildsPage.paramsOf(getPullRequest().getTargetProject(), query, 0));+ }++ };+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ String title;+ if (status != null) {+ if (status != Status.SUCCESSFUL)+ title = "Some builds are ";+ else+ title = "Builds are ";+ title += status.getDisplayName().toLowerCase() + ", click for details";+ } else {+ title = "No builds";+ }+ tag.put("title", title);+ }++ };++ link.add(new BuildStatusIcon("status", Model.of(status)));+ item.add(link);++ if (jobBuilds.isRequired())+ link.add(new Label("name", HtmlEscape.escapeHtml5(jobName) + " ∗").setEscapeModelStrings(false));+ else+ link.add(new Label("name", jobName));+ item.add(link);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getModelObject().isEmpty());+ }++ });++ add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ });++ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new PullRequestJobsCssResourceReference()));+ }++ protected abstract PullRequest getPullRequest();++ private static class JobBuildInfo {++ private final String jobName;++ private final boolean required;++ private final List<Build> builds;++ public JobBuildInfo(String jobName, boolean required, List<Build> builds) {+ this.jobName = jobName;+ this.required = required;+ this.builds = builds;+ }++ public String getJobName() {+ return jobName;+ }++ public boolean isRequired() {+ return required;+ }++ public List<Build> getBuilds() {+ return builds;+ }++ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.cssnew file mode 100644index 0000000000..17bf003725--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css@@ -0,0 +1,6 @@+.pull-request-jobs>.job {+ margin-right: 12px;+}+.pull-request-jobs>.job:last-child {+ margin-right: 0;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.htmlindex e3c9e8de35..36072550e2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -26,20 +26,20 @@<a wicket:id="number" class="number"></a><span wicket:id="title" class="title"></span></div>- <div class="pull-right comments" title="Comments">+ <div class="pull-right comments extra-info" title="Comments"><span class="fa fa-comments-o"></span> <span wicket:id="comments"></span></div></div><div class="secondary clearfix">- <div class="pull-left clearfix">- <div class="status pull-left"><span wicket:id="status"></span></div>- <div class="branches pull-left">- <a wicket:id="target" title="Target"></a>- <span class="fa fa-arrow-left"></span>- <a wicket:id="source" title="Source"></a>- </div>+ <div class="status pull-left"><span wicket:id="status"></span></div>+ <div class="pull-left review" wicket:id="reviews"></div>+ <div class="pull-left jobs" wicket:id="jobs"></div>+ <div class="branches pull-left extra-info">+ <a wicket:id="target" title="Target"></a>+ <span class="fa fa-arrow-left"></span>+ <a wicket:id="source" title="Source"></a></div>- <div class="last-update pull-right">+ <div class="last-update pull-right extra-info"><a wicket:id="user"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span></div></div>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 d03f6fbb40..40afd91ced 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@@ -35,6 +35,7 @@ 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;@@ -45,8 +46,10 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;import io.onedev.server.model.support.LastUpdate;import io.onedev.server.search.entity.EntityQuery;@@ -68,6 +71,8 @@ import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.pullrequest.RequestStatusLabel;+import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;+import io.onedev.server.web.component.pullrequest.review.ReviewerAvatar;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.user.ident.Mode;@@ -336,6 +341,29 @@ public abstract class PullRequestListPanel extends Panel {}.setEscapeModelStrings(false).setOutputMarkupId(true));+ RepeatingView reviewsView = new RepeatingView("reviews");+ for (PullRequestReview review: request.getSortedReviews()) {+ Long reviewId = review.getId();+ reviewsView.add(new ReviewerAvatar(reviewsView.newChildId()) {++ @Override+ protected PullRequestReview getReview() {+ return OneDev.getInstance(PullRequestReviewManager.class).load(reviewId);+ }++ });+ }+ fragment.add(reviewsView);++ fragment.add(new PullRequestJobsPanel("jobs") {++ @Override+ protected PullRequest getPullRequest() {+ return rowModel.getObject();+ }++ });+fragment.add(new Label("comments", request.getCommentCount()));fragment.add(new RequestStatusLabel("status", rowModel));@@ -382,7 +410,7 @@ public abstract class PullRequestListPanel extends Panel {public Iterator<? extends PullRequest> iterator(long first, long count) {try {return getPullRequestManager().query(getProject(), parsedQueryModel.getObject(),- (int)first, (int)count).iterator();+ (int)first, (int)count, true, true).iterator();} catch (OneException e) {error(e.getMessage());return new ArrayList<PullRequest>().iterator();@@ -444,11 +472,12 @@ public abstract class PullRequestListPanel extends Panel {setOutputMarkupId(true);}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);+response.render(CssHeaderItem.forReference(new PullRequestListCssResourceReference()));}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.cssindex c0149376a5..c998238c7a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css@@ -1,5 +1,5 @@@media(max-width: 991px) {- .pull-request-list>.body .pull-right {+ .pull-request-list>.body .extra-info {display: none;}}@@ -38,8 +38,15 @@.pull-request-list>.body td .primary {margin-bottom: 8px;}-.pull-request-list>.body td .secondary>.pull-left>div {- margin-right: 20px;+.pull-request-list>.body td .primary>.pull-left {+ margin-right: 12px;+}++.pull-request-list>.body td .secondary {+ line-height: 24px;+}+.pull-request-list>.body td .secondary>.pull-left {+ margin-right: 12px;}.pull-request-list>.body td .branches .fa {color: #666;@@ -48,7 +55,6 @@.pull-request-list>.body td .last-update,.pull-request-list>.body td .comments {color: #888;- font-size: 13px;}.pull-request-list>.body .new-indicator {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewCssResourceReference.javanew file mode 100644index 0000000000..7a13b8637e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.pullrequest.review;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ReviewCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ReviewCssResourceReference() {+ super(ReviewCssResourceReference.class, "review.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListCssResourceReference.javadeleted file mode 100644index 6496f5a5ca..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.pullrequest.review;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class ReviewListCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public ReviewListCssResourceReference() {- super(ReviewListCssResourceReference.class, "review-list.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.htmlindex 4f77fd82a9..031c0c7a6b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.html@@ -2,8 +2,8 @@<table class="reviews"><tr wicket:id="reviews"><wicket:enclosure>- <td class="result">- <span wicket:id="result"></span>+ <td class="status">+ <span wicket:id="status"></span></td></wicket:enclosure><td class="user">diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.javaindex 65c0172de5..156e80ba91 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java@@ -2,30 +2,23 @@ package io.onedev.server.web.component.pullrequest.review;import java.util.ArrayList;import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;import java.util.List;-import org.apache.wicket.Component;import org.apache.wicket.MetaDataKey;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import com.google.common.collect.Sets;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.model.PullRequest;@@ -33,51 +26,32 @@ import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.WebSocketObserver;-import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;@SuppressWarnings("serial")-public class ReviewListPanel extends GenericPanel<PullRequest> {+public abstract class ReviewListPanel extends Panel {private static final MetaDataKey<ArrayList<User>> UNPREFERABLE_REVIEWERS = new MetaDataKey<ArrayList<User>>() {};private final IModel<List<PullRequestReview>> reviewsModel;- public ReviewListPanel(String id, IModel<PullRequest> model) {- super(id, model);+ public ReviewListPanel(String id) {+ super(id);reviewsModel = new LoadableDetachableModel<List<PullRequestReview>>() {@Overrideprotected List<PullRequestReview> load() {- PullRequest request = getPullRequest();- List<PullRequestReview> reviews = new ArrayList<>(request.getReviews());-- Collections.sort(reviews, new Comparator<PullRequestReview>() {-- @Override- public int compare(PullRequestReview o1, PullRequestReview o2) {- if (o1.getId() != null && o2.getId() != null)- return o1.getId().compareTo(o1.getId());- else- return 0;- }-- });-- return reviews;+ return getPullRequest().getSortedReviews();}};}- private PullRequest getPullRequest() {- return getModelObject();- }+ protected abstract PullRequest getPullRequest();@Overrideprotected void onDetach() {@@ -106,48 +80,14 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {PullRequest request = getPullRequest();- WebMarkupContainer result = new WebMarkupContainer("result");- if (review.getResult() != null) {- if (review.getResult().isApproved())- result.add(AttributeAppender.append("class", "approved fa fa-check-circle"));- else- result.add(AttributeAppender.append("class", "request-for-changes fa fa-hand-stop-o"));- } else {- result.add(AttributeAppender.append("class", "awaiting fa fa-clock-o"));- }- result.add(new DropdownHoverBehavior() {-+ item.add(new ReviewStatusIcon("status") {+@Override- protected Component newContent(String id) {- ReviewResult result = item.getModelObject().getResult();-- String title;- if (result != null) {- if (result.isApproved())- title = "Approved";- else- title = "Request for changes";- } else {- title = "Waiting for review";- }- StringBuilder builder = new StringBuilder();- builder.append("<div class='title'>").append(title).append("</div>");-- if (result != null && result.getComment() != null) {- MarkdownManager markdownManager = OneDev.getInstance(MarkdownManager.class);- String rendered = markdownManager.render(result.getComment());- builder.append("<div class='comment'>").append(HtmlUtils.clean(rendered).body().html()).append("</div>");- }- Label label = new Label(id, builder.toString());- label.add(AttributeAppender.append("class", "review-action"));- label.setEscapeModelStrings(false);- return label;+ protected ReviewResult getResult() {+ return item.getModelObject().getResult();}- });- result.setVisible(!request.isNew());-- item.add(result);+ }.setVisible(!request.isNew()));item.add(new AjaxLink<Void>("delete") {@@ -194,7 +134,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {});- add(new ReviewerChoice("addReviewer", getModel()) {+ add(new ReviewerChoice("addReviewer") {@Overrideprotected void onConfigure() {@@ -208,6 +148,11 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {if (getPullRequest().isNew())target.add(ReviewListPanel.this);}++ @Override+ protected PullRequest getPullRequest() {+ return ReviewListPanel.this.getPullRequest();+ }});@@ -232,7 +177,7 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new ReviewListCssResourceReference()));+ response.render(CssHeaderItem.forReference(new ReviewCssResourceReference()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewStatusIcon.javanew file mode 100644index 0000000000..23fe706323--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewStatusIcon.java@@ -0,0 +1,79 @@+package io.onedev.server.web.component.pullrequest.review;++import org.apache.wicket.Component;+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.html.WebComponent;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;++import io.onedev.commons.utils.HtmlUtils;+import io.onedev.server.OneDev;+import io.onedev.server.model.support.pullrequest.ReviewResult;+import io.onedev.server.util.markdown.MarkdownManager;+import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;++@SuppressWarnings("serial")+public abstract class ReviewStatusIcon extends WebComponent {++ public ReviewStatusIcon(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new DropdownHoverBehavior() {++ @Override+ protected Component newContent(String id) {+ String title;+ if (getResult() != null) {+ if (getResult().isApproved())+ title = "Approved";+ else+ title = "Request for changes";+ } else {+ title = "Pending review";+ }+ StringBuilder builder = new StringBuilder();+ builder.append("<div class='title'>").append(title).append("</div>");++ if (getResult() != null && getResult().getComment() != null) {+ MarkdownManager markdownManager = OneDev.getInstance(MarkdownManager.class);+ String rendered = markdownManager.render(getResult().getComment());+ builder.append("<div class='comment'>").append(HtmlUtils.clean(rendered).body().html()).append("</div>");+ }+ Label label = new Label(id, builder.toString());+ label.add(AttributeAppender.append("class", "review-detail"));+ label.setEscapeModelStrings(false);+ return label;+ }++ });++ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (getResult() == null)+ return "review-status fa fa-clock-o pending";+ else if (getResult().isApproved())+ return "review-status fa fa-check-circle approved";+ else+ return "review-status fa fa-hand-stop-o requested-for-changes";+ }++ }));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ReviewCssResourceReference()));+ }++ protected abstract ReviewResult getResult();+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerAvatar.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerAvatar.htmlnew file mode 100644index 0000000000..53b92ac534--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerAvatar.html@@ -0,0 +1,5 @@+<wicket:panel>+ <span class="reviewer-avatar">+ <span wicket:id="avatar"></span><i wicket:id="status"></i>+ </span>+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerAvatar.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerAvatar.javanew file mode 100644index 0000000000..6d55392818--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerAvatar.java@@ -0,0 +1,42 @@+package io.onedev.server.web.component.pullrequest.review;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.panel.Panel;++import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.support.pullrequest.ReviewResult;+import io.onedev.server.web.component.user.ident.Mode;+import io.onedev.server.web.component.user.ident.UserIdentPanel;++@SuppressWarnings("serial")+public abstract class ReviewerAvatar extends Panel {++ public ReviewerAvatar(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new UserIdentPanel("avatar", getReview().getUser(), Mode.AVATAR));+ add(new ReviewStatusIcon("status") {++ @Override+ protected ReviewResult getResult() {+ return getReview().getResult();+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ReviewCssResourceReference()));+ }++ protected abstract PullRequestReview getReview();++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.javaindex b0a8b7ae05..9a7aaada38 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java@@ -3,7 +3,6 @@ package io.onedev.server.web.component.pullrequest.review;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestReviewManager;@@ -14,14 +13,19 @@ import io.onedev.server.web.component.select2.SelectToAddChoice;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;@SuppressWarnings("serial")-public class ReviewerChoice extends SelectToAddChoice<User> {+public abstract class ReviewerChoice extends SelectToAddChoice<User> {- private final IModel<PullRequest> requestModel;-- public ReviewerChoice(String id, IModel<PullRequest> requestModel) {- super(id, new ReviewerProvider(requestModel));+ public ReviewerChoice(String id) {+ super(id);- this.requestModel = requestModel;+ setProvider(new ReviewerProvider() {++ @Override+ protected PullRequest getPullRequest() {+ return ReviewerChoice.this.getPullRequest();+ }++ });}@Override@@ -40,25 +44,19 @@ public class ReviewerChoice extends SelectToAddChoice<User> {response.render(JavaScriptHeaderItem.forReference(new UserChoiceResourceReference()));}-- @Override- protected void onDetach() {- requestModel.detach();-- super.onDetach();- }++ protected abstract PullRequest getPullRequest();@Overrideprotected void onSelect(AjaxRequestTarget target, User user) {- PullRequest request = requestModel.getObject();PullRequestReview review = new PullRequestReview();- review.setRequest(request);+ review.setRequest(getPullRequest());review.setUser(user);- if (!request.isNew())+ if (!getPullRequest().isNew())OneDev.getInstance(PullRequestReviewManager.class).addReviewer(review);else- request.getReviews().add(review);+ getPullRequest().getReviews().add(review);};}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.javaindex 2f9d6eab69..b0564f2dfe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerProvider.java@@ -5,8 +5,6 @@ import static io.onedev.server.util.match.MatchScoreUtils.filterAndSort;import java.util.List;import java.util.stream.Collectors;-import org.apache.wicket.model.IModel;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.PullRequest;@@ -17,19 +15,14 @@ import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.ResponseFiller;import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;-public class ReviewerProvider extends AbstractUserChoiceProvider {+public abstract class ReviewerProvider extends AbstractUserChoiceProvider {private static final long serialVersionUID = 1L;- private final IModel<PullRequest> requestModel;-- public ReviewerProvider(IModel<PullRequest> requestModel) {- this.requestModel = requestModel;- }-@Overridepublic void query(String term, int page, Response<User> response) {- PullRequest request = requestModel.getObject();+ PullRequest request = getPullRequest();+List<User> reviewers = OneDev.getInstance(UserManager.class).queryAndSort(request.getParticipants());reviewers.removeAll(request.getReviews().stream().map(it->it.getUser()).collect(Collectors.toSet()));@@ -45,11 +38,6 @@ public class ReviewerProvider extends AbstractUserChoiceProvider {}), page, WebConstants.PAGE_SIZE);}- @Override- public void detach() {- requestModel.detach();-- super.detach();- }-+ protected abstract PullRequest getPullRequest();+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.csssimilarity index 59%rename from server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review-list.cssrename to server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.cssindex 59fb76bd68..42efe86a52 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css@@ -1,7 +1,7 @@table.reviews>tbody>tr>td {padding: 6px 12px;}-table.reviews>tbody>tr>td.result {+table.reviews>tbody>tr>td.status {font-size: 16px;width: 16px;padding-right: 0;@@ -22,26 +22,37 @@ table.reviews>tbody>tr>td.actions {font-size: 16px;text-align: right;}-table.reviews>tbody>tr>td.result span {+table.reviews>tbody>tr>td.status span {cursor: default;}-table.reviews>tbody>tr>td.result span.awaiting {+.review-status.pending {color: #DCB412;}-table.reviews>tbody>tr>td.result span.approved {+.review-status.approved {color: #35A612;}-table.reviews>tbody>tr>td.result span.request-for-changes {+.review-status.requested-for-changes {color: #F93333;}-.review-action {+.review-detail {padding: 8px;}-.review-action>.title {+.review-detail>.title {font-weight: bold;}-.review-action>.comment {+.review-detail>.comment {border-top: 1px solid #D8D8D8;margin-top: 8px;padding-top: 8px;+}+.reviewer-avatar {+ display: inline-block;+ position: relative;+}+.reviewer-avatar>i {+ font-size: 11px;+ position: absolute;+ right: 0;+ bottom: 0;+ background: white;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java b/server-core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.javaindex 15643e24ea..b2c078eeee 100644--- a/server-core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java@@ -10,6 +10,11 @@ public abstract class SelectToAddChoice<T> extends Select2Choice<T> {private transient T selection;public SelectToAddChoice(String id, ChoiceProvider<T> choiceProvider) {+ this(id);+ setProvider(choiceProvider);+ }++ public SelectToAddChoice(String id) {super(id);setModel(new IModel<T>() {@@ -29,10 +34,8 @@ public abstract class SelectToAddChoice<T> extends Select2Choice<T> {}});-- setProvider(choiceProvider);}-+@Overrideprotected void onInitialize() {super.onInitialize();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex 5746f7c642..72a83db21e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -141,7 +141,7 @@ abstract class CardListPanel extends Panel {private List<Issue> queryIssues(int offset, int count) {if (getQuery() != null) {- return getIssueManager().query(getProject(), getQuery(), offset, count);+ return getIssueManager().query(getProject(), getQuery(), offset, count, true);} else {return new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 8a44781e82..79b180399a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -706,8 +706,22 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {});form.add(newMergeStrategyContainer());- form.add(new ReviewListPanel("reviewers", requestModel));- form.add(new AssignmentListPanel("assignees", requestModel));+ form.add(new ReviewListPanel("reviewers") {++ @Override+ protected PullRequest getPullRequest() {+ return NewPullRequestPage.this.getPullRequest();+ }++ });+ form.add(new AssignmentListPanel("assignees") {++ @Override+ protected PullRequest getPullRequest() {+ return NewPullRequestPage.this.getPullRequest();+ }++ });return fragment;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex e01f0b196d..dbe827bf76 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -58,16 +58,16 @@</wicket:enclosure></div><div wicket:id="requestedForChanges" class="requested-for-changes alert alert-danger">- <i class="fa fa-hande-stop-o"></i> Pull request can not be merged now as <a class="more-info">some reviewers</a> are requesting for changes+ <i class="fa fa-hande-stop-o"></i> Pull request can not be merged now as it was <a class="more-info">requested for changes</a></div><div wicket:id="waitingForReviews" class="waiting-for-reviews alert alert-warning">- <i class="fa fa-clock-o"></i> Pull request can not be merged now as it is waiting approvals from <a class="more-info">some reviewers</a>+ <i class="fa fa-clock-o"></i> Pull request can not be merged now as it is <a class="more-info">pending review</a></div><div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds alert alert-danger">- <i class="fa fa-times-circle"></i> Pull request can not be merged now as <a class="more-info">some required builds</a> are not successful+ <i class="fa fa-times-circle"></i> Pull request can not be merged now as <a class="more-info">required builds</a> are not successful</div><div wicket:id="unfinishedBuilds" class="unfinished-builds alert alert-warning">- <i class="fa fa-clock-o"></i> Pull request can not be merged now as <a class="more-info">some required builds</a> are not finished yet+ <i class="fa fa-clock-o"></i> Pull request can not be merged now as <a class="more-info">required builds</a> are not finished yet</div><div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers alert alert-info"><i class="fa fa-info-circle"></i> Pull request can only be merged by users with code write permission@@ -101,16 +101,9 @@</wicket:enclosure><wicket:enclosure child="jobs"><div class="jobs">- <div class="head">Jobs</div>- <div class="body clearfix">- <div wicket:id="jobs" class="job pull-left">- <a wicket:id="job" class="btn btn-default">- <span wicket:id="status" class="status"></span>- <b wicket:id="name" class="name"></b>- <i class="fa fa-angle-down"></i>- </a>- </div>- </div>+ <div class="head">Jobs <i wicket:id="hiddenJobsNote" class="fa fa-exclamation-circle warning" title="Some jobs are hidden to permission policy"></i></div>+ <div wicket:id="jobs" class="body"></div>+ <div wicket:id="jobsHelp" class="help-block">Jobs marked with ∗ are required to be successful</div></div></wicket:enclosure><wicket:enclosure child="assignments">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 720e650f69..86e58b9ee1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -1,23 +1,14 @@package io.onedev.server.web.page.project.pullrequests.detail;-import static io.onedev.server.model.Build.NAME_JOB;import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;-import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;-import static io.onedev.server.search.entity.build.BuildQueryLexer.And;-import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;-import static io.onedev.server.util.criteria.Criteria.quote;import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;-import java.util.Comparator;-import java.util.HashMap;import java.util.List;-import java.util.Map;import java.util.stream.Collectors;import java.util.stream.Stream;@@ -45,8 +36,6 @@ 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.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;@@ -62,7 +51,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -71,8 +59,6 @@ import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.model.Build;-import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;@@ -92,8 +78,6 @@ import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.branch.BranchLink;-import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;-import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.floating.FloatingPanel;@@ -103,6 +87,7 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.project.gitprotocol.GitProtocolPanel;import io.onedev.server.web.component.pullrequest.assignment.AssignmentListPanel;+import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;import io.onedev.server.web.component.pullrequest.review.ReviewListPanel;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;@@ -113,7 +98,6 @@ import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;@@ -148,8 +132,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsuper(params);String requestNumberString = params.get(PARAM_REQUEST).toString();- if (StringUtils.isBlank(requestNumberString))- throw new RestartResponseException(ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(getProject(), null, 0));+ if (StringUtils.isBlank(requestNumberString)) {+ throw new RestartResponseException(ProjectPullRequestsPage.class,+ ProjectPullRequestsPage.paramsOf(getProject(), null, 0));+ }requestModel = new LoadableDetachableModel<PullRequest>() {@@ -157,8 +143,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected PullRequest load() {Long requestNumber = Long.valueOf(requestNumberString);PullRequest request = getPullRequestManager().find(getProject(), requestNumber);- if (request == null)- throw new EntityNotFoundException("Unable to find pull request #" + requestNumber + " in project " + getProject());+ if (request == null) {+ throw new EntityNotFoundException("Unable to find pull request #"+ + requestNumber + " in project " + getProject());+ }else if (!request.getTargetProject().equals(getProject()))throw new RestartResponseException(getPageClass(), paramsOf(request));else@@ -167,8 +155,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR};- if (!getPullRequest().isValid())- throw new RestartResponseException(InvalidPullRequestPage.class, InvalidPullRequestPage.paramsOf(getPullRequest()));+ if (!getPullRequest().isValid()) {+ throw new RestartResponseException(InvalidPullRequestPage.class,+ InvalidPullRequestPage.paramsOf(getPullRequest()));+ }latestUpdateId = requestModel.getObject().getLatestUpdate().getId();}@@ -494,7 +484,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onConfigure() {super.onConfigure();MergePreview preview = getPullRequest().getMergePreview();- setVisible(getPullRequest().isOpen() && preview != null+ setVisible(getPullRequest().isOpen()+ && preview != null&& preview.getMergeCommitHash() == null);}@@ -505,7 +496,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onConfigure() {super.onConfigure();MergePreview preview = getPullRequest().getMergePreview();- setVisible(getPullRequest().isOpen() && preview != null+ setVisible(getPullRequest().isOpen()+ && preview != null&& preview.getMergeCommitHash() != null);}@@ -516,7 +508,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(requestedForChanges());+ setVisible(getPullRequest().isOpen() && requestedForChanges());}});@@ -526,7 +518,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onConfigure() {super.onConfigure();- setVisible(!requestedForChanges()+ setVisible(getPullRequest().isOpen() && !requestedForChanges()&& getPullRequest().getReviews().stream().anyMatch(it-> it.getResult()==null));}@@ -536,7 +528,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(hasUnsuccessfulRequiredBuilds());+ setVisible(getPullRequest().isOpen() && hasUnsuccessfulRequiredBuilds());}});@@ -547,7 +539,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsuper.onConfigure();Stream<PullRequestVerification> stream = getPullRequest().getVerifications().stream();- setVisible(!hasUnsuccessfulRequiredBuilds()+ setVisible(getPullRequest().isOpen() && !hasUnsuccessfulRequiredBuilds()&& stream.anyMatch(it-> it.isRequired() && !it.getBuild().isFinished()));}@@ -557,9 +549,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!SecurityUtils.canWriteCode(getProject())- && getPullRequest().isAllReviewsApproved()- && getPullRequest().isRequiredBuildsSuccessful());+ setVisible(getPullRequest().isOpen() && !SecurityUtils.canWriteCode(getProject())+ && getPullRequest().isAllReviewsApproved() && getPullRequest().isRequiredBuildsSuccessful());}});@@ -659,7 +650,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected List<PullRequest> query(EntityQuery<PullRequest> query, int offset, int count, boolean inProject) {- return getPullRequestManager().query(inProject?getProject():null, query, offset, count);+ return getPullRequestManager().query(inProject?getProject():null, query, offset, count, false, false);}@Override@@ -683,18 +674,15 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});fragment.add(newMergeStrategyContainer());- fragment.add(new ReviewListPanel("reviews", requestModel));- fragment.add(new WebMarkupContainer("reviewerHelp") {+ fragment.add(new ReviewListPanel("reviews") {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getPullRequest().isMerged() && SecurityUtils.canModify(getPullRequest()));+ protected PullRequest getPullRequest() {+ return PullRequestDetailPage.this.getPullRequest();}});- fragment.add(new AssignmentListPanel("assignments", requestModel));- fragment.add(new WebMarkupContainer("assigneeHelp") {+ fragment.add(new WebMarkupContainer("reviewerHelp") {@Overrideprotected void onConfigure() {@@ -703,109 +691,72 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}});-- fragment.add(new ListView<JobBuilds>("jobs", new LoadableDetachableModel<List<JobBuilds>>() {+ fragment.add(new WebMarkupContainer("hiddenJobsNote") {@Override- protected List<JobBuilds> load() {- PullRequest request = getPullRequest();- Map<String, List<PullRequestVerification>> map = new HashMap<>();- for (PullRequestVerification verification: request.getVerifications()) {- String jobName = verification.getBuild().getJobName();- List<PullRequestVerification> list = map.get(jobName);- if (list == null) {- list = new ArrayList<>();- map.put(jobName, list);+ protected void onConfigure() {+ super.onConfigure();++ boolean hasHiddenJobs = false;+ for (String jobName: getPullRequest().getVerifications().stream()+ .map(it->it.getBuild().getJobName()).collect(Collectors.toSet())) {+ if (!SecurityUtils.canAccess(getProject(), jobName)) {+ hasHiddenJobs = true;+ break;}- list.add(verification);}- List<JobBuilds> listOfJobBuilds = new ArrayList<>();- for (Map.Entry<String, List<PullRequestVerification>> entry: map.entrySet()) {- List<Build> builds = entry.getValue().stream().map(it->it.getBuild()).collect(Collectors.toList());- Collections.sort(builds);- listOfJobBuilds.add(new JobBuilds(entry.getKey(), entry.getValue().iterator().next().isRequired(), builds));- }- Collections.sort(listOfJobBuilds, new Comparator<JobBuilds>() {-- @Override- public int compare(JobBuilds o1, JobBuilds o2) {- return o1.getBuilds().iterator().next().getId().compareTo(o2.getBuilds().iterator().next().getId());- }-- });- return listOfJobBuilds;+ setVisible(hasHiddenJobs);}- }) {+ });+ fragment.add(new PullRequestJobsPanel("jobs") {@Override- protected void populateItem(ListItem<JobBuilds> item) {- JobBuilds jobBuilds = item.getModelObject();-- String jobName = jobBuilds.getJobName();- Status status = Status.getOverallStatus(jobBuilds.getBuilds()- .stream()- .map(it->it.getStatus())- .collect(Collectors.toSet()));-- WebMarkupContainer link = new DropdownLink("job") {+ protected PullRequest getPullRequest() {+ return PullRequestDetailPage.this.getPullRequest();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPullRequest().getVerifications().isEmpty());+ }- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new SimpleBuildListPanel(id, new LoadableDetachableModel<List<Build>>() {-- @Override- protected List<Build> load() {- return item.getModelObject().getBuilds();- }-- }) {-- @Override- protected Component newListLink(String componentId) {- String query = ""- + getRuleName(AssociatedWithPullRequest) + " " + quote("#" + getPullRequest().getNumber())- + " " + getRuleName(And) + " "- + quote(NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);- return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,- ProjectBuildsPage.paramsOf(getPullRequest().getTargetProject(), query, 0));- }-- };- }+ });+ fragment.add(new WebMarkupContainer("jobsHelp") {++ @Override+ protected void onConfigure() {+ super.onConfigure();- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- String title;- if (status != null) {- if (status != Status.SUCCESSFUL)- title = "Some builds are ";- else- title = "Builds are ";- title += status.getDisplayName().toLowerCase() + ", click for details";- } else {- title = "No builds";- }- tag.put("title", title);+ boolean hasVisibleRequiredJobs = false;+ for (String jobName: getPullRequest().getVerifications().stream()+ .filter(it->it.isRequired())+ .map(it->it.getBuild().getJobName())+ .collect(Collectors.toSet())) {+ if (SecurityUtils.canAccess(getProject(), jobName)) {+ hasVisibleRequiredJobs = true;+ break;}-- };-- link.add(new BuildStatusIcon("status", Model.of(status)));- item.add(link);+ }+ setVisible(hasVisibleRequiredJobs);+ }++ });+ fragment.add(new AssignmentListPanel("assignments") {- if (jobBuilds.isRequired())- link.add(new Label("name", jobName + " (required)"));- else- link.add(new Label("name", jobName));- item.add(link);+ @Override+ protected PullRequest getPullRequest() {+ return PullRequestDetailPage.this.getPullRequest();}++ });+ fragment.add(new WebMarkupContainer("assigneeHelp") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getModelObject().isEmpty());+ setVisible(!getPullRequest().isMerged() && SecurityUtils.canModify(getPullRequest()));}});@@ -848,7 +799,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRfragment.setOutputMarkupId(true);return fragment;}-+};}@@ -1498,30 +1449,4 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}- private static class JobBuilds {- private final String jobName;-- private final boolean required;-- private final List<Build> builds;-- public JobBuilds(String jobName, boolean required, List<Build> builds) {- this.jobName = jobName;- this.required = required;- this.builds = builds;- }-- public String getJobName() {- return jobName;- }-- public boolean isRequired() {- return required;- }-- public List<Build> getBuilds() {- return builds;- }-- }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.javaindex 27c9b3a6d3..2ffc554638 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/MergeConfirmPanel.java@@ -50,17 +50,15 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {bean.setBody(builder.toString().trim());}- String description;+ String description = null;MergeStrategy mergeStrategy = getPullRequest().getMergeStrategy();MergePreview mergePreview = getPullRequest().getMergePreview();boolean needMergeCommit = false;if (mergeStrategy == CREATE_MERGE_COMMIT) {bean.setSummary("Merge pull request " + request.describe());- description = "Specify commit message of the merge commit";needMergeCommit = true;} else if (mergeStrategy == SQUASH_SOURCE_BRANCH_COMMITS) {bean.setSummary("Pull request " + request.describe());- description = "Specify commit message of the squash commit";needMergeCommit = true;} else if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {description = "Source branch commits will be rebased onto target branch";@@ -70,11 +68,10 @@ public abstract class MergeConfirmPanel extends OperationConfirmPanel {needMergeCommit = false;} else {bean.setSummary("Merge pull request " + request.describe());- description = "Specify commit message of the merge commit";needMergeCommit = true;}- getForm().add(new Label("description", description));+ getForm().add(new Label("description", description).setVisible(description != null));getForm().add(BeanContext.edit("commitMessage", bean).setVisible(needMergeCommit));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 44f2d39fb6..31da3d63ac 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -110,8 +110,12 @@ body.PullRequestDetailPage #layout>.body {text-decoration: inherit;}+#request-detail>.main>.operations {+ margin-bottom: 12px;+}#request-detail>.main>.operations>a {margin-right: 8px;+ margin-bottom: 8px;}ul>li>a.code-comments .fa-circle {@@ -148,6 +152,13 @@ ul>li>a.code-comments.new .fa-circle {font-weight: bold;margin-bottom: 12px;}+#request-detail>.side-info>.content>div>.head>.warning {+ color: #D09022;+}+#request-detail>.side-info .pull-request-jobs>.job {+ margin-right: 12px;+ line-height: 24px;+}#request-detail>.side-info {width: 360px;@@ -163,13 +174,6 @@ ul>li>a.code-comments.new .fa-circle {border-top: none;padding-top: 0;}-#request-detail>.side-info>.content>.jobs>.body>.job {- margin-right: 8px;- margin-bottom: 8px;-}-#request-detail>.side-info>.content>.jobs>.body {- margin-bottom: -8px;-}#request-detail>.side-info>.content .manage .synchronize>.help {margin-left: 4px;font-size: 16px;