The Unified and Autonomous Development Platform
Prompt unreviewed changes if there are new changes before confirm approval/disapproval
robin shenb1ffc1fc413f
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.javadeleted file mode 100644index 131bcb69f0..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java+++ /dev/null@@ -1,48 +0,0 @@-package com.gitplex.server.web.page.depot.pullrequest.requestdetail;--import java.util.Collection;--import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.PullRequest;-import com.gitplex.server.web.component.comment.CodeCommentFilter;-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;--@SuppressWarnings("serial")-public class IntegrationHintPanel extends GenericPanel<PullRequest> {-- public IntegrationHintPanel(String id, IModel<PullRequest> model) {- super(id, model);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- PullRequest request = getModelObject();-- PageParameters params = RequestCodeCommentsPage.paramsOf(request);- getFilter().fillPageParams(params);- add(new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, params));- }-- private CodeCommentFilter getFilter() {- CodeCommentFilter filter = new CodeCommentFilter();- filter.setUnresolved(true);- return filter;- }-- @Override- protected void onConfigure() {- super.onConfigure();-- Collection<CodeComment> comments = getModelObject().getCodeComments();- getFilter().filter(comments);- setVisible(!comments.isEmpty());- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.javaindex be162043d8..1b649ba787 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java@@ -2,10 +2,6 @@ package com.gitplex.server.web.page.depot.pullrequest.requestdetail;import javax.annotation.Nullable;-import org.apache.wicket.Component;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.model.LoadableDetachableModel;-import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;import com.gitplex.server.manager.AccountManager;@@ -16,16 +12,12 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.security.SecurityUtils;-@SuppressWarnings("serial")public enum PullRequestOperation {DISCARD {@Overridepublic boolean canOperate(PullRequest request) {- if (!SecurityUtils.canModify(request))- return false;- else- return request.isOpen();+ return request.isOpen() && SecurityUtils.canModify(request);}@Override@@ -46,19 +38,6 @@ public enum PullRequestOperation {GitPlex.getInstance(ReviewManager.class).review(request, true, comment);}- @Override- public Component newHinter(String id, PullRequest request) {- Long requestId = request.getId();- return new ApprovalHintPanel(id, new LoadableDetachableModel<PullRequest>() {-- @Override- protected PullRequest load() {- return GitPlex.getInstance(PullRequestManager.class).load(requestId);- }-- });- }-},DISAPPROVE {@@ -78,14 +57,14 @@ public enum PullRequestOperation {@Overridepublic boolean canOperate(PullRequest request) {PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);- return (!request.isOpen()+ return !request.isOpen()&& SecurityUtils.canModify(request)&& request.getTarget().getObjectName(false) != null&& request.getSourceDepot() != null&& request.getSource().getObjectName(false) != null&& pullRequestManager.findEffective(request.getTarget(), request.getSource()) == null&& !GitUtils.isMergedInto(request.getTargetDepot().getRepository(),- request.getSource().getObjectId(), request.getTarget().getObjectId()));+ request.getSource().getObjectId(), request.getTarget().getObjectId());}@Override@@ -145,8 +124,4 @@ public enum PullRequestOperation {public abstract boolean canOperate(PullRequest request);- public Component newHinter(String id, PullRequest request) {- return new WebMarkupContainer(id).setVisible(false);- }-}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.htmlindex 30bd2018b0..45cfc0446b 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html@@ -76,9 +76,9 @@<wicket:child></wicket:child></div><wicket:fragment wicket:id="operationConfirmFrag">+ <div wicket:id="hint" class="hint"></div>+ <div wicket:id="feedback"></div><form wicket:id="form" class="leave-confirm">- <div wicket:id="hint" class="hint"></div>- <div wicket:id="feedback"></div><div wicket:id="note"></div><input wicket:id="submit" type="submit" value="Confirm" class="btn"></input><input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"></input>diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.javaindex 8a2251e6de..101fc143f5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java@@ -53,10 +53,12 @@ import org.apache.wicket.util.visit.IVisitor;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.manager.PullRequestUpdateManager;import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.Depot;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.model.support.MergePreview;import com.gitplex.server.model.support.MergeStrategy;@@ -99,10 +101,14 @@ public abstract class RequestDetailPage extends DepotPage {public static final String PARAM_REQUEST = "request";+ private static final String HINT_ID = "hint";+protected IModel<PullRequest> requestModel;private boolean editingTitle;+ private Long reviewUpdateId;+public RequestDetailPage(PageParameters params) {super(params);@@ -122,6 +128,7 @@ public abstract class RequestDetailPage extends DepotPage {};+ reviewUpdateId = requestModel.getObject().getLatestUpdate().getId();}@Override@@ -511,6 +518,7 @@ public abstract class RequestDetailPage extends DepotPage {@Overridepublic void onClick(AjaxRequestTarget target) {+ reviewUpdateId = getPullRequest().getLatestUpdate().getId();operationsContainer.replace(newOperationConfirm(confirmId, APPROVE, operationsContainer));target.add(operationsContainer);target.appendJavaScript("$(window).resize();");@@ -528,6 +536,7 @@ public abstract class RequestDetailPage extends DepotPage {@Overridepublic void onClick(AjaxRequestTarget target) {+ reviewUpdateId = getPullRequest().getLatestUpdate().getId();operationsContainer.replace(newOperationConfirm(confirmId, DISAPPROVE, operationsContainer));target.add(operationsContainer);target.appendJavaScript("$(window).resize();");@@ -648,8 +657,19 @@ public abstract class RequestDetailPage extends DepotPage {}});- form.add(operation.newHinter("hint", request));- form.add(new NotificationPanel("feedback", form));++ WebMarkupContainer hint;+ if (operation == APPROVE)+ hint = new UnresolvedCodeCommentsPanel(HINT_ID, requestModel);+ else+ hint = new WebMarkupContainer(HINT_ID);+ hint.setOutputMarkupPlaceholderTag(true);+ fragment.add(hint);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ fragment.add(feedback);+form.add(new AjaxButton("submit") {@Override@@ -657,9 +677,29 @@ public abstract class RequestDetailPage extends DepotPage {super.onSubmit(target, form);PullRequest request = getPullRequest();- if (!operation.canOperate(request)) {+ if ((operation == APPROVE || operation == DISAPPROVE) &&+ !getPullRequest().getLatestUpdate().getId().equals(reviewUpdateId)) {+ Long prevReviewUpdateId = reviewUpdateId;+ WebMarkupContainer hint = new UnreviewedChangesPanel(HINT_ID,+ new LoadableDetachableModel<PullRequestUpdate>() {++ @Override+ protected PullRequestUpdate load() {+ return GitPlex.getInstance(PullRequestUpdateManager.class).load(prevReviewUpdateId);+ }++ });+ hint.setOutputMarkupPlaceholderTag(true);+ fragment.replace(hint);++ target.add(feedback);+ target.add(hint);+ target.appendJavaScript("$(window).resize();");+ reviewUpdateId = getPullRequest().getLatestUpdate().getId();+ } else if (!operation.canOperate(request)) {error("Not allowed to " + getOperationName(operation) + " at this point");- target.add(form);+ target.add(feedback);+ target.add(hint);target.appendJavaScript("$(window).resize();");} else {operation.operate(request, noteInput.getModelObject());diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.javasimilarity index 91%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.javaindex 66a8331598..7b0b601794 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java@@ -16,9 +16,9 @@ import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;@SuppressWarnings("serial")-public class ApprovalHintPanel extends GenericPanel<PullRequest> {+class UnresolvedCodeCommentsPanel extends GenericPanel<PullRequest> {- public ApprovalHintPanel(String id, IModel<PullRequest> model) {+ public UnresolvedCodeCommentsPanel(String id, IModel<PullRequest> model) {super(id, model);}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.htmlsimilarity index 51%rename from web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.htmlindex e0450b8147..42849c8e1e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.html@@ -1,3 +1,3 @@<wicket:panel>- <div class="warning"><i class="fa fa-warning"></i> There are <a wicket:id="link">unresolved code comments</a> yet</div>+ <div class="warning"><i class="fa fa-warning"></i> There are <a wicket:id="link">new changes</a> since your review</div></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.javanew file mode 100644index 0000000000..5190ca41f5--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnreviewedChangesPanel.java@@ -0,0 +1,39 @@+package com.gitplex.server.web.page.depot.pullrequest.requestdetail;++import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;++import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;++@SuppressWarnings("serial")+public class UnreviewedChangesPanel extends GenericPanel<PullRequestUpdate> {++ public UnreviewedChangesPanel(String id, IModel<PullRequestUpdate> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PullRequestUpdate update = getModelObject();++ RequestChangesPage.State state = new RequestChangesPage.State();+ state.oldCommit = update.getHeadCommitHash();+ state.newCommit = update.getRequest().getHeadCommitHash();++ add(new ViewStateAwarePageLink<Void>("link", RequestChangesPage.class,+ RequestChangesPage.paramsOf(update.getRequest(), state)));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ PullRequestUpdate update = getModelObject();+ setVisible(!update.equals(update.getRequest().getLatestUpdate()));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.css b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.cssindex f8e0cf0065..15466a96ba 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.css+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/request-detail.css@@ -93,11 +93,11 @@margin-right: 4px;}-#request-detail>.summary>.operations>.confirm>form>.hint {+#request-detail>.summary>.operations>.confirm>.hint {margin-bottom: 12px;font-size: 16px;}-#request-detail>.summary>.operations>.confirm>form>.hint .warning {+#request-detail>.summary>.operations>.confirm>.hint .warning {color: #EC5544;}#request-detail>.summary>.operations>.buttons>a,