The Unified and Autonomous Development Platform
fix: Suggested code change in pull request can not be applied (OD-2488)
Robin Shenb18b620759bb
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.htmlindex 368a892bae..0f56f28cbc 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html@@ -11,7 +11,7 @@<span wicket:id="userName" class="user-name"></span><span wicket:id="action" class="action"></span><span wicket:id="date" class="date"></span>- <a wicket:id="context"><wicket:svg href="warning" class="icon icon-sm"/></a>+ <a wicket:id="context" class="link-gray"><wicket:svg href="warning" class="icon icon-sm"/></a><a wicket:id="anchor" t:data-tippy-content="Permanent link" class="reply-anchor ml-2"><wicket:svg href="link" class="icon rotate-45"/></a></div><div class="body">@@ -40,7 +40,7 @@<span wicket:id="userName" class="user-name"></span><span wicket:id="action" class="action"></span><span wicket:id="date" class="date"></span>- <a wicket:id="context"><wicket:svg href="warning" class="icon icon-sm"/></a>+ <a wicket:id="context" class="link-gray"><wicket:svg href="warning" class="icon icon-sm"/></a></div></wicket:fragment></wicket:panel>\ No newline at end of filediff --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 f717db2ad3..febd4eeb16 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@@ -56,6 +56,7 @@ import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.UrlManager;@@ -357,10 +358,12 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- onDeleteComment(target, getComment());- OneDev.getInstance(CodeCommentManager.class).delete(getComment());- var oldAuditContent = VersionedXmlDoc.fromBean(getComment()).toXML();- OneDev.getInstance(AuditManager.class).audit(getComment().getProject(), "deleted code comment on file \"" + getComment().getMark().getPath() + "\"", oldAuditContent, null);+ OneDev.getInstance(TransactionManager.class).run(() -> {+ onDeleteComment(target, getComment());+ var oldAuditContent = VersionedXmlDoc.fromBean(getComment()).toXML();+ OneDev.getInstance(AuditManager.class).audit(getComment().getProject(), "deleted code comment on file \"" + getComment().getMark().getPath() + "\"", oldAuditContent, null);+ OneDev.getInstance(CodeCommentManager.class).delete(getComment());+ });}protected void onConfigure() {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 64620adb50..56d21876f2 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@@ -1,9 +1,72 @@package io.onedev.server.web.component.diff.revision;+import static io.onedev.server.web.translation.Translation._T;+import static java.util.stream.Collectors.toList;++import java.nio.charset.StandardCharsets;+import java.nio.file.Paths;+import java.text.MessageFormat;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;+import java.util.TreeMap;+import java.util.UUID;++import javax.annotation.Nullable;+import javax.servlet.http.Cookie;++import org.apache.commons.codec.binary.Hex;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;+import org.apache.wicket.extensions.markup.html.repeater.tree.nested.BranchItem;+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.http.WebRequest;+import org.apache.wicket.request.http.WebResponse;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;+import org.eclipse.jgit.diff.DiffEntry;+import org.eclipse.jgit.diff.DiffEntry.ChangeType;+import org.eclipse.jgit.lib.AnyObjectId;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import com.google.common.base.Joiner;import com.google.common.base.Splitter;import com.google.common.collect.Lists;import com.google.common.collect.Sets;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExceptionUtils;@@ -26,7 +89,13 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.exception.ObsoleteCommitException;import io.onedev.server.git.service.DiffEntryFacade;import io.onedev.server.git.service.GitService;-import io.onedev.server.model.*;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;+import io.onedev.server.model.PendingSuggestionApply;+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;import io.onedev.server.search.code.CodeIndexManager;@@ -52,6 +121,7 @@ import io.onedev.server.web.component.markdown.OutdatedSuggestionException;import io.onedev.server.web.component.markdown.SuggestionSupport;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.component.suggestionapply.PullRequestSuggestionApplyBean;import io.onedev.server.web.component.suggestionapply.SuggestionApplyBean;import io.onedev.server.web.component.suggestionapply.SuggestionApplyModalPanel;import io.onedev.server.web.component.svg.SpriteImage;@@ -61,56 +131,6 @@ import io.onedev.server.web.util.DiffPlanarRange;import io.onedev.server.web.util.SuggestionUtils;import io.onedev.server.web.util.TextUtils;import io.onedev.server.web.util.WicketUtils;-import org.apache.commons.codec.binary.Hex;-import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;-import org.apache.wicket.extensions.markup.html.repeater.tree.nested.BranchItem;-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.http.WebRequest;-import org.apache.wicket.request.http.WebResponse;-import org.apache.wicket.util.visit.IVisit;-import org.apache.wicket.util.visit.IVisitor;-import org.eclipse.jgit.diff.DiffEntry;-import org.eclipse.jgit.diff.DiffEntry.ChangeType;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;--import javax.annotation.Nullable;-import javax.servlet.http.Cookie;-import java.nio.charset.StandardCharsets;-import java.nio.file.Paths;-import java.text.MessageFormat;-import java.util.*;--import static io.onedev.server.web.translation.Translation._T;-import static java.util.stream.Collectors.toList;/*** Make sure to add only one revision diff panel on a page@@ -1817,8 +1837,9 @@ public abstract class RevisionDiffPanel extends Panel {@Overridepublic void applySuggestion(AjaxRequestTarget target, List<String> suggestion) {- SuggestionApplyBean bean = new SuggestionApplyBean();+ var bean = new PullRequestSuggestionApplyBean();bean.setBranch(getPullRequest().getSourceBranch());+ bean.setCommitMessage(_T("Apply suggested change from code comment"));new SuggestionApplyModalPanel(target, bean) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex f1fb85e845..5f869ab964 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -1119,7 +1119,7 @@ onedev.server.markdown = {if (suggestionCallback) {if ($this.data("suggestionoutdated")) {var icon = "<svg class='icon icon-sm'><use xlink:href='" + onedev.server.icons + "#warning'/></svg>";- var $warning = $("<a class='ml-2' disabled='disabled' data-tippy-content='" + onedev.server.markdown.translations["suggestion-outdated"] + "'>" + icon + "</a>");+ var $warning = $("<a class='ml-2 link-gray' data-tippy-content='" + onedev.server.markdown.translations["suggestion-outdated"] + "'>" + icon + "</a>");$actions.append($warning);} else if ($this.data("suggestionapplyinbatch")) {var icon = "<svg class='icon'><use xlink:href='" + onedev.server.icons + "#minus-square'/></svg>";diff --git a/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/PullRequestSuggestionApplyBean.java b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/PullRequestSuggestionApplyBean.javanew file mode 100644index 0000000000..b111d83221--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/suggestionapply/PullRequestSuggestionApplyBean.java@@ -0,0 +1,31 @@+package io.onedev.server.web.component.suggestionapply;++import javax.validation.constraints.NotEmpty;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Multiline;+import io.onedev.server.annotation.OmitName;++@Editable(name="Commit Suggestion")+public class PullRequestSuggestionApplyBean extends SuggestionApplyBean {++ @Editable+ @Override+ public String getBranch() {+ return super.getBranch();+ }++ @Editable(order=200)+ @OmitName+ @Multiline+ @NotEmpty+ public String getCommitMessage() {+ return super.getCommitMessage();+ }++ @Override+ public void setCommitMessage(String commitMessage) {+ super.setCommitMessage(commitMessage);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 2d511080a9..187c7d923b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -844,7 +844,7 @@ span.keycap {.community-edition .subscription-required::after {content: "ee";position: absolute;- top: -3px;+ bottom: 8px;right: -18px;font-size: 8px;padding: 0 3px 1px 3px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 509ff5452c..2a7cfcbad1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -401,6 +401,8 @@ public abstract class LayoutPage extends BasePage {menus.add(menu);menus.addAll(getSidebarMenus());+ menus.removeIf(it -> {it.cleanup(); return it.getMenuItems().isEmpty();});+return menus;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.javaindex 909d841d06..163cacc8c2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenu.java@@ -57,6 +57,18 @@ public class SidebarMenu implements Serializable {menuItems.add(menuItem);}+ public void cleanup() {+ for (var it = menuItems.iterator(); it.hasNext();) {+ var menuItem = it.next();+ if (menuItem instanceof SidebarMenuItem.SubMenu) {+ var subMenu = (SidebarMenuItem.SubMenu) menuItem;+ subMenu.cleanup();+ if (subMenu.getMenuItems().isEmpty())+ it.remove();+ }+ }+ }+public static abstract class Header implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.javaindex 3358892f75..2bad4b0196 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/SidebarMenuItem.java@@ -123,6 +123,18 @@ public abstract class SidebarMenuItem implements Serializable {public boolean isActive() {return menuItems.stream().anyMatch(it->it.isActive());}++ public void cleanup() {+ menuItems.removeIf(it -> {+ if (it instanceof SidebarMenuItem.SubMenu) {+ var subMenu = (SidebarMenuItem.SubMenu) it;+ subMenu.cleanup();+ return subMenu.getMenuItems().isEmpty();+ } else {+ return false;+ }+ });+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.cssindex a15abfad72..f0f742e84b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css@@ -25,6 +25,9 @@left: 0;box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);}+.community-edition .sidebar .subscription-required {+ margin-right: 0 !important;+}.dark-mode .sidebar.sidebar-docked {box-shadow: 0 0 30px rgb(0 0 0 / 50%);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 7b93e98a01..c655ca1414 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -255,9 +255,10 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {CodeContribsPage.class, CodeContribsPage.paramsOf(getProject()),Lists.newArrayList(SourceLinesPage.class)));}-- if (!statsMenuItems.isEmpty())- menuItems.add(new SidebarMenuItem.SubMenu("stats", _T("Statistics"), statsMenuItems));++ // Add the sub menu even if it is empty as we need to place stats menu in the right place.+ // Menu items may be added to the sub menu later via contribution+ menuItems.add(new SidebarMenuItem.SubMenu("stats", _T("Statistics"), statsMenuItems));menuItems.add(new SidebarMenuItem.Page("tree", _T("Child Projects"),ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(getProject(), null, 0)));@@ -366,7 +367,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {for (var menuItem: contribution.getMenuItems(getProject()))menu.insertMenuItem(menuItem);}-+List<SidebarMenu> menus = super.getSidebarMenus();menus.add(menu);return menus;diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.javaindex ad36a347da..867a8b2960 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java@@ -49,7 +49,7 @@ public class GeneralErrorPage extends SimplePage {public GeneralErrorPage(Exception exception) {super(new PageParameters());-+serverNotFound = ExceptionUtils.find(exception, ServerNotFoundException.class) != null;var response = ExceptionUtils.buildResponse(exception);