Skip to content

The Unified and Autonomous Development Platform

feat: for update strategy, just display a dialog to ask for confirmation

sususweete9770dffdce4
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.java
index 2d7bf9d204..96557e0ca7 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
@@ -51,7 +51,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
Map<ObjectId, AheadBehind> getAheadBehind(PullRequest request);
- void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, @Nullable String commitMessage);
+ void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy);
@Override
void delete(PullRequest request);
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.java
index d3bf473a7e..b2ea51dd9f 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
@@ -269,13 +269,14 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
@Transactional
@Override
- public void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, @Nullable String commitMessage) {
+ public void updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy) {
MergePreview mergePreview = checkNotNull(request.checkMergePreview());
User user = SecurityUtils.getUser();
PersonIdent person = user.asPerson();
ObjectId targetHead = request.getLatestUpdate().getHeadCommit();
ObjectId requestHead = request.getTarget().getObjectId();
ObjectId mergeCommitId;
+ String commitMessage = request.getDefaultUpdateSourceBranchCommitMessage(mergeStrategy);
if (mergeStrategy == REBASE_SOURCE_BRANCH_COMMITS) {
mergeCommitId = gitService.rebase(request.getTargetProject(), requestHead, targetHead, person);
} else if (mergeStrategy == CREATE_MERGE_COMMIT) {
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.html
index 74dafe0b86..c32913da6b 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
@@ -239,6 +239,19 @@
</wicket:enclosure>
</div>
</wicket:fragment>
+ <wicket:fragment wicket:id="confirmUpdateSourceBranchFrag">
+ <div class="confirm-delete-branch">
+ <div class="modal-header">
+ <h5 class="modal-title">Please confirm</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div wicket:id="body" class="modal-body"></div>
+ <div class="modal-footer">
+ <a wicket:id="confirm" class="btn btn-danger">Confirm</a>
+ <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
+ </div>
+ </div>
+ </wicket:fragment>
<wicket:fragment wicket:id="autoMergeEnabledFrag">
Pull request will be merged automatically<wicket:enclosure> with a preset <a wicket:id="commitMessage">commit message</a></wicket:enclosure> when ready.
This option will be disabled upon adding new commits, changing merge strategy, or switching target branch
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.java
index 3117e61adb..a7a7c0c93f 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
@@ -67,7 +67,6 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequest
import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.CommentableOperationConfirmPanel;
import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.MergeConfirmPanel;
-import io.onedev.server.web.page.project.pullrequests.detail.operationconfirm.UpdateSourceBranchConfirmPanel;
import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
@@ -1598,7 +1597,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
};
}
- private String updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy, String commitMessage){
+ private String updateSourceBranch(PullRequest request, MergeStrategy mergeStrategy){
var project = request.getProject();
var user = SecurityUtils.getAuthUser();
Map<String, String> gitEnvs = new HashMap<>();
@@ -1619,18 +1618,18 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
errorMessage = "Review required for your change. Please submit pull request instead";
return errorMessage;
} else if (!newObjectId.equals(ObjectId.zeroId())) {
- if (commitMessage != null) {
- errorMessage = branchProtection.checkCommitMessage(commitMessage, false);
- if (errorMessage != null)
- return errorMessage;
- }
+// if (commitMessage != null) {
+// errorMessage = branchProtection.checkCommitMessage(commitMessage, false);
+// if (errorMessage != null)
+// return errorMessage;
+// }
} else if (!oldObjectId.equals(ObjectId.zeroId()) && !newObjectId.equals(ObjectId.zeroId())
&& project.isBuildRequiredForPush(user, branchName, oldObjectId, newObjectId, gitEnvs)) {
errorMessage = "Build required for your change. Please submit pull request instead";
return errorMessage;
}
- getPullRequestManager().updateSourceBranch(getPullRequest(), mergeStrategy, commitMessage);
+ getPullRequestManager().updateSourceBranch(getPullRequest(), mergeStrategy);
return null;
}
@@ -1682,24 +1681,44 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "confirmUpdateSourceBranchFrag", PullRequestDetailPage.this);
+ fragment.add(new Label("body", "You selected to update source branch by Merge"));
+ fragment.add(new AjaxLink<Void>("confirm") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (!canOperate()) {
+ getSession().error("Can not perform this operation now");
+ } else {
+ String message = updateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT);
+ if (message == null) {
+ getSession().success("Source branch updated successfully");
+ } else {
+ getSession().error(message);
+ }
+ }
+ modal.close();
+ }
- return new UpdateSourceBranchConfirmPanel(id, modal, latestUpdateId) {
+ });
+ fragment.add(new AjaxLink<Void>("cancel") {
@Override
- protected String getTitle() {
- return "Update Source Branch by Merge";
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
}
+ });
+ fragment.add(new AjaxLink<Void>("close") {
+
@Override
- protected String operate(AjaxRequestTarget target) {
- if (canOperate()) {
- return updateSourceBranch(getPullRequest(), CREATE_MERGE_COMMIT, getCommitMessage());
- } else {
- return "Can not perform this operation now";
- }
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
}
- };
+ });
+ fragment.setOutputMarkupId(true);
+ return fragment;
}
});
@@ -1713,23 +1732,44 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new UpdateSourceBranchConfirmPanel(id, modal, latestUpdateId) {
+ Fragment fragment = new Fragment(id, "confirmUpdateSourceBranchFrag", PullRequestDetailPage.this);
+ fragment.add(new Label("body", "You selected to update source branch by Rebase"));
+ fragment.add(new AjaxLink<Void>("confirm") {
@Override
- protected String getTitle() {
- return "Update Source Branch by Rebase";
+ public void onClick(AjaxRequestTarget target) {
+ if (!canOperate()) {
+ getSession().error("Can not perform this operation now");
+ } else {
+ String message = updateSourceBranch(getPullRequest(), REBASE_SOURCE_BRANCH_COMMITS);
+ if (message == null) {
+ getSession().success("Source branch updated successfully");
+ } else {
+ getSession().error(message);
+ }
+ }
+ modal.close();
}
+ });
+ fragment.add(new AjaxLink<Void>("cancel") {
+
@Override
- protected String operate(AjaxRequestTarget target) {
- if (canOperate()) {
- return updateSourceBranch(getPullRequest(), REBASE_SOURCE_BRANCH_COMMITS, getCommitMessage());
- } else {
- return "Can not perform this operation now";
- }
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
}
- };
+ });
+ fragment.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+ return fragment;
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.html
deleted file mode 100644
index 95d64b8516..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:extend>
- <div wicket:id="commitMessage" class="no-autosize commit-message"></div>
-</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.java
deleted file mode 100644
index 79fd77dffa..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/UpdateSourceBranchConfirmPanel.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;
-
-import io.onedev.server.web.page.project.pullrequests.detail.CommitMessageBean;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.editable.BeanContext;
-
-@SuppressWarnings("serial")
-public abstract class UpdateSourceBranchConfirmPanel extends OperationConfirmPanel {
-
- private CommitMessageBean bean = new CommitMessageBean();
-
- public UpdateSourceBranchConfirmPanel(String componentId, ModalPanel modal, Long latestUpdateId) {
- super(componentId, modal, latestUpdateId);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- PullRequest request = getPullRequest();
- // String commitMessage = request.getDefaultUpdateSourceBranchCommitMessage();
- //if (commitMessage != null) {
-// bean.setCommitMessage(commitMessage);
-// getForm().add(BeanContext.edit("commitMessage", bean));
-// } else {
-// getForm().add(new WebMarkupContainer("commitMessage").setVisible(false));
-// }
- }
-
-
- private PullRequest getPullRequest() {
- return getLatestUpdate().getRequest();
- }
-
- public String getCommitMessage() {
- return bean.getCommitMessage();
- }
-
-}