The Unified and Autonomous Development Platform
Pull request review refactoring
Robin Shenee6e283bef62
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 fe308e7a5f..f1241e8c15 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@@ -8,7 +8,6 @@ import javax.annotation.Nullable;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectAndBranch;@@ -49,12 +48,13 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void reopen(PullRequest request, @Nullable String note);- void check(PullRequest request);+ void check(PullRequest request, boolean sourceUpdated);void merge(PullRequest request, @Nullable String commitMessage);void open(PullRequest request);+ @Overridevoid delete(PullRequest request);void deleteSourceBranch(PullRequest request, @Nullable String note);@@ -63,7 +63,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {int countOpen(Project targetProject);- void checkReviews(PullRequest request, List<User> unpreferableReviewers);+ void checkReviews(PullRequest request, boolean sourceUpdated);List<PullRequest> query(@Nullable Project targetProject, EntityQuery<PullRequest> requestQuery,boolean loadReviewsAndBuilds, int firstResult, int maxResults);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 35f27b0b2d..713a271fea 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@@ -6,13 +6,11 @@ import javax.annotation.Nullable;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {- @Nullable- PullRequestReview find(PullRequest request, User user, String commit);+ void review(PullRequest request, boolean approved, @Nullable String note);void populateReviews(Collection<PullRequest> requests);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 0696c58551..cd89aaea3f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -52,6 +52,7 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.CompareContext;+import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.Mark;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -96,27 +97,14 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imlistenerRegistry.post(event);PullRequest request = comment.getCompareContext().getPullRequest();- if (request != null) {- request.setCommentCount(request.getCommentCount() + 1);- if (comment.getCreateDate().after(request.getLastUpdate().getDate()))- listenerRegistry.post(new PullRequestCodeCommentCreated(request, comment));- }+ if (request != null && comment.getCreateDate().after(request.getLastUpdate().getDate()))+ listenerRegistry.post(new PullRequestCodeCommentCreated(request, comment));} else {dao.persist(comment);listenerRegistry.post(new CodeCommentUpdated(SecurityUtils.getUser(), comment));}}- @Transactional- @Override- public void delete(CodeComment comment) {- super.delete(comment);-- PullRequest request = comment.getCompareContext().getPullRequest();- if (request != null)- request.setCommentCount(request.getCommentCount() - comment.getReplyCount() - 1);- }-@Transactional@Listenpublic void on(CodeCommentEvent event) {@@ -277,8 +265,8 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imorders.add(builder.desc(CodeCommentQuery.getPath(root, CodeComment.ORDER_FIELDS.get(sort.getField()))));}- if (orders.isEmpty())- orders.add(builder.desc(root.get(CodeComment.PROP_ID)));+ if (orders.isEmpty())+ orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeComment.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE)));query.orderBy(orders);return query;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.javaindex d9897a511c..62c933f713 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java@@ -56,10 +56,8 @@ public class DefaultCodeCommentStatusChangeManager extends BaseEntityManager<CodlistenerRegistry.post(new CodeCommentStatusChanged(change, note));PullRequest request = comment.getCompareContext().getPullRequest();- if (request != null) {- request.setCommentCount(request.getCommentCount()+1);+ if (request != null)listenerRegistry.post(new PullRequestCodeCommentStatusChanged(request, change, note));- }}@Transactionaldiff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.javaindex 0e203a2182..1b34632e24 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java@@ -5,13 +5,11 @@ import java.util.Date;import javax.inject.Inject;import javax.inject.Singleton;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.PullRequestAssignmentManager;-import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.model.PullRequest;+import io.onedev.server.event.pullrequest.PullRequestAssigned;+import io.onedev.server.event.pullrequest.PullRequestUnassigned;import io.onedev.server.model.PullRequestAssignment;-import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeAddData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeRemoveData;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -21,26 +19,22 @@ import io.onedev.server.security.SecurityUtils;public class DefaultPullRequestAssignmentManager extends BaseEntityManager<PullRequestAssignment>implements PullRequestAssignmentManager {- private final PullRequestChangeManager changeManager;+ private final ListenerRegistry listenerRegistry;@Inject- public DefaultPullRequestAssignmentManager(Dao dao, PullRequestChangeManager changeManager) {+ public DefaultPullRequestAssignmentManager(Dao dao, ListenerRegistry listenerRegistry) {super(dao);- this.changeManager = changeManager;+ this.listenerRegistry = listenerRegistry;}@Transactional@Overridepublic void save(PullRequestAssignment assignment) {super.save(assignment);-- PullRequest request = assignment.getRequest();- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setRequest(request);- change.setData(new PullRequestAssigneeAddData(assignment.getUser()));- change.setUser(SecurityUtils.getUser());- changeManager.save(change);++ listenerRegistry.post(new PullRequestAssigned(+ SecurityUtils.getUser(), new Date(),+ assignment.getRequest(), assignment.getUser()));}@Transactional@@ -48,14 +42,9 @@ public class DefaultPullRequestAssignmentManager extends BaseEntityManager<PullRpublic void delete(PullRequestAssignment assignment) {super.delete(assignment);- PullRequest request = assignment.getRequest();-- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setRequest(request);- change.setData(new PullRequestAssigneeRemoveData(assignment.getUser()));- change.setUser(SecurityUtils.getUser());- changeManager.save(change);+ listenerRegistry.post(new PullRequestUnassigned(+ SecurityUtils.getUser(), new Date(),+ assignment.getRequest(), assignment.getUser()));}}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 26f39f1888..a55d5e6f11 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@@ -13,6 +13,7 @@ import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOimport java.util.ArrayList;import java.util.Collection;import java.util.Collections;+import java.util.Comparator;import java.util.Date;import java.util.HashMap;import java.util.HashSet;@@ -74,11 +75,16 @@ import io.onedev.server.entityreference.ReferencedFromAware;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.build.BuildEvent;import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.event.pullrequest.PullRequestAssigned;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChanged;+import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.event.pullrequest.PullRequestOpened;+import io.onedev.server.event.pullrequest.PullRequestReviewRequested;+import io.onedev.server.event.pullrequest.PullRequestReviewerRemoved;+import io.onedev.server.event.pullrequest.PullRequestUnassigned;import io.onedev.server.event.pullrequest.PullRequestUpdated;import io.onedev.server.git.GitUtils;import io.onedev.server.infomanager.CommitInfoManager;@@ -103,15 +109,11 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeAddData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeRemoveData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchDeleteData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchRestoreData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestTargetBranchChangeData;@@ -274,7 +276,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imif (mergePreview != null && mergePreview.getMergeCommitHash() != null)listenerRegistry.post(new PullRequestMergePreviewCalculated(request));- checkAsync(Lists.newArrayList(request));+ checkAsync(Lists.newArrayList(request), null);}@Transactional@@ -433,7 +435,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imif (mergePreview != null && mergePreview.getMergeCommitHash() != null)listenerRegistry.post(new PullRequestMergePreviewCalculated(request));- checkAsync(Lists.newArrayList(request));+ checkAsync(Lists.newArrayList(request), null);listenerRegistry.post(event);}@@ -465,7 +467,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im@Transactional@Override- public void check(PullRequest request) {+ public void check(PullRequest request, boolean sourceUpdated) {try {request.setCheckError(null);if (request.isOpen() && request.isValid()) {@@ -480,7 +482,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imif (request.isMergedIntoTarget()) {closeAsMerged(request, true);} else {- checkReviews(request, Lists.newArrayList());+ checkReviews(request, sourceUpdated);/** If the check method runs concurrently, below statements may fail. It will@@ -577,7 +579,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imCriterion criterion = Restrictions.and(ofOpen(),Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));- checkAsync(query(EntityCriteria.of(PullRequest.class).add(criterion)));+ checkAsync(query(EntityCriteria.of(PullRequest.class).add(criterion)), projectAndBranch);}}@@ -658,7 +660,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imif (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData|| data instanceof PullRequestMergeStrategyChangeData|| data instanceof PullRequestTargetBranchChangeData) {- checkAsync(Lists.newArrayList(event.getRequest()));+ checkAsync(Lists.newArrayList(event.getRequest()), null);}}@@ -683,11 +685,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imboolean minorChange = false;if (event instanceof PullRequestChanged) {PullRequestChangeData changeData = ((PullRequestChanged)event).getChange().getData();- if (changeData instanceof PullRequestReviewerAddData- || changeData instanceof PullRequestReviewerRemoveData- || changeData instanceof PullRequestAssigneeAddData- || changeData instanceof PullRequestAssigneeRemoveData- || changeData instanceof PullRequestSourceBranchDeleteData+ if (changeData instanceof PullRequestSourceBranchDeleteData|| changeData instanceof PullRequestSourceBranchRestoreData|| changeData instanceof ReferencedFromAware) {minorChange = true;@@ -696,8 +694,14 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imif (!(event instanceof PullRequestOpened|| event instanceof PullRequestMergePreviewCalculated|| event instanceof PullRequestBuildEvent+ || event instanceof PullRequestAssigned+ || event instanceof PullRequestUnassigned+ || event instanceof PullRequestReviewRequested+ || event instanceof PullRequestReviewerRemoved|| minorChange)) {event.getRequest().setLastUpdate(event.getLastUpdate());+ if (event instanceof PullRequestCodeCommentEvent)+ event.getRequest().setCodeCommentsUpdateDate(event.getDate());}}}@@ -719,7 +723,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im}@Sessional- protected void checkAsync(Collection<PullRequest> requests) {+ protected void checkAsync(Collection<PullRequest> requests, @Nullable ProjectAndBranch source) {Collection<Long> requestIds = requests.stream().map(it->it.getId()).collect(Collectors.toList());if (!requestIds.isEmpty()) {transactionManager.runAfterCommit(new Runnable() {@@ -744,7 +748,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im@Overridepublic void run() {- check(load(requestId));+ PullRequest request = load(requestId);+ check(request, request.getSource() != null && request.getSource().equals(source));}});@@ -764,142 +769,121 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im@Transactional@Override- public void checkReviews(PullRequest request, List<User> unpreferableReviewers) {- unpreferableReviewers = new ArrayList<>(unpreferableReviewers);- unpreferableReviewers.remove(request.getSubmitter());- unpreferableReviewers.add(request.getSubmitter());- BranchProtection branchProtection = request.getTargetProject().getHierarchyBranchProtection(- request.getTargetBranch(), request.getSubmitter());-- ReviewRequirement reviewRequirement = branchProtection.getParsedReviewRequirement();- for (PullRequestReview review: request.getReviews()) {- if (!reviewRequirement.getUsers().contains(review.getUser()))- reviewRequirement.getUsers().add(review.getUser());+ public void checkReviews(PullRequest request, boolean sourceUpdated) {+ BranchProtection branchProtection = request.getTargetProject()+ .getHierarchyBranchProtection(request.getTargetBranch(), request.getSubmitter());+ Collection<String> changedFiles;+ if (sourceUpdated) {+ changedFiles = request.getLatestUpdate().getChangedFiles();+ } else {+ changedFiles = new HashSet<>();+ for (PullRequestUpdate update: request.getUpdates())+ changedFiles.addAll(update.getChangedFiles());}- checkReviews(branchProtection.getParsedReviewRequirement(), request.getLatestUpdate(), unpreferableReviewers);-+ checkReviews(branchProtection.getParsedReviewRequirement(),+ request, changedFiles, sourceUpdated);+ReviewRequirement checkedRequirement = ReviewRequirement.parse(null, true);- for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {- if (branchProtection.getFileProtections().stream().allMatch(- it->checkedRequirement.covers(it.getParsedReviewRequirement()))) {- break;- }- PullRequestUpdate update = request.getSortedUpdates().get(i);- for (String file: update.getChangedFiles()) {- FileProtection fileProtection = branchProtection.getFileProtection(file);- if (!checkedRequirement.covers(fileProtection.getParsedReviewRequirement())) {- checkedRequirement.mergeWith(fileProtection.getParsedReviewRequirement());- checkReviews(fileProtection.getParsedReviewRequirement(), update, unpreferableReviewers);- }++ for (String file: changedFiles) {+ FileProtection fileProtection = branchProtection.getFileProtection(file);+ if (!checkedRequirement.covers(fileProtection.getParsedReviewRequirement())) {+ checkedRequirement.mergeWith(fileProtection.getParsedReviewRequirement());+ checkReviews(fileProtection.getParsedReviewRequirement(),+ request, Sets.newHashSet(file), sourceUpdated);}}}- private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update, List<User> unpreferableReviewers) {- PullRequest request = update.getRequest();-+ private void checkReviews(ReviewRequirement reviewRequirement, PullRequest request,+ Collection<String> changedFiles, boolean sourceUpdated) {for (User user: reviewRequirement.getUsers()) {- PullRequestReview review = request.getReview(user);- if (review == null) {- review = new PullRequestReview();- review.setRequest(request);- review.setUser(user);- request.getReviews().add(review);- } else if (review.getResult() != null && (review.getUpdate() == null || review.getUpdate().getId()<update.getId())) {- review.setResult(null);+ if (!user.equals(request.getSubmitter())) {+ PullRequestReview review = request.getReview(user);+ if (review == null) {+ review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(user);+ request.getReviews().add(review);+ } else if (review.getStatus() == PullRequestReview.Status.EXCLUDED+ || sourceUpdated && review.getStatus() != PullRequestReview.Status.PENDING) {+ review.setStatus(PullRequestReview.Status.PENDING);+ }}}for (Map.Entry<Group, Integer> entry: reviewRequirement.getGroups().entrySet()) {Group group = entry.getKey();int requiredCount = entry.getValue();- checkReviews(group.getMembers(), requiredCount, update, unpreferableReviewers);+ Collection<User> users = new ArrayList<>(group.getMembers());+ users.remove(request.getSubmitter());+ checkReviews(users, requiredCount, request, changedFiles, sourceUpdated);}}private void checkReviews(Collection<User> users, int requiredCount,- PullRequestUpdate update, List<User> unpreferableReviewers) {- PullRequest request = update.getRequest();-+ PullRequest request, Collection<String> changedFiles, boolean sourceUpdated) {if (requiredCount == 0)requiredCount = users.size();-- int effectiveCount = 0;- Set<User> potentialReviewers = new HashSet<>();for (User user: users) {PullRequestReview review = request.getReview(user);- if (review != null) {- if (review.getResult() == null)- requiredCount--;- else if (review.getUpdate() != null && review.getUpdate().getId()>=update.getId())- effectiveCount++;- else- potentialReviewers.add(user);- } else {- potentialReviewers.add(user);+ if (review != null && review.getStatus() != PullRequestReview.Status.EXCLUDED) {+ if (sourceUpdated && review.getStatus() != PullRequestReview.Status.PENDING)+ review.setStatus(PullRequestReview.Status.PENDING);+ requiredCount--;}- if (effectiveCount >= requiredCount)+ if (requiredCount <= 0)break;}- int missingCount = requiredCount - effectiveCount;- Set<User> reviewers = new HashSet<>();-- List<User> candidateReviewers = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review != null)- candidateReviewers.add(user);- }-Project project = request.getTargetProject();- commitInfoManager.sortUsersByContribution(candidateReviewers, project, update.getChangedFiles());-- for (User user: candidateReviewers) {- reviewers.add(user);- request.getReview(user).setResult(null);- if (reviewers.size() == missingCount)- break;- }+ Set<User> reviewers = new HashSet<>();- if (reviewers.size() < missingCount) {- candidateReviewers = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review == null && !unpreferableReviewers.contains(user))+ if (requiredCount > 0) {+ List<User> candidateReviewers = new ArrayList<>();++ for (User user: users) {+ if (request.getReview(user) == null)candidateReviewers.add(user);}- commitInfoManager.sortUsersByContribution(candidateReviewers, project, update.getChangedFiles());++ commitInfoManager.sortUsersByContribution(candidateReviewers, project, changedFiles);+for (User user: candidateReviewers) {reviewers.add(user);PullRequestReview review = new PullRequestReview();review.setRequest(request);review.setUser(user);request.getReviews().add(review);- if (reviewers.size() == missingCount)+ if (reviewers.size() == requiredCount)break;}}- if (reviewers.size() < missingCount) {- for (User reviewer: unpreferableReviewers) {- PullRequestReview review = request.getReview(reviewer);- if (review == null && potentialReviewers.contains(reviewer)) {- reviewers.add(reviewer);- review = new PullRequestReview();- review.setRequest(request);- review.setUser(reviewer);- request.getReviews().add(review);- if (reviewers.size() == missingCount)+ if (requiredCount > reviewers.size()) {+ List<PullRequestReview> reviews = new ArrayList<>(request.getReviews());+ Collections.sort(reviews, new Comparator<PullRequestReview>() {++ @Override+ public int compare(PullRequestReview o1, PullRequestReview o2) {+ return o1.getStatusDate().compareTo(o2.getStatusDate());+ }++ });+ for (PullRequestReview review: reviews) {+ if (review.getStatus() == PullRequestReview.Status.EXCLUDED) {+ reviewers.add(review.getUser());+ review.setStatus(PullRequestReview.Status.PENDING);+ if (reviewers.size() == requiredCount)break;}}}- if (reviewers.size() < missingCount) {+ if (requiredCount > reviewers.size()) {String errorMessage = String.format("Impossible to provide required number of reviewers "+ "(candidates: %s, required number of reviewers: %d, pull request: #%d)",- reviewers, missingCount, update.getRequest().getNumber());+ reviewers, requiredCount, request.getNumber());throw new ExplicitException(errorMessage);}}@@ -1098,5 +1082,5 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imreturn getSession().createQuery(criteriaQuery).getResultList();}}-+}diff --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 b839f7e141..1518919ea9 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@@ -2,127 +2,68 @@ package io.onedev.server.entitymanager.impl;import java.util.ArrayList;import java.util.Collection;-import java.util.Date;import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Join;import javax.persistence.criteria.Root;-import org.hibernate.criterion.Restrictions;--import com.google.common.collect.Lists;+import com.google.common.base.Preconditions;+import io.onedev.commons.loader.ListenerRegistry;import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.exception.ReviewerRequiredException;+import io.onedev.server.event.pullrequest.PullRequestReviewRequested;+import io.onedev.server.event.pullrequest.PullRequestReviewerRemoved;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewWithdrawData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;@Singletonpublic class DefaultPullRequestReviewManager extends BaseEntityManager<PullRequestReview>implements PullRequestReviewManager {- private final PullRequestManager pullRequestManager;-private final PullRequestChangeManager changeManager;+ private final ListenerRegistry listenerRegistry;+@Inject- public DefaultPullRequestReviewManager(Dao dao, PullRequestManager pullRequestManager,- PullRequestChangeManager changeManager) {+ public DefaultPullRequestReviewManager(Dao dao, PullRequestChangeManager changeManager,+ ListenerRegistry listenerRegistry) {super(dao);-- this.pullRequestManager = pullRequestManager;this.changeManager = changeManager;- }-- @Override- public PullRequestReview find(PullRequest request, User user, String commit) {- EntityCriteria<PullRequestReview> criteria = EntityCriteria.of(PullRequestReview.class);- criteria.add(Restrictions.eq("user", user))- .add(Restrictions.eq("request", request))- .add(Restrictions.eq("commit", commit));- return find(criteria);- }-- @Transactional- @Override- public void delete(PullRequestReview review) {- PullRequest request = review.getRequest();- request.getReviews().remove(review);- User reviewer = review.getUser();- pullRequestManager.checkReviews(request, Lists.newArrayList(reviewer));- if (request.isNew()) {- if (request.getReview(reviewer) != null)- throw new ReviewerRequiredException(reviewer);- } else if (request.getReview(reviewer) == null) {- dao.remove(review);- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setRequest(review.getRequest());- change.setData(new PullRequestReviewerRemoveData(reviewer));- change.setUser(SecurityUtils.getUser());- changeManager.save(change);-- for (PullRequestReview eachReview: request.getReviews()) {- if (eachReview.isNew())- save(eachReview);- }- } else {- throw new ReviewerRequiredException(reviewer);- }+ this.listenerRegistry = listenerRegistry;}@Transactional@Overridepublic void save(PullRequestReview review) {- boolean isNew = review.isNew();review.setDirty(false);super.save(review);-- PullRequestChange change = new PullRequestChange();- if (isNew) {- change.setDate(new Date());- change.setRequest(review.getRequest());- change.setData(new PullRequestReviewerAddData(review.getUser()));- change.setUser(SecurityUtils.getUser());- changeManager.save(change);- } else {- ReviewResult result = review.getResult();-- if (result != null) {- change.setDate(new Date());- change.setRequest(review.getRequest());-- if (Boolean.TRUE.equals(result.getApproved()))- change.setData(new PullRequestApproveData());- else if (Boolean.FALSE.equals(result.getApproved()))- change.setData(new PullRequestRequestedForChangesData());- else- change.setData(new PullRequestReviewWithdrawData());- change.setUser(review.getUser());- changeManager.save(change, result.getComment());- }++ if (review.getStatus() == Status.PENDING) {+ listenerRegistry.post(new PullRequestReviewRequested(+ SecurityUtils.getUser(), review.getStatusDate(),+ review.getRequest(), review.getUser()));+ } else if (review.getStatus() == Status.EXCLUDED) {+ listenerRegistry.post(new PullRequestReviewerRemoved(+ SecurityUtils.getUser(), review.getStatusDate(),+ review.getRequest(), review.getUser()));}}- @Sessional+ @Sessional@Overridepublic void populateReviews(Collection<PullRequest> requests) {CriteriaBuilder builder = getSession().getCriteriaBuilder();@@ -130,15 +71,39 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullRequeRoot<PullRequestReview> root = query.from(PullRequestReview.class);query.select(root);- root.join(PullRequestReview.PROP_REQUEST);-- query.where(root.get(PullRequestReview.PROP_REQUEST).in(requests));+ Join<PullRequest, PullRequest> join = root.join(PullRequestReview.PROP_REQUEST);+ query.where(join.in(requests));- for (PullRequest request: requests)+ for (PullRequest request: requests)request.setReviews(new ArrayList<>());for (PullRequestReview review: getSession().createQuery(query).getResultList())review.getRequest().getReviews().add(review);}-++ @Transactional+ @Override+ public void review(PullRequest request, boolean approved, String note) {+ User user = SecurityUtils.getUser();+ PullRequestReview review = request.getReview(user);+ Preconditions.checkState(review != null && review.getStatus() == PullRequestReview.Status.PENDING);+ if (approved)+ review.setStatus(PullRequestReview.Status.APPROVED);+ else+ review.setStatus(PullRequestReview.Status.REQUESTED_FOR_CHANGES);++ save(review);++ PullRequestChange change = new PullRequestChange();+ change.setDate(review.getStatusDate());+ change.setRequest(request);+ change.setUser(user);+ if (approved)+ change.setData(new PullRequestApproveData());+ else+ change.setData(new PullRequestRequestedForChangesData());++ changeManager.save(change, note);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestAssigned.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestAssigned.javanew file mode 100644index 0000000000..18569819f1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestAssigned.java@@ -0,0 +1,29 @@+package io.onedev.server.event.pullrequest;++import java.util.Date;++import javax.annotation.Nullable;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;++public class PullRequestAssigned extends PullRequestEvent {++ private final User assignee;++ public PullRequestAssigned(User user, Date date, PullRequest request, User assignee) {+ super(user, date, request);+ this.assignee = assignee;+ }++ @Override+ public String getActivity() {+ return "assigned to \"" + assignee.getDisplayName() + "\"";+ }++ @Nullable+ public User getAssignee() {+ return assignee;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewRequested.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewRequested.javanew file mode 100644index 0000000000..71280f5330--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewRequested.java@@ -0,0 +1,26 @@+package io.onedev.server.event.pullrequest;++import java.util.Date;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;++public class PullRequestReviewRequested extends PullRequestEvent {++ private final User reviewer;++ public PullRequestReviewRequested(User user, Date date, PullRequest request, User reviewer) {+ super(user, date, request);+ this.reviewer = reviewer;+ }++ @Override+ public String getActivity() {+ return "requested review from " + getReviewer().getDisplayName();+ }++ public User getReviewer() {+ return reviewer;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewerRemoved.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewerRemoved.javanew file mode 100644index 0000000000..af8713127a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestReviewerRemoved.java@@ -0,0 +1,26 @@+package io.onedev.server.event.pullrequest;++import java.util.Date;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;++public class PullRequestReviewerRemoved extends PullRequestEvent {++ private final User reviewer;++ public PullRequestReviewerRemoved(User user, Date date, PullRequest request, User reviewer) {+ super(user, date, request);+ this.reviewer = reviewer;+ }++ @Override+ public String getActivity() {+ return "removed reviewer \"" + reviewer.getDisplayName() + "\"";+ }++ public User getReviewer() {+ return reviewer;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUnassigned.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUnassigned.javanew file mode 100644index 0000000000..24291a0b31--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUnassigned.java@@ -0,0 +1,29 @@+package io.onedev.server.event.pullrequest;++import java.util.Date;++import javax.annotation.Nullable;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;++public class PullRequestUnassigned extends PullRequestEvent {++ private final User assignee;++ public PullRequestUnassigned(User user, Date date, PullRequest request, User assignee) {+ super(user, date, request);+ this.assignee = assignee;+ }++ @Override+ public String getActivity() {+ return "unassigned from \"" + assignee.getDisplayName() + "\"";+ }++ @Nullable+ public User getAssignee() {+ return assignee;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.javaindex c3dfc81955..4ddc012b42 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultUserInfoManager.java@@ -14,6 +14,7 @@ import io.onedev.commons.loader.Listen;import io.onedev.server.event.codecomment.CodeCommentEvent;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.issue.IssueEvent;+import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Issue;@@ -41,6 +42,8 @@ public class DefaultUserInfoManager extends AbstractMultiEnvironmentManager implprivate static final String PULL_REQUEST_VISIT_STORE = "pullRequestVisit";+ private static final String PULL_REQUEST_CODE_COMMENTS_VISIT_STORE = "pullRequestCodeCommentsVisit";+private static final String CODE_COMMENT_VISIT_STORE = "codeCommentVisit";private static final String ISSUE_VISIT_STORE = "issueVisit";@@ -182,8 +185,44 @@ public class DefaultUserInfoManager extends AbstractMultiEnvironmentManager impl@Listenpublic void on(PullRequestEvent event) {- if (event.getUser() != null)+ if (event.getUser() != null) {visitPullRequest(event.getUser(), event.getRequest());+ if (event instanceof PullRequestCodeCommentEvent)+ visitPullRequestCodeComments(event.getUser(), event.getRequest());+ }+ }++ @Override+ public void visitPullRequestCodeComments(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, PULL_REQUEST_CODE_COMMENTS_VISIT_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ long time = new DateTime().plusSeconds(1).getMillis();+ writeLong(store, txn, new LongsByteIterable(Lists.newArrayList(user.getId(), request.getId())), time);+ }++ });+ }++ @Override+ public Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, PULL_REQUEST_CODE_COMMENTS_VISIT_STORE);+ return env.computeInTransaction(new TransactionalComputable<Date>() {++ @Override+ public Date compute(Transaction txn) {+ long millis = readLong(store, txn, new LongsByteIterable(Lists.newArrayList(user.getId(), request.getId())), -1);+ if (millis != -1)+ return new Date(millis);+ else+ return null;+ }++ });}}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/UserInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/UserInfoManager.javaindex b1afd35255..435b6cf19a 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/UserInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/UserInfoManager.java@@ -13,6 +13,8 @@ public interface UserInfoManager {void visitPullRequest(User user, PullRequest request);+ void visitPullRequestCodeComments(User user, PullRequest request);+void visitIssue(User user, Issue issue);void visitCodeComment(User user, CodeComment comment);@@ -23,6 +25,9 @@ public interface UserInfoManager {@NullableDate getPullRequestVisitDate(User user, PullRequest request);+ @Nullable+ Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request);+@NullableDate getCodeCommentVisitDate(User user, CodeComment comment);diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex f4fa8215fe..86a8fce0f0 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -75,6 +75,8 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupppublic static final String PROP_LAST_UPDATE = "lastUpdate";+ public static final String NAME_RESOLVED = "Status";+public static final String PROP_RESOLVED = "resolved";public static final String PROP_USER = "user";@@ -89,6 +91,7 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSuppNAME_CONTENT, NAME_REPLY, NAME_PATH, NAME_CREATE_DATE, NAME_UPDATE_DATE, NAME_REPLY_COUNT);public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(+ NAME_RESOLVED, PROP_RESOLVED,NAME_CREATE_DATE, PROP_CREATE_DATE,NAME_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE,NAME_REPLY_COUNT, PROP_REPLY_COUNT);diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.javaindex b3add13758..a5d50e09ee 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.java@@ -15,7 +15,8 @@ import io.onedev.server.model.support.CompareContext;@Entity@Table(indexes={- @Index(columnList="o_comment_id"), @Index(columnList="o_user_id")})+ @Index(columnList="o_comment_id"), @Index(columnList="o_user_id"),+ @Index(columnList="o_pullRequest_id")})public class CodeCommentStatusChange extends AbstractEntity {private static final long serialVersionUID = 1L;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 b91b288e49..9153e04695 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@@ -8,7 +8,6 @@ import static io.onedev.server.model.PullRequest.PROP_TITLE;import static io.onedev.server.model.PullRequest.PROP_UUID;import java.io.IOException;-import java.nio.channels.IllegalSelectorException;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -282,6 +281,9 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach@Embeddedprivate LastUpdate lastUpdate;++ @Column(name="CODE_COMMENTS_UPDT")+ private Date codeCommentsUpdateDate;@Column(length=MAX_CHECK_ERROR_LEN)@OptimisticLock(excluded=true)@@ -585,8 +587,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}public List<PullRequestReview> getSortedReviews() {- List<PullRequestReview> sortedReviews = new ArrayList<>(reviews);-+ List<PullRequestReview> sortedReviews = new ArrayList<>(getReviews());Collections.sort(sortedReviews, new Comparator<PullRequestReview>() {@Override@@ -773,6 +774,15 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachthis.lastUpdate = lastUpdate;}+ @Nullable+ public Date getCodeCommentsUpdateDate() {+ return codeCommentsUpdateDate;+ }++ public void setCodeCommentsUpdateDate(Date codeCommentsUpdateDate) {+ this.codeCommentsUpdateDate = codeCommentsUpdateDate;+ }+@Nullablepublic String getCheckError() {return checkError;@@ -794,6 +804,16 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}}+ public boolean isCodeCommentsVisitedAfter(Date date) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ Date visitDate = OneDev.getInstance(UserInfoManager.class).getPullRequestCodeCommentsVisitDate(user, this);+ return visitDate != null && visitDate.getTime()>date.getTime();+ } else {+ return true;+ }+ }+public boolean isMerged() {return status == Status.MERGED;}@@ -916,8 +936,10 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic boolean isAllReviewsApproved() {for (PullRequestReview review: getReviews()) {- if (review.getResult() == null || !Boolean.TRUE.equals(review.getResult().getApproved()))+ if (review.getStatus() != PullRequestReview.Status.APPROVED+ && review.getStatus() != PullRequestReview.Status.EXCLUDED) {return false;+ }}return true;}@@ -1015,7 +1037,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachif (comparisonBase != null)infoManager.cacheComparisonBase(this, oldCommitId, newCommitId, comparisonBase);else- throw new IllegalSelectorException();+ throw new IllegalStateException();}return comparisonBase;}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 7c96bf78e2..6e1070bc28 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@@ -1,9 +1,8 @@package io.onedev.server.model;-import java.util.Optional;+import java.util.Date;-import javax.annotation.Nullable;-import javax.persistence.Embedded;+import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;import javax.persistence.Index;@@ -12,8 +11,6 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import io.onedev.server.model.support.pullrequest.ReviewResult;-@Entity@Table(indexes={@Index(columnList="o_user_id"), @Index(columnList="o_request_id")},@@ -27,7 +24,9 @@ public class PullRequestReview extends AbstractEntity {public static final String PROP_USER = "user";- public static final String PROP_RESULT = "result";+ public static final String PROP_STATUS = "status";++ public enum Status {PENDING, APPROVED, REQUESTED_FOR_CHANGES, EXCLUDED}@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)@@ -37,12 +36,12 @@ public class PullRequestReview extends AbstractEntity {@JoinColumn(nullable=false)private PullRequest request;- @Embedded- private ReviewResult result;+ @Column(nullable=false)+ private Status status = Status.PENDING;- private transient boolean dirty;+ private Date statusDate = new Date();- private transient Optional<PullRequestUpdate> updateOptional;+ private transient boolean dirty;public User getUser() {return user;@@ -52,6 +51,16 @@ public class PullRequestReview extends AbstractEntity {this.user = user;}+ public Status getStatus() {+ return status;+ }++ public void setStatus(Status status) {+ this.status = status;+ statusDate = new Date();+ dirty = true;+ }+public PullRequest getRequest() {return request;}@@ -60,16 +69,6 @@ public class PullRequestReview extends AbstractEntity {this.request = request;}- @Nullable- public ReviewResult getResult() {- return result;- }-- public void setResult(@Nullable ReviewResult result) {- this.result = result;- dirty = true;- }-public boolean isDirty() {return dirty;}@@ -78,21 +77,12 @@ public class PullRequestReview extends AbstractEntity {this.dirty = dirty;}- @Nullable- public PullRequestUpdate getUpdate() {- if (updateOptional == null) {- PullRequestUpdate update = null;- if (result != null) {- for (PullRequestUpdate each: request.getUpdates()) {- if (each.getHeadCommitHash().equals(result.getCommit())) {- update = each;- break;- }- }- }- updateOptional = Optional.ofNullable(update);- }- return updateOptional.orElse(null);+ public Date getStatusDate() {+ return statusDate;}-++ public void setStatusDate(Date statusDate) {+ this.statusDate = statusDate;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.javadeleted file mode 100644index c29176da55..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java+++ /dev/null@@ -1,51 +0,0 @@-package io.onedev.server.model.support.pullrequest;--import java.io.Serializable;--import javax.annotation.Nullable;-import javax.persistence.Column;-import javax.persistence.Embeddable;--@Embeddable-public class ReviewResult implements Serializable {-- private static final long serialVersionUID = 1L;-- public static final String PROP_APPROVED = "approved";-- private String commit;-- private Boolean approved;-- @Column(length=15000)- private String comment;-- public String getCommit() {- return commit;- }-- public void setCommit(String commit) {- this.commit = commit;- }-- /**- * @return null if review withdrawed- */- @Nullable- public Boolean getApproved() {- return approved;- }-- public void setApproved(Boolean approved) {- this.approved = approved;- }-- public String getComment() {- return comment;- }-- public void setComment(String comment) {- this.comment = comment;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.javadeleted file mode 100644index 390529a059..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java+++ /dev/null@@ -1,33 +0,0 @@-package io.onedev.server.model.support.pullrequest.changedata;--import javax.annotation.Nullable;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;--public class PullRequestAssigneeAddData extends PullRequestChangeData {-- private static final long serialVersionUID = 1L;-- private final Long assigneeId;-- public PullRequestAssigneeAddData(User assignee) {- this.assigneeId = assignee.getId();- }-- @Override- public String getActivity() {- User user = getUser();- if (user != null)- return "added assignee \"" + user.getDisplayName() + "\"";- else- return "added assignee unknown";- }-- @Nullable- public User getUser() {- return OneDev.getInstance(UserManager.class).get(assigneeId);- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.javadeleted file mode 100644index 85fac1063b..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java+++ /dev/null@@ -1,33 +0,0 @@-package io.onedev.server.model.support.pullrequest.changedata;--import javax.annotation.Nullable;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;--public class PullRequestAssigneeRemoveData extends PullRequestChangeData {-- private static final long serialVersionUID = 1L;-- private final Long assigneeId;-- public PullRequestAssigneeRemoveData(User assignee) {- this.assigneeId = assignee.getId();- }-- @Override- public String getActivity() {- User user = getUser();- if (user != null)- return "removed assignee \"" + user.getDisplayName() + "\"";- else- return "removed assignee unknown";- }-- @Nullable- public User getUser() {- return OneDev.getInstance(UserManager.class).get(assigneeId);- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewWithdrawData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewWithdrawData.javadeleted file mode 100644index f1bfef315d..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewWithdrawData.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.model.support.pullrequest.changedata;--public class PullRequestReviewWithdrawData extends PullRequestChangeData {-- private static final long serialVersionUID = 1L;-- @Override- public String getActivity() {- return "withdrawed review";- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.javadeleted file mode 100644index a81d1f90d1..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java+++ /dev/null@@ -1,33 +0,0 @@-package io.onedev.server.model.support.pullrequest.changedata;--import javax.annotation.Nullable;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;--public class PullRequestReviewerAddData extends PullRequestChangeData {-- private static final long serialVersionUID = 1L;-- private final Long reviewerId;-- public PullRequestReviewerAddData(User reviewer) {- this.reviewerId = reviewer.getId();- }-- @Override- public String getActivity() {- User user = getUser();- if (user != null)- return "added reviewer \"" + user.getDisplayName() + "\"";- else- return "added reviewer unknown";- }-- @Nullable- public User getUser() {- return OneDev.getInstance(UserManager.class).get(reviewerId);- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.javadeleted file mode 100644index d798a2418a..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java+++ /dev/null@@ -1,33 +0,0 @@-package io.onedev.server.model.support.pullrequest.changedata;--import javax.annotation.Nullable;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;--public class PullRequestReviewerRemoveData extends PullRequestChangeData {-- private static final long serialVersionUID = 1L;-- private final Long reviewerId;-- public PullRequestReviewerRemoveData(User reviewer) {- this.reviewerId = reviewer.getId();- }-- @Override- public String getActivity() {- User user = getUser();- if (user != null)- return "removed reviewer \"" + user.getDisplayName() + "\"";- else- return "removed reviewer unknown";- }-- @Nullable- public User getUser() {- return OneDev.getInstance(UserManager.class).get(reviewerId);- }--}diff --git a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.javaindex de928c8229..0b99886b5a 100644--- a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java@@ -14,14 +14,10 @@ import groovy.text.SimpleTemplateEngine;import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.Event;-import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.markdown.MarkdownManager;-import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.EmailAddress;-import io.onedev.server.model.PullRequestAssignment;-import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;@@ -58,15 +54,6 @@ public abstract class AbstractNotificationManager {} else if (event instanceof PullRequestEvent) {template = StringUtils.join(settingManager.getNotificationTemplateSetting().getPullRequestNotificationTemplate(), "\n");bindings.put("pullRequest", ((PullRequestEvent) event).getRequest());- } else if (event instanceof EntityPersisted) {- AbstractEntity entity = ((EntityPersisted) event).getEntity();- if (entity instanceof PullRequestReview) {- template = StringUtils.join(settingManager.getNotificationTemplateSetting().getPullRequestNotificationTemplate(), "\n");- bindings.put("pullRequest", ((PullRequestReview) entity).getRequest());- } else if (entity instanceof PullRequestAssignment) {- template = StringUtils.join(settingManager.getNotificationTemplateSetting().getPullRequestNotificationTemplate(), "\n");- bindings.put("pullRequest", ((PullRequestAssignment) entity).getRequest());- }}if (template == null)template = StringUtils.join(NotificationTemplateSetting.DEFAULT_TEMPLATE, "\n");diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex f88a435388..302215f283 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -22,14 +22,19 @@ import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.event.pullrequest.PullRequestAssigned;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChanged;import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;+import io.onedev.server.event.pullrequest.PullRequestCodeCommentStatusChanged;import io.onedev.server.event.pullrequest.PullRequestCommented;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.event.pullrequest.PullRequestOpened;+import io.onedev.server.event.pullrequest.PullRequestReviewRequested;+import io.onedev.server.event.pullrequest.PullRequestReviewerRemoved;+import io.onedev.server.event.pullrequest.PullRequestUnassigned;import io.onedev.server.event.pullrequest.PullRequestUpdated;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.markdown.MarkdownManager;@@ -38,18 +43,17 @@ import io.onedev.server.model.EmailAddress;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.User;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeAddData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.QueryWatchBuilder;@@ -95,6 +99,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerurl = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment());else if (event instanceof PullRequestCodeCommentReplied)url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply());+ else if (event instanceof PullRequestCodeCommentStatusChanged)+ url = urlManager.urlFor(((PullRequestCodeCommentStatusChanged)event).getChange());elseurl = urlManager.urlFor(request);@@ -186,7 +192,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerSet<User> assignees = new HashSet<>();if (event instanceof PullRequestOpened) {for (PullRequestReview review: request.getReviews()) {- if (review.getResult() == null)+ if (review.getStatus() == Status.PENDING)reviewers.add(review.getUser());}for (PullRequestAssignment assignment: request.getAssignments())@@ -194,35 +200,28 @@ public class PullRequestNotificationManager extends AbstractNotificationManager} else if (event instanceof PullRequestChanged) {PullRequestChanged changeEvent = (PullRequestChanged) event;PullRequestChangeData changeData = changeEvent.getChange().getData();- if (changeData instanceof PullRequestApproveData- || changeData instanceof PullRequestRequestedForChangesData- || changeData instanceof PullRequestDiscardData) {- if (request.getSubmitter() != null && !notifiedUsers.contains(request.getSubmitter())) {- String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),- WordUtils.capitalize(changeData.getActivity()), request.getTitle());- String threadingReferences = String.format("<%s-%s@onedev>",- changeData.getActivity().replace(' ', '-'), request.getUUID());- EmailAddress emailAddress = request.getSubmitter().getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),- getTextBody(event, summary, event.getTextBody(), url, replyable, null),- replyAddress, threadingReferences);- }- notifiedUsers.add(request.getSubmitter());+ if ((changeData instanceof PullRequestApproveData+ || changeData instanceof PullRequestRequestedForChangesData+ || changeData instanceof PullRequestDiscardData)+ && request.getSubmitter() != null && !notifiedUsers.contains(request.getSubmitter())) {+ String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),+ WordUtils.capitalize(changeData.getActivity()), request.getTitle());+ String threadingReferences = String.format("<%s-%s@onedev>",+ changeData.getActivity().replace(' ', '-'), request.getUUID());+ EmailAddress emailAddress = request.getSubmitter().getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified()) {+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),+ getTextBody(event, summary, event.getTextBody(), url, replyable, null),+ replyAddress, threadingReferences);}- } else if (changeData instanceof PullRequestAssigneeAddData) {- PullRequestAssigneeAddData assigneeAddData = (PullRequestAssigneeAddData) changeData;- User assignee = assigneeAddData.getUser();- if (assignee != null)- assignees.add(assignee);- } else if (changeData instanceof PullRequestReviewerAddData) {- PullRequestReviewerAddData reviewerAddData = (PullRequestReviewerAddData) changeData;- User reviewer = reviewerAddData.getUser();- if (reviewer != null)- reviewers.add(reviewer);+ notifiedUsers.add(request.getSubmitter());}+ } else if (event instanceof PullRequestAssigned) {+ assignees.add(((PullRequestAssigned) event).getAssignee());+ } else if (event instanceof PullRequestReviewRequested) {+ reviewers.add(((PullRequestReviewRequested) event).getReviewer());}for (User assignee: assignees) {@@ -251,14 +250,14 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerfor (User reviewer: reviewers) {pullRequestWatchManager.watch(request, reviewer, true);if (!notifiedUsers.contains(reviewer)) {- String subject = String.format("[Pull Request %s] (Review Invitation) %s",+ String subject = String.format("[Pull Request %s] (Review Request) %s",request.getFQN(), request.getTitle());String threadingReferences = String.format("<review-invitation-%s@onedev>", request.getUUID());String reviewInvitationSummary;if (user != null)- reviewInvitationSummary = user.getDisplayName() + " invited you to review";+ reviewInvitationSummary = user.getDisplayName() + " requested review from you";else- reviewInvitationSummary = "Invited you to review";+ reviewInvitationSummary = "Requested review from you";EmailAddress emailAddress = reviewer.getPrimaryEmailAddress();if (emailAddress != null && emailAddress.isVerified()) {@@ -311,10 +310,15 @@ public class PullRequestNotificationManager extends AbstractNotificationManager|| changeData instanceof PullRequestReopenData) {notifyWatchers = true;}- } else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestBuildEvent)) {+ } else if (!(event instanceof PullRequestMergePreviewCalculated+ || event instanceof PullRequestBuildEvent+ || event instanceof PullRequestReviewRequested+ || event instanceof PullRequestReviewerRemoved+ || event instanceof PullRequestAssigned+ || event instanceof PullRequestUnassigned)) {notifyWatchers = true;}-+if (notifyWatchers) {Collection<String> bccEmailAddresses = new HashSet<>();diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.javaindex 523b1a9bb2..b9c3662d16 100644--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java@@ -4,6 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.List;+import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;@@ -24,8 +25,6 @@ import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;import org.joda.time.DateTime;-import com.google.common.collect.Lists;-import io.onedev.commons.utils.ExplicitException;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -40,6 +39,7 @@ import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.User;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.rest.annotation.Api;@@ -110,7 +110,9 @@ public class PullRequestResource {PullRequest pullRequest = pullRequestManager.load(requestId);if (!SecurityUtils.canReadCode(pullRequest.getProject()))throw new UnauthorizedException();- return pullRequest.getReviews();+ return pullRequest.getReviews().stream()+ .filter(it-> it.getStatus() != Status.EXCLUDED)+ .collect(Collectors.toList());}@Api(order=500)@@ -247,9 +249,13 @@ public class PullRequestResource {update.setTargetHeadCommitHash(request.getTarget().getObjectName());request.getUpdates().add(update);- pullRequestManager.checkReviews(request, Lists.newArrayList());+ pullRequestManager.checkReviews(request, false);+for (Long reviewerId: data.getReviewerIds()) {User reviewer = userManager.load(reviewerId);+ if (reviewer.equals(request.getSubmitter()))+ throw new ExplicitException("Pull request submitter can not be reviewer");+if (request.getReview(reviewer) == null) {PullRequestReview review = new PullRequestReview();review.setRequest(request);diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.javaindex 63729da349..27ebb84165 100644--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestReviewResource.java@@ -4,20 +4,17 @@ import javax.inject.Inject;import javax.inject.Singleton;import javax.validation.constraints.NotNull;import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;import javax.ws.rs.GET;import javax.ws.rs.POST;import javax.ws.rs.Path;import javax.ws.rs.PathParam;import javax.ws.rs.Produces;import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;import org.apache.shiro.authz.UnauthorizedException;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;@@ -53,6 +50,9 @@ public class PullRequestReviewResource {|| !SecurityUtils.isAdministrator() && !review.getUser().equals(SecurityUtils.getUser())) {throw new UnauthorizedException();}++ if (review.getUser().equals(review.getRequest().getSubmitter()))+ throw new ExplicitException("Pull request submitter can not be reviewer");if (review.getRequest().isMerged())throw new ExplicitException("Pull request is merged");@@ -61,19 +61,4 @@ public class PullRequestReviewResource {return review.getId();}- @Api(order=300)- @Path("/{reviewId}")- @DELETE- public Response delete(@PathParam("reviewId") Long reviewId) {- PullRequestReview review = reviewManager.load(reviewId);- PullRequest request = review.getRequest();-- if (!SecurityUtils.canReadCode(request.getProject()) || !SecurityUtils.canModify(request))- throw new UnauthorizedException();-- reviewManager.delete(review);-- return Response.ok().build();- }-}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.javaindex 7979b28b1f..325f5e4263 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java@@ -10,8 +10,8 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;@@ -29,17 +29,17 @@ public class ApprovedByCriteria extends Criteria<PullRequest> {public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);+ Path<?> statusPath = EntityQuery.getPath(join, PullRequestReview.PROP_STATUS);join.on(builder.and(builder.equal(userPath, user),- builder.equal(approvedPath, true)));+ builder.equal(statusPath, Status.APPROVED)));return join.isNotNull();}@Overridepublic boolean matches(PullRequest request) {PullRequestReview review = request.getReview(user);- return review != null && review.getResult() != null && Boolean.TRUE.equals(review.getResult().getApproved());+ return review != null && review.getStatus() == Status.APPROVED;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex e61a3c0b37..8084a55b2d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;@@ -25,10 +25,10 @@ public class ApprovedByMeCriteria extends Criteria<PullRequest> {if (User.get() != null) {Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);+ Path<?> statusPath = EntityQuery.getPath(join, PullRequestReview.PROP_STATUS);join.on(builder.and(builder.equal(userPath, User.get()),- builder.equal(approvedPath, true)));+ builder.equal(statusPath, Status.APPROVED)));return join.isNotNull();} else {throw new ExplicitException("Please login to perform this query");@@ -39,7 +39,7 @@ public class ApprovedByMeCriteria extends Criteria<PullRequest> {public boolean matches(PullRequest request) {if (User.get() != null) {PullRequestReview review = request.getReview(User.get());- return review != null && review.getResult() != null && Boolean.TRUE.equals(review.getResult().getApproved());+ return review != null && review.getStatus() == Status.APPROVED;} else {throw new ExplicitException("Please login to perform this query");}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.javaindex bbcce1924f..d5f54b5e50 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.support.pullrequest.ReviewResult;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;@@ -21,15 +21,15 @@ public class HasPendingReviewsCriteria extends Criteria<PullRequest> {@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);- join.on(builder.isNull(approvedPath));+ Path<?> statusPath = EntityQuery.getPath(join, PullRequestReview.PROP_STATUS);+ join.on(builder.equal(statusPath, Status.PENDING));return join.isNotNull();}@Overridepublic boolean matches(PullRequest request) {for (PullRequestReview review: request.getReviews()) {- if (review.getResult() == null)+ if (review.getStatus() == Status.PENDING)return true;}return false;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javaindex 9a5cbb99cb..83148cbd22 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java@@ -10,8 +10,8 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;@@ -29,17 +29,17 @@ public class RequestedForChangesByCriteria extends Criteria<PullRequest> {public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);+ Path<?> statusPath = EntityQuery.getPath(join, PullRequestReview.PROP_STATUS);join.on(builder.and(builder.equal(userPath, user),- builder.equal(approvedPath, false)));+ builder.equal(statusPath, Status.REQUESTED_FOR_CHANGES)));return join.isNotNull();}@Overridepublic boolean matches(PullRequest request) {PullRequestReview review = request.getReview(this.user);- return review != null && review.getResult() != null && Boolean.FALSE.equals(review.getResult().getApproved());+ return review != null && review.getStatus() == Status.REQUESTED_FOR_CHANGES;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex 9da947386f..c7cb0a9b9f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;@@ -25,10 +25,10 @@ public class RequestedForChangesByMeCriteria extends Criteria<PullRequest> {if (User.get() != null) {Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);+ Path<?> statusPath = EntityQuery.getPath(join, PullRequestReview.PROP_STATUS);join.on(builder.and(builder.equal(userPath, User.get()),- builder.equal(approvedPath, false)));+ builder.equal(statusPath, Status.REQUESTED_FOR_CHANGES)));return join.isNotNull();} else {throw new ExplicitException("Please login to perform this query");@@ -39,7 +39,7 @@ public class RequestedForChangesByMeCriteria extends Criteria<PullRequest> {public boolean matches(PullRequest request) {if (User.get() != null) {PullRequestReview review = request.getReview(User.get());- return review != null && review.getResult() != null && Boolean.FALSE.equals(review.getResult().getApproved());+ return review != null && review.getStatus() == Status.REQUESTED_FOR_CHANGES;} else {throw new ExplicitException("Please login to perform this query");}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.javaindex 1cfcd119d0..eab8495349 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.support.pullrequest.ReviewResult;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;@@ -21,18 +21,15 @@ public class SomeoneRequestedForChangesCriteria extends Criteria<PullRequest> {@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);- Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);- join.on(builder.and(- builder.isNotNull(userPath),- builder.equal(approvedPath, false)));+ Path<?> statusPath = EntityQuery.getPath(join, PullRequestReview.PROP_STATUS);+ join.on(builder.equal(statusPath, Status.REQUESTED_FOR_CHANGES));return join.isNotNull();}@Overridepublic boolean matches(PullRequest request) {for (PullRequestReview review: request.getReviews()) {- if (review.getResult() != null && Boolean.FALSE.equals(review.getResult().getApproved()))+ if (review.getStatus() == Status.REQUESTED_FOR_CHANGES)return true;}return false;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.javaindex e7feab0e22..6af3dcf786 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java@@ -10,8 +10,8 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;@@ -29,17 +29,17 @@ public class ToBeReviewedByCriteria extends Criteria<PullRequest> {public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);+ Path<?> statusPath = EntityQuery.getPath(join, PullRequestReview.PROP_STATUS);join.on(builder.and(builder.equal(userPath, user),- builder.isNull(approvedPath)));+ builder.equal(statusPath, Status.PENDING)));return join.isNotNull();}@Overridepublic boolean matches(PullRequest request) {PullRequestReview review = request.getReview(user);- return review != null && (review.getResult() == null || review.getResult().getApproved() == null);+ return review != null && review.getStatus() == Status.PENDING;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex 54306a6222..f9577f85e5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;@@ -25,10 +25,10 @@ public class ToBeReviewedByMeCriteria extends Criteria<PullRequest> {if (User.get() != null) {Join<?, ?> join = from.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);+ Path<?> statusPath = EntityQuery.getPath(join, PullRequestReview.PROP_STATUS);join.on(builder.and(builder.equal(userPath, User.get()),- builder.isNull(approvedPath)));+ builder.equal(statusPath, Status.PENDING)));return join.isNotNull();} else {throw new ExplicitException("Please login to perform this query");@@ -39,7 +39,7 @@ public class ToBeReviewedByMeCriteria extends Criteria<PullRequest> {public boolean matches(PullRequest request) {if (User.get() != null) {PullRequestReview review = request.getReview(User.get());- return review != null && (review.getResult() == null || review.getResult().getApproved() == null);+ return review != null && review.getStatus() == Status.PENDING;} else {throw new ExplicitException("Please login to perform this query");}diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.javaindex de05ba78da..c185123677 100644--- a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java@@ -73,12 +73,13 @@ public class DefaultUrlManager implements UrlManager {Project project = comment.getProject();PullRequest request = compareContext.getPullRequest();PageParametersEncoder paramsEncoder = new PageParametersEncoder();- if (request != null) {- PageParameters params = new PageParameters();- PullRequestChangesPage.fillParams(params, PullRequestChangesPage.getState(comment, compareContext));- return urlFor(request) + "/changes" + paramsEncoder.encodePageParameters(params);- } else {- if (!compareContext.getOldCommitHash().equals(compareContext.getNewCommitHash())) {++ if (!compareContext.getOldCommitHash().equals(compareContext.getNewCommitHash())) {+ if (request != null) {+ PageParameters params = new PageParameters();+ PullRequestChangesPage.fillParams(params, PullRequestChangesPage.getState(comment, compareContext));+ return urlFor(request) + "/changes" + paramsEncoder.encodePageParameters(params);+ } else {RevCommit oldCommit;if (compareContext.getOldCommitHash().equals(ObjectId.zeroId().name()))oldCommit = null;@@ -102,24 +103,26 @@ public class DefaultUrlManager implements UrlManager {RevisionComparePage.fillParams(params, RevisionComparePage.getState(comment, compareContext));return url + "/compare" + paramsEncoder.encodePageParameters(params);}- } else {- String url = urlFor(comment.getProject());- PageParameters params = new PageParameters();- ProjectBlobPage.State state = ProjectBlobPage.getState(comment);-- // encode path param separately, otherwise it will be encoded as query param- state.blobIdent.path = null;- state.blobIdent.revision = null;- params.set(0, comment.getMark().getCommitHash());- List<String> pathSegments = Splitter.on("/").splitToList(comment.getMark().getPath());- for (int i=0; i<pathSegments.size(); i++)- params.set(i+1, pathSegments.get(i));-- ProjectBlobPage.fillParams(params, state);-- return url + "/files/" + paramsEncoder.encodePageParameters(params);}- }+ } else {+ String url = urlFor(comment.getProject());+ PageParameters params = new PageParameters();+ ProjectBlobPage.State state = ProjectBlobPage.getState(comment);++ // encode path param separately, otherwise it will be encoded as query param+ state.blobIdent.path = null;+ state.blobIdent.revision = null;+ if (request != null)+ state.requestId = request.getId();+ params.set(0, comment.getMark().getCommitHash());+ List<String> pathSegments = Splitter.on("/").splitToList(comment.getMark().getPath());+ for (int i=0; i<pathSegments.size(); i++)+ params.set(i+1, pathSegments.get(i));++ ProjectBlobPage.fillParams(params, state);++ return url + "/files/" + paramsEncoder.encodePageParameters(params);+ }}private static boolean isParent(RevCommit parent, RevCommit child) {diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow4.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow4.svgnew file mode 100644index 0000000000..71a21ea372--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow4.svg@@ -0,0 +1,2 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1655027599544" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3413" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }+</style></defs><path d="M232 392L512 672l280-280z" p-id="3414"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/diff-o.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/diff-o.svgnew file mode 100644index 0000000000..142705c5db--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/diff-o.svg@@ -0,0 +1,2 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1655214831984" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2100" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }+</style></defs><path d="M903.085714 277.257143L625.485714 10.171429c-6.857143-6.514286-15.885714-10.171429-25.371428-10.171429H265.142857c-5.028571 0-9.142857 4.114286-9.142857 9.142857v64c0 5.028571 4.114286 9.142857 9.142857 9.142857h316.571429l250.285714 240.685715V868.571429c0 5.028571 4.114286 9.142857 9.142857 9.142857h64c5.028571 0 9.142857-4.114286 9.142857-9.142857V303.542857c0-9.942857-4-19.428571-11.2-26.285714zM559.314286 157.028571c-6.857143-6.857143-16.114286-10.742857-25.828572-10.742857H146.285714c-20.228571 0-36.571429 16.342857-36.571428 36.571429v804.571428c0 20.228571 16.342857 36.571429 36.571428 36.571429h585.142857c20.228571 0 36.571429-16.342857 36.571429-36.571429V380.914286c0-9.714286-3.885714-18.971429-10.742857-25.828572L559.314286 157.028571zM576 787.428571c0 4.342857-3.885714 8-8.571429 8h-257.142857c-4.685714 0-8.571429-3.657143-8.571428-8v-48c0-4.342857 3.885714-8 8.571428-8h257.142857c4.685714 0 8.571429 3.657143 8.571429 8v48z m0-251.428571c0 4.342857-3.885714 8-8.571429 8H470.857143v97.028571c0 4.457143-3.542857 8.114286-8 8.114286h-48c-4.342857 0-8-3.657143-8-8.114286V544h-96.571429c-4.685714 0-8.571429-3.657143-8.571428-8v-48c0-4.457143 3.885714-8 8.571428-8H406.857143v-97.028571c0-4.457143 3.657143-8.114286 8-8.114286h48c4.457143 0 8 3.657143 8 8.114286V480h96.571428c4.685714 0 8.571429 3.542857 8.571429 8v48z" p-id="2101"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/refresh.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/refresh.svgnew file mode 100644index 0000000000..00e23ddddd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/refresh.svg@@ -0,0 +1,2 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1655004918309" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10299" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }+</style></defs><path d="M710.4 249.6l76.8-76.8c2.133333-2.133333 4.266667-4.266667 6.4-2.133333 2.133333 0 2.133333 4.266667 2.133333 6.4v204.8c0 4.266667-2.133333 8.533333-4.266666 10.666666s-6.4 4.266667-10.666667 4.266667h-204.8c-4.266667 0-6.4 0-6.4-2.133333s0-4.266667 2.133333-6.4l76.8-76.8c-42.666667-27.733333-87.466667-42.666667-136.533333-42.666667-44.8 0-85.333333 10.666667-121.6 32s-66.133333 51.2-87.466667 87.466667-32 78.933333-32 121.6h-85.333333c0-44.8 8.533333-87.466667 25.6-128 17.066667-40.533333 40.533333-74.666667 70.4-104.533334s64-53.333333 104.533333-70.4c40.533333-17.066667 83.2-25.6 128-25.6 70.4 2.133333 136.533333 25.6 196.266667 68.266667z m44.8 262.4h85.333333c0 44.8-8.533333 87.466667-25.6 128-17.066667 40.533333-40.533333 74.666667-70.4 104.533333-29.866667 29.866667-64 53.333333-104.533333 70.4-40.533333 17.066667-83.2 25.6-128 25.6-72.533333 0-138.666667-21.333333-198.4-66.133333l-76.8 76.8c-2.133333 2.133333-4.266667 4.266667-6.4 2.133333-2.133333 0-2.133333-4.266667-2.133333-6.4V642.133333c0-4.266667 2.133333-8.533333 4.266666-10.666666 2.133333-2.133333 6.4-4.266667 10.666667-4.266667h204.8c4.266667 0 6.4 0 6.4 2.133333s0 4.266667-2.133333 6.4l-74.666667 74.666667c42.666667 29.866667 87.466667 42.666667 136.533333 42.666667 44.8 0 85.333333-10.666667 121.6-32 38.4-21.333333 66.133333-51.2 87.466667-87.466667s32-76.8 32-121.6z" p-id="10300"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.javaindex a7845e6721..965b99035f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java@@ -55,7 +55,7 @@ public abstract class BranchPicker extends DropdownLink {+ "<span class='branch-picker'>"+ " <svg class='icon'><use xlink:href='%s'/></svg>"+ " <span>%s</span> "- + " <svg class='icon rotate-90'><use xlink:href='%s'/></svg>"+ + " <svg class='rotate-90 icon'><use xlink:href='%s'/></svg>"+ "</span>",SpriteImage.getVersionedHref(IconScope.class, "branch"),branch!=null?HtmlEscape.escapeHtml5(branch):"<i>choose</i>",diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex af418deb45..ec4c6fe374 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -75,13 +75,13 @@ import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;+import io.onedev.server.web.component.svg.SpriteImage;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.codecomments.InvalidCodeCommentPage;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.TextUtils;@SuppressWarnings("serial")public abstract class CodeCommentListPanel extends Panel {@@ -773,11 +773,22 @@ public abstract class CodeCommentListPanel extends Panel {});- columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Resolved")) {+ columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Status")) {@Overridepublic void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {- cellItem.add(new Label(componentId, TextUtils.describe(rowModel.getObject().isResolved())));+ CodeComment comment = rowModel.getObject();+ String label;+ if (comment.isResolved()) {+ label = String.format(+ "<svg class='icon text-success mr-1'><use xlink:href='%s'/></svg> %s",+ SpriteImage.getVersionedHref("tick-circle-o"), "Resolved");+ } else {+ label = String.format(+ "<svg class='icon text-warning mr-1'><use xlink:href='%s'/></svg> %s",+ SpriteImage.getVersionedHref("dot"), "Unresolved");+ }+ cellItem.add(new Label(componentId, label).setEscapeModelStrings(false));}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex c90049fa94..8c60f72a3d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -5,7 +5,6 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Date;import java.util.List;-import java.util.Set;import javax.annotation.Nullable;@@ -48,7 +47,6 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.security.SecurityUtils;@@ -87,7 +85,7 @@ public abstract class CodeCommentPanel extends Panel {this.commentId = commentId;}- protected CodeComment getComment() {+ public CodeComment getComment() {return OneDev.getInstance(CodeCommentManager.class).load(commentId);}@@ -415,10 +413,7 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic Collection<String> getObservables() {- Set<String> observables = Sets.newHashSet(CodeComment.getWebSocketObservable(commentId));- if (getPullRequest() != null)- observables.add(PullRequest.getWebSocketObservable(getPullRequest().getId()));- return observables;+ return Sets.newHashSet(CodeComment.getWebSocketObservable(commentId));}});@@ -561,9 +556,6 @@ public abstract class CodeCommentPanel extends Panel {target.appendJavaScript(script);}- @Nullable- protected abstract PullRequest getPullRequest();-protected abstract void onDeleteComment(AjaxRequestTarget target, CodeComment comment);protected abstract void onSaveComment(AjaxRequestTarget target, CodeComment comment);@@ -604,8 +596,8 @@ public abstract class CodeCommentPanel extends Panel {fragment.add(new Label("action", "unresolved"));fragment.add(new Label("date", DateUtils.formatAge(getComment().getCreateDate())).add(new AttributeAppender("title", DateUtils.formatDateTime(getComment().getCreateDate()))));- if (isContextDifferent(getComment().getCompareContext())) {- String url = OneDev.getInstance(UrlManager.class).urlFor(getComment());+ if (isContextDifferent(getChange().getCompareContext())) {+ String url = OneDev.getInstance(UrlManager.class).urlFor(getChange());fragment.add(new ExternalLink("context", UrlUtils.makeRelative(url)) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.htmlindex 3493d6e5fa..dd5bb05bc3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html@@ -51,9 +51,7 @@<div wicket:id="head" class="head d-flex align-items-center px-3 py-2 border-bottom"><h6 class="mb-0 mr-2">Code Comment</h6><span wicket:id="outdated" class="mr-2 badge badge-sm badge-warning">outdated</span>- <span wicket:id="resolved" class="mr-2 text-success" title="Resolved">- <wicket:svg href="tick-circle-o" class="icon"></wicket:svg>- </span>+ <span wicket:id="status" class="mr-2"></span><a wicket:id="locate" title="Show commented code snippet" class="btn btn-xs btn-icon btn-hover-primary btn-light locate ml-2 mr-3"><wicket:svg href="hand" class="icon"></wicket:svg></a><a wicket:id="close" class="ml-auto" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex f32f24bd36..9944476879 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -94,6 +94,7 @@ import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.util.DiffPlanarRange;import io.onedev.server.web.util.ProjectAttachmentSupport;@@ -958,11 +959,6 @@ public abstract class RevisionDiffPanel extends Panel {target.add(commentContainer.get("head"));}- @Override- protected PullRequest getPullRequest() {- return RevisionDiffPanel.this.getPullRequest();- }-@Overrideprotected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {reply.setCompareContext(getCompareContext());@@ -1172,11 +1168,6 @@ public abstract class RevisionDiffPanel extends Panel {target.add(commentContainer.get("head"));}- @Override- protected PullRequest getPullRequest() {- return RevisionDiffPanel.this.getPullRequest();- }-@Overrideprotected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {reply.setCompareContext(getCompareContext());@@ -1291,12 +1282,39 @@ public abstract class RevisionDiffPanel extends Panel {});- head.add(new WebMarkupContainer("resolved") {+ head.add(new Label("status", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (annotationSupport.getOpenComment().isResolved()) {+ return String.format(+ "<svg class='icon text-success mr-1'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref("tick-circle-o"));+ } else {+ return String.format(+ "<svg class='icon text-warning mr-1'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref("dot"));+ }+ }++ }) {@Overrideprotected void onInitialize() {super.onInitialize();+ add(AttributeAppender.replace("title", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (annotationSupport.getOpenComment().isResolved())+ return "Resolved";+ else+ return "Unresolved";+ }++ }));+add(new WebSocketObserver() {@Override@@ -1313,17 +1331,16 @@ public abstract class RevisionDiffPanel extends Panel {}});+ setEscapeModelStrings(false);}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(annotationSupport != null- && annotationSupport.getOpenComment() != null- && annotationSupport.getOpenComment().isResolved());+ setVisible(annotationSupport != null && annotationSupport.getOpenComment() != null);}- }.setOutputMarkupPlaceholderTag(true));+ }.setOutputMarkupId(true));head.add(new AjaxLink<Void>("locate") {@@ -1398,11 +1415,6 @@ public abstract class RevisionDiffPanel extends Panel {target.add(commentContainer.get("head"));}- @Override- protected PullRequest getPullRequest() {- return RevisionDiffPanel.this.getPullRequest();- }-@Overrideprotected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {reply.setCompareContext(getCompareContext());diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.htmlindex e46143ef99..1403d410c4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.html@@ -1,8 +1,8 @@<wicket:panel><ul class="assignments list-unstyled mb-0"><li wicket:id="assignments" class="d-flex align-items-center flex-nowrap">- <a wicket:id="user" class="mr-3"></a>- <a wicket:id="delete" class="delete btn btn-icon btn-xs btn-light btn-hover-danger flex-shrink-0" title="Remove this assignee"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ <a wicket:id="user" class="mr-2 left flex-shrink-0"></a>+ <a wicket:id="delete" class="right delete btn btn-icon btn-xs btn-light btn-hover-danger flex-shrink-0" title="Remove this assignee"><wicket:svg href="trash" class="icon"></wicket:svg></a></li><wicket:enclosure><li class="add-assignee">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 d7dc655041..763cc259b8 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@@ -55,6 +55,7 @@ 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.PullRequestReview.Status;import io.onedev.server.model.support.LastUpdate;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;@@ -753,14 +754,16 @@ public abstract class PullRequestListPanel extends Panel {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);- }-- });+ if (review.getStatus() != Status.EXCLUDED) {+ reviewsView.add(new ReviewerAvatar(reviewsView.newChildId()) {++ @Override+ protected PullRequestReview getReview() {+ return OneDev.getInstance(PullRequestReviewManager.class).load(reviewId);+ }++ });+ }}fragment.add(reviewsView);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 001f29fcdf..a0cdb274f7 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@@ -1,9 +1,12 @@<wicket:panel><ul class="reviews list-unstyled mb-0"><li wicket:id="reviews" class="d-flex flex-nowrap align-items-center">- <span wicket:id="status" class="status mr-2"></span>- <a wicket:id="user" class="user mr-3"></a>- <a wicket:id="delete" class="delete btn btn-xs btn-icon btn-light btn-hover-danger flex-shrink-0" title="Remove this reviewer"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ <a wicket:id="user" class="reviewer left mr-2 flex-shrink-0"></a>+ <span class="flex-shrink-0 right d-flex align-items-center">+ <a wicket:id="refresh" class="refresh btn btn-xs btn-icon btn-light btn-hover-primary flex-shrink-0 mr-2" title="Request review"><wicket:svg href="refresh" class="icon"></wicket:svg></a>+ <a wicket:id="delete" class="delete btn btn-xs btn-icon btn-light btn-hover-danger flex-shrink-0 mr-2" title="Remove this reviewer"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ <span wicket:id="status" class="status flex-shrink-0"></span>+ </span></li><wicket:enclosure child="addReviewer"><li class="add-reviewer">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 c2f742e341..37f867ebe7 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,6 +2,7 @@ package io.onedev.server.web.component.pullrequest.review;import java.util.Collection;import java.util.List;+import java.util.stream.Collectors;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -18,12 +19,12 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.google.common.collect.Sets;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.exception.ReviewerRequiredException;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.WebSocketObserver;@@ -42,7 +43,9 @@ public abstract class ReviewListPanel extends Panel {@Overrideprotected List<PullRequestReview> load() {- return getPullRequest().getSortedReviews();+ return getPullRequest().getSortedReviews().stream()+ .filter(it-> it.getStatus() != Status.EXCLUDED)+ .collect(Collectors.toList());}};@@ -77,14 +80,48 @@ public abstract class ReviewListPanel extends Panel {PullRequest request = getPullRequest();- item.add(new ReviewStatusIcon("status") {+ item.add(new ReviewStatusIcon("status", false) {@Override- protected ReviewResult getResult() {- return item.getModelObject().getResult();+ protected Status getStatus() {+ return item.getModelObject().getStatus();}}.setVisible(!request.isNew()));++ item.add(new AjaxLink<Void>("refresh") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);++ PullRequestReview review = item.getModelObject();+ if (!review.getUser().equals(SecurityUtils.getUser())) {+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to "+ + "request another review from '" + review.getUser().getDisplayName() + "'?"));+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ PullRequestReview review = item.getModelObject();+ review.setStatus(Status.PENDING);+ OneDev.getInstance(PullRequestReviewManager.class).save(review);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequestReview review = item.getModelObject();+ User currentUser = SecurityUtils.getUser();+ setVisible(!request.isNew()+ && !request.isMerged()+ && review.getStatus() != PullRequestReview.Status.PENDING+ && (SecurityUtils.canModify(getPullRequest()) || review.getUser().equals(currentUser)));+ }++ });item.add(new AjaxLink<Void>("delete") {@@ -101,15 +138,31 @@ public abstract class ReviewListPanel extends Panel {public void onClick(AjaxRequestTarget target) {PullRequest request = getPullRequest();PullRequestReview review = item.getModelObject();-- try {- OneDev.getInstance(PullRequestReviewManager.class).delete(review);- if (request.isNew())- target.add(ReviewListPanel.this);- } catch (ReviewerRequiredException e) {- getSession().warn("Reviewer '" + review.getUser().getDisplayName()+ review.setStatus(Status.EXCLUDED);+ OneDev.getInstance(PullRequestManager.class).checkReviews(request, false);+ User reviewer = review.getUser();+ boolean reviewerRequired = false;+ if (request.isNew()) {+ if (request.getReview(reviewer).getStatus() != Status.EXCLUDED)+ reviewerRequired = true;+ } else if (request.getReview(reviewer).getStatus() == Status.EXCLUDED) {+ PullRequestReviewManager reviewManager =+ OneDev.getInstance(PullRequestReviewManager.class);+ reviewManager.save(review);+ for (PullRequestReview eachReview: request.getReviews()) {+ if (eachReview.isNew())+ reviewManager.save(eachReview);+ }+ } else {+ reviewerRequired = true;+ }+ if (reviewerRequired) {+ getSession().warn("Reviewer '" + reviewer.getDisplayName()+ "' is required and can not be removed");+ } else if (request.isNew()) {+ target.add(ReviewListPanel.this);}+reviewsModel.detach();}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.javaindex 88d1b9feeb..56ee1dbaf4 100644--- 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.java@@ -8,29 +8,32 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebComponent;import org.apache.wicket.model.LoadableDetachableModel;-import io.onedev.server.model.support.pullrequest.ReviewResult;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.component.svg.SpriteImage;@SuppressWarnings("serial")public abstract class ReviewStatusIcon extends WebComponent {- public ReviewStatusIcon(String id) {+ private final boolean opposite;++ public ReviewStatusIcon(String id, boolean opposite) {super(id);+ this.opposite = opposite;}@Overridepublic void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) {String icon;String cssClass = "icon review-status review-status-";- if (getResult() == null || getResult().getApproved() == null) {- icon = "clock-o";+ if (getStatus() == Status.PENDING) {+ icon = opposite?"clock-o":"clock";cssClass += "pending";- } else if (getResult().getApproved() == true) {- icon = "tick-circle-o";+ } else if (getStatus() == Status.APPROVED) {+ icon = opposite?"tick-circle-o":"tick-circle";cssClass += "approved";} else {- icon = "times-circle-o";+ icon = opposite?"diff-o":"diff";cssClass += "request-for-changes";}@@ -48,16 +51,16 @@ public abstract class ReviewStatusIcon extends WebComponent {@Overrideprotected String load() {- String title;- if (getResult() != null && getResult().getApproved() != null) {- if (getResult().getApproved() == true)- title = "Approved";- else- title = "Request for changes";- } else {- title = "Pending review";+ switch (getStatus()) {+ case PENDING:+ return "Pending review";+ case APPROVED:+ return "Approved";+ case REQUESTED_FOR_CHANGES:+ return "Requested for changes";+ default:+ throw new IllegalStateException("Unexpected review status: " + getStatus());}- return title;}}));@@ -70,6 +73,6 @@ public abstract class ReviewStatusIcon extends WebComponent {response.render(CssHeaderItem.forReference(new ReviewCssResourceReference()));}- protected abstract ReviewResult getResult();+ protected abstract Status getStatus();}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.javaindex 6d55392818..e172d00aec 100644--- 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.java@@ -5,7 +5,7 @@ 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.model.PullRequestReview.Status;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;@@ -21,11 +21,11 @@ public abstract class ReviewerAvatar extends Panel {super.onInitialize();add(new UserIdentPanel("avatar", getReview().getUser(), Mode.AVATAR));- add(new ReviewStatusIcon("status") {+ add(new ReviewStatusIcon("status", true) {@Override- protected ReviewResult getResult() {- return getReview().getResult();+ protected Status getStatus() {+ return getReview().getStatus();}});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 a886e1427a..b10fb79b0f 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@@ -8,6 +8,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.User;import io.onedev.server.web.component.select2.SelectToAddChoice;import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;@@ -49,9 +50,14 @@ public abstract class ReviewerChoice extends SelectToAddChoice<User> {@Overrideprotected void onSelect(AjaxRequestTarget target, User user) {- PullRequestReview review = new PullRequestReview();- review.setRequest(getPullRequest());- review.setUser(user);+ PullRequestReview review = getPullRequest().getReview(user);+ if (review == null) {+ review = new PullRequestReview();+ review.setRequest(getPullRequest());+ review.setUser(user);+ } else {+ review.setStatus(Status.PENDING);+ }if (!getPullRequest().isNew())OneDev.getInstance(PullRequestReviewManager.class).save(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 b0564f2dfe..5977a34c99 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@@ -3,11 +3,11 @@ package io.onedev.server.web.component.pullrequest.review;import static io.onedev.server.util.match.MatchScoreUtils.filterAndSort;import java.util.List;-import java.util.stream.Collectors;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.web.WebConstants;@@ -24,7 +24,11 @@ public abstract class ReviewerProvider extends AbstractUserChoiceProvider {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()));+ for (PullRequestReview review: request.getReviews()) {+ if (review.getStatus() != PullRequestReview.Status.EXCLUDED)+ reviewers.remove(review.getUser());+ }+ reviewers.remove(request.getSubmitter());new ResponseFiller<User>(response).fill(filterAndSort(reviewers, new MatchScoreProvider<User>() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.cssindex 81c4d36210..b91c62affb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css@@ -18,7 +18,7 @@fill: var(--success);}.review-status-request-for-changes.icon {- fill: var(--danger);+ fill: var(--warning);}.review-status-pending.icon {fill: var(--warning);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.htmlindex a45e82d8ae..da769625d5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/membership/GroupMembershipsPage.html@@ -8,7 +8,7 @@<input wicket:id="addNew" type="hidden" class="form-control"></div><div class="mb-4">- <a wicket:id="delete" class="btn btn-light-danger">Delete <wicket:svg href="arrow" class="rotate-90 icon"/></a>+ <a wicket:id="delete" class="btn btn-light-danger">Delete <wicket:svg href="arrow4" class="icon"/></a></div></div><table wicket:id="memberships" class="memberships table"></table>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.htmlindex 302fc4403e..4ae420c1fc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/membership/UserMembershipsPage.html@@ -7,7 +7,7 @@<input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name..."></div><input wicket:id="addNew" type="hidden" class="form-control mr-3 mb-4">- <a wicket:id="delete" class="btn btn-light-danger mb-4">Delete <wicket:svg href="arrow" class="rotate-90 icon"/></a>+ <a wicket:id="delete" class="btn btn-light-danger mb-4">Delete <wicket:svg href="arrow4" class="icon"/></a></div></div><table wicket:id="memberships" class="memberships table"></table>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 99e920cc81..3d455fd30a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -374,14 +374,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,return null;}- @Override- public PullRequest getPullRequest() {- if (state.requestId != null)- return OneDev.getInstance(PullRequestManager.class).load(state.requestId);- else- return null;- }-private void newBlobNavigator(@Nullable AjaxRequestTarget target) {Component blobNavigator = new BlobNavigator(BLOB_NAVIGATOR_ID, this);if (target != null) {@@ -1419,9 +1411,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,* Update pull request as this is a direct consequence of editing source branch. Also this* is necessary to show the latest changes of the pull request after editing*/- PullRequest request = getPullRequest();- if (request != null)+ if (state.requestId != null) {+ PullRequest request = OneDev.getInstance(PullRequestManager.class).load(state.requestId);OneDev.getInstance(PullRequestUpdateManager.class).checkUpdate(request);+ }OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {@@ -1664,7 +1657,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,@Overridepublic JobSecretAuthorizationContext getJobSecretAuthorizationContext() {- return new JobSecretAuthorizationContext(getProject(), getCommit(), getPullRequest());+ return new JobSecretAuthorizationContext(getProject(), getCommit(), null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex 42b180f8e5..df80cd6abf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -14,7 +14,6 @@ import io.onedev.server.event.RefUpdated;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.web.util.FileUpload;@@ -29,9 +28,6 @@ public interface BlobRenderContext extends Serializable {Project getProject();- @Nullable- PullRequest getPullRequest();-BlobIdent getBlobIdent();@Nullablediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex bde0889a37..6a2a0c8847 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -248,7 +248,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {@Overrideprotected PullRequest getPullRequest() {- return context.getPullRequest();+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.htmlindex d8ab99c2fd..3e22753e40 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html@@ -5,9 +5,7 @@<div wicket:id="head" class="head d-flex align-items-center px-3 py-2 flex-shrink-0 border-bottom"><h6 class="mr-2 mb-0">Code Comment</h6><span wicket:id="outdated" class="badge badge-sm badge-warning mr-2">outdated</span>- <span wicket:id="resolved" class="mr-2 text-success" title="Resolved">- <wicket:svg href="tick-circle-o" class="icon"></wicket:svg>- </span>+ <span wicket:id="status" class="mr-2"></span><a wicket:id="locate" class="locate btn btn-light btn-icon btn-xs btn-hover-primary ml-2 mr-3" title="Show commented code snippet"><wicket:svg href="hand" class="icon"></wicket:svg></a><a wicket:id="close" class="ml-auto text-muted text-hover-primary" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex 9551ea9942..f6016f6909 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -34,10 +34,12 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -82,7 +84,6 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;@@ -108,6 +109,7 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.component.sourceformat.OptionChangeCallback;import io.onedev.server.web.component.sourceformat.SourceFormatPanel;+import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;@@ -354,12 +356,36 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}.setOutputMarkupId(true));- head.add(new WebMarkupContainer("resolved") {+ head.add(new Label("status", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (context.getOpenComment().isResolved()) {+ return String.format(+ "<svg class='icon text-success mr-1'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref("tick-circle-o"));+ } else {+ return String.format(+ "<svg class='icon text-warning mr-1'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref("dot"));+ }+ }++ }) {@Overrideprotected void onInitialize() {super.onInitialize();+ add(AttributeAppender.replace("title", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return context.getOpenComment().isResolved()? "Resolved": "Unresolved";+ }++ }));+add(new WebSocketObserver() {@Override@@ -376,15 +402,17 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}});++ setEscapeModelStrings(false);}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(context.getOpenComment() != null && context.getOpenComment().isResolved());+ setVisible(context.getOpenComment() != null);}- }.setOutputMarkupPlaceholderTag(true));+ }.setOutputMarkupId(true));head.add(new AjaxLink<Void>("close") {@@ -417,11 +445,6 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Seartarget.add(commentContainer.get("head"));}- @Override- protected PullRequest getPullRequest() {- return context.getPullRequest();- }-@Overrideprotected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {SourceViewPanel.this.onSaveCommentReply(reply);@@ -562,11 +585,6 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Seartarget.add(commentContainer.get("head"));}- @Override- protected PullRequest getPullRequest() {- return context.getPullRequest();- }-@Overrideprotected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {SourceViewPanel.this.onSaveCommentReply(reply);@@ -619,11 +637,6 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Seartarget.add(commentContainer.get("head"));}- @Override- protected PullRequest getPullRequest() {- return context.getPullRequest();- }-@Overrideprotected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {SourceViewPanel.this.onSaveCommentReply(reply);@@ -826,7 +839,6 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprivate CompareContext getCompareContext() {CompareContext compareContext = new CompareContext();- compareContext.setPullRequest(context.getPullRequest());compareContext.setOldCommitHash(context.getCommit().name());compareContext.setNewCommitHash(context.getCommit().name());if (context.getBlobIdent().path != null)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 3786da9468..7f827430fd 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@@ -250,7 +250,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Annoupdate.setHeadCommitHash(source.getObjectName());update.setTargetHeadCommitHash(request.getTarget().getObjectName());- OneDev.getInstance(PullRequestManager.class).checkReviews(request, Lists.newArrayList());+ OneDev.getInstance(PullRequestManager.class).checkReviews(request, false);if (SecurityUtils.canWriteCode(target.getProject())) {PullRequestAssignment assignment = new PullRequestAssignment();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 9709660383..d7ebba1434 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@@ -62,8 +62,8 @@<div wicket:id="noValidCommitSignature" class="no-valid-commit-signature text-danger"><wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as valid signature is required for head commit</div>- <div wicket:id="requestedForChanges" class="requested-for-changes text-danger">- <wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a>+ <div wicket:id="requestedForChanges" class="requested-for-changes text-warning">+ <wicket:svg href="diff" class="icon"></wicket:svg> Pull request can not be merged now as it was <a class="more-info d-inline link-primary">requested for changes</a></div><div wicket:id="waitingForReviews" class="waiting-for-reviews text-warning"><wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline link-primary">pending review</a>@@ -88,14 +88,13 @@</div></div><div wicket:id="requestOperations" class="operations">- <a wicket:id="merge" class="btn btn-sm btn-light-success">Merge</a>- <a wicket:id="discard" class="btn btn-sm btn-light-danger">Discard</a>- <a wicket:id="approve" class="btn btn-sm btn-light-primary">Approve</a>- <a wicket:id="requestForChanges" class="btn btn-sm btn-light-primary">Request For Changes</a>- <a wicket:id="withdrawReview" class="btn btn-sm btn-light-primary">Withdraw Review</a>- <a wicket:id="reopen" class="btn btn-sm btn-light-primary">Reopen</a>- <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-light-primary">Delete Source Branch</a>- <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-light-primary">Restore Source Branch</a>+ <a wicket:id="merge" class="btn btn-sm btn-outline-success">Merge</a>+ <a wicket:id="discard" class="btn btn-sm btn-outline-danger">Discard</a>+ <a wicket:id="approve" class="btn btn-sm btn-outline-primary">Approve</a>+ <a wicket:id="requestForChanges" class="btn btn-sm btn-outline-primary">Request For Changes</a>+ <a wicket:id="reopen" class="btn btn-sm btn-outline-primary">Reopen</a>+ <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-outline-primary">Delete Source Branch</a>+ <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-outline-primary">Restore Source Branch</a></div><ul wicket:id="requestTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 mt-3 align-items-center"></ul><wicket:child></wicket:child>@@ -116,7 +115,7 @@<tr><td class="name">Target</td><td class="value text-break text-right">- <a wicket:id="changeTargetBranch" title="Change"><wicket:svg href="arrow" class="rotate-90 icon"/></a>+ <a wicket:id="changeTargetBranch" class="btn btn-xs btn-icon btn-light btn-hover-primary" title="Change"><wicket:svg href="arrow" class="rotate-90 icon"/></a><a wicket:id="targetBranch"></a></td></tr>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 7b71879796..061b72ca80 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@@ -9,6 +9,7 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;import java.util.Comparator;+import java.util.Date;import java.util.List;import java.util.stream.Collectors;import java.util.stream.Stream;@@ -67,16 +68,14 @@ import io.onedev.server.git.RefInfo;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Build;-import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestReview.Status;import io.onedev.server.model.PullRequestWatch;-import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;@@ -186,6 +185,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn OneDev.getInstance(PullRequestManager.class);}+ private PullRequestReviewManager getPullRequestReviewManager() {+ return OneDev.getInstance(PullRequestReviewManager.class);+ }+private WebMarkupContainer newRequestHead() {WebMarkupContainer requestHead = new WebMarkupContainer("requestHeader");requestHead.setOutputMarkupId(true);@@ -552,7 +555,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsuper.onConfigure();setVisible(getPullRequest().isOpen() && !requestedForChanges()- && getPullRequest().getReviews().stream().anyMatch(it-> it.getResult()==null || it.getResult().getApproved()==null));+ && getPullRequest().getReviews().stream().anyMatch(it-> it.getStatus()==Status.PENDING));}});@@ -683,8 +686,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}private boolean requestedForChanges() {- return getPullRequest().getReviews().stream().anyMatch(- it-> it.getResult()!=null && Boolean.FALSE.equals(it.getResult().getApproved()));+ return getPullRequest().getReviews().stream()+ .anyMatch(it-> it.getStatus() == Status.REQUESTED_FOR_CHANGES);}private boolean hasUnsuccessfulRequiredBuilds() {@@ -898,7 +901,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overridepublic void onClick() {- getPullRequestManager().check(getPullRequest());+ getPullRequestManager().check(getPullRequest(), false);if (getPullRequest().getCheckError() == null)Session.get().success("Pull request is synchronized");}@@ -1202,7 +1205,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();if (request.isOpen()) {PullRequestReview review = request.getReview(SecurityUtils.getUser());- return review != null && (review.getResult() == null || review.getResult().getApproved() == null);+ return review != null && review.getStatus() == Status.PENDING;} else {return false;}@@ -1221,15 +1224,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected boolean operate() {if (canOperate()) {- User user = SecurityUtils.getUser();- PullRequest request = getPullRequest();- PullRequestReview review = request.getReview(user);- ReviewResult result = new ReviewResult();- result.setApproved(true);- result.setComment(getComment());- result.setCommit(request.getLatestUpdate().getHeadCommitHash());- review.setResult(result);- OneDev.getInstance(PullRequestReviewManager.class).save(review);+ getPullRequestReviewManager().review(getPullRequest(), true, getComment());Session.get().success("Approved");return true;} else {@@ -1257,7 +1252,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();if (request.isOpen()) {PullRequestReview review = request.getReview(SecurityUtils.getUser());- return review != null && (review.getResult() == null || review.getResult().getApproved() == null);+ return review != null && review.getStatus() == Status.PENDING;} else {return false;}@@ -1276,15 +1271,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected boolean operate() {if (canOperate()) {- User user = SecurityUtils.getUser();- PullRequest request = getPullRequest();- PullRequestReview review = request.getReview(user);- ReviewResult result = new ReviewResult();- result.setApproved(false);- result.setComment(getComment());- result.setCommit(request.getLatestUpdate().getHeadCommitHash());- review.setResult(result);- OneDev.getInstance(PullRequestReviewManager.class).save(review);+ getPullRequestReviewManager().review(getPullRequest(), false, getComment());Session.get().success("Requested For changes");return true;} else {@@ -1301,62 +1288,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});- operationsContainer.add(new ModalLink("withdrawReview") {-- @Override- protected String getModalCssClass() {- return "modal-lg";- }-- private boolean canOperate() {- PullRequest request = getPullRequest();- if (request.isOpen()) {- PullRequestReview review = request.getReview(SecurityUtils.getUser());- return review != null && review.getResult() != null- && review.getResult().getApproved() != null;- } else {- return false;- }- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(canOperate());- }-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {-- @Override- protected boolean operate() {- if (canOperate()) {- User user = SecurityUtils.getUser();- PullRequest request = getPullRequest();- PullRequestReview review = request.getReview(user);- ReviewResult result = new ReviewResult();- result.setApproved(null);- result.setComment(getComment());- result.setCommit(request.getLatestUpdate().getHeadCommitHash());- review.setResult(result);- OneDev.getInstance(PullRequestReviewManager.class).save(review);- Session.get().success("Review Withdrawed");- return true;- } else {- return false;- }- }-- @Override- protected String getTitle() {- return "Confirm Withdraw";- }- };- }-- });-operationsContainer.add(new ModalLink("merge") {private boolean canOperate() {@@ -1609,11 +1540,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected String load() {- for (CodeComment comment: getPullRequest().getCodeComments()) {- if (!comment.isVisitedAfter(comment.getLastUpdate().getDate()))- return "new";- }- return "";+ Date updateDate = getPullRequest().getCodeCommentsUpdateDate();+ if (updateDate != null && !getPullRequest().isCodeCommentsVisitedAfter(updateDate))+ return "new";+ else+ return "";}}));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 703de2e242..76f774c4b5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -799,6 +799,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overridepublic void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {state.commentId = comment.getId();+ openCommentModel.detach();state.mark = getPermanentMark(comment.getMark());OneDev.getInstance(WebSocketManager.class).observe(this);pushState(target);@@ -807,6 +808,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overridepublic void onCommentClosed(AjaxRequestTarget target) {state.commentId = null;+ openCommentModel.detach();state.mark = null;OneDev.getInstance(WebSocketManager.class).observe(this);pushState(target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.javaindex 77c850dc9c..b62c00f9f1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java@@ -8,13 +8,19 @@ import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.model.IModel;+import org.apache.wicket.request.IRequestHandler;+import org.apache.wicket.request.Url;+import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;+import io.onedev.server.OneDev;+import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.codecomment.CodeCommentListPanel;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;@@ -115,6 +121,48 @@ public class PullRequestCodeCommentsPage extends PullRequestDetailPage {});+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {++ @Override+ public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {+ }++ @Override+ public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {+ }++ @Override+ public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {+ }++ @Override+ public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {+ }++ @Override+ public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {+ }++ @Override+ public IRequestHandler onException(RequestCycle cycle, Exception ex) {+ return null;+ }++ @Override+ public void onEndRequest(RequestCycle cycle) {+ if (SecurityUtils.getUser() != null)+ OneDev.getInstance(UserInfoManager.class).visitPullRequestCodeComments(SecurityUtils.getUser(), getPullRequest());+ }++ @Override+ public void onDetach(RequestCycle cycle) {+ }++ @Override+ public void onBeginRequest(RequestCycle cycle) {+ }++ });}@Overridediff --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 c5ed7ad977..710558febe 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@@ -87,8 +87,8 @@ ul>li>a.code-comments.new .icon {font-weight: 600;margin-bottom: 0.8rem;}-.pull-request-detail .more-info .reviews a.delete,-.pull-request-detail .more-info .assignments a.delete {+.pull-request-detail .more-info .reviews .right,+.pull-request-detail .more-info .assignments .right {margin-left: auto;}.pull-request-detail .more-info .submission td.name {