The Unified and Autonomous Development Platform
feat: Overview for all affected files when reviewing a commit (OD-2079)
Robin Shencc27c4d56844
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 9b41d99e88..8c022fa2e9 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -7064,5 +7064,40 @@ public class DataMigrator {}}}++ private void migrate179_removeSingleFile(Element element) {+ var compareContextElement = element.element("compareContext");+ if (compareContextElement != null) {+ var currentFileElement = compareContextElement.element("currentFile");+ if (currentFileElement != null)+ currentFileElement.detach();+ }+ }++ private void migrate179(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("CodeComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ migrate179_removeSingleFile(element);+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("CodeCommentReplys.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ migrate179_removeSingleFile(element);+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("CodeCommentReplys.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ migrate179_removeSingleFile(element);+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("CodeCommentStatusChanges.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ migrate179_removeSingleFile(element);+ dom.writeToFile(file, false);+ }+ }+ }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/ChildrenAggregator.java b/server-core/src/main/java/io/onedev/server/util/ChildrenAggregator.javanew file mode 100644index 0000000000..58eb34189c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ChildrenAggregator.java@@ -0,0 +1,31 @@+package io.onedev.server.util;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.List;++public abstract class ChildrenAggregator<T> implements Serializable {++ private static final long serialVersionUID = 1L;++ public List<T> getAggregatedChildren(@Nullable T node) {+ var children = getChildren(node);+ for (int i=0; i<children.size(); i++) {+ var child = children.get(i);+ while (true) {+ var childChildren = getChildren(child);+ if (childChildren.size() == 1) {+ child = childChildren.iterator().next();+ children.set(i, child);+ } else {+ break;+ }+ }+ }+ return children;+ }++ protected abstract List<T> getChildren(@Nullable T node);++}+diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svgnew file mode 100644index 0000000000..b8d2d4473b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/diff2.svg@@ -0,0 +1 @@+<?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="1729830369923" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15223" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M533.333333 288a32 32 0 0 0-64 0V384H373.333333a32 32 0 0 0 0 64H469.333333v96a32 32 0 0 0 64 0V448h96a32 32 0 0 0 0-64H533.333333V288zM373.333333 682.666667a32 32 0 0 0 0 64h256a32 32 0 0 0 0-64h-256z" fill="#404452" p-id="15224"></path><path d="M213.333333 42.666667a85.333333 85.333333 0 0 0-85.333333 85.333333v768a85.333333 85.333333 0 0 0 85.333333 85.333333h597.333334a85.333333 85.333333 0 0 0 85.333333-85.333333V299.434667a85.333333 85.333333 0 0 0-25.002667-60.330667l-171.434666-171.434667A85.333333 85.333333 0 0 0 639.232 42.666667H213.333333z m-21.333333 85.333333a21.333333 21.333333 0 0 1 21.333333-21.333333h425.898667a21.333333 21.333333 0 0 1 15.104 6.229333l171.434667 171.434667a21.333333 21.333333 0 0 1 6.229333 15.104V896a21.333333 21.333333 0 0 1-21.333333 21.333333H213.333333a21.333333 21.333333 0 0 1-21.333333-21.333333V128z" fill="#404452" p-id="15225"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/sidebar.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/sidebar.svgnew file mode 100644index 0000000000..4e57a1a8c3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/sidebar.svg@@ -0,0 +1 @@+<?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="1729754357367" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7653" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M197.12 86.4c-17.408 3.413333-22.741333 4.864-32 8.618667-37.589333 15.274667-66.090667 48.512-76.544 89.301333-3.541333 13.952-3.584 641.322667 0 655.232 11.989333 46.890667 44.416 80.042667 93.184 95.488 7.637333 2.389333 41.941333 2.730667 322.56 3.2 213.248 0.341333 317.781333-0.042667 325.674667-1.28 50.773333-7.808 92.458667-46.250667 105.429333-97.28 3.541333-13.994667 3.584-641.365333 0-655.232-13.098667-51.072-53.930667-89.173333-104.277333-97.28-10.496-1.706667-625.536-2.432-634.026667-0.768M341.333333 512v341.333333H274.218667c-76.373333 0-78.293333-0.256-90.837334-12.8-13.824-13.824-12.8 13.994667-12.288-332.032L171.52 200.533333l4.736-8.064c2.602667-4.394667 7.381333-10.069333 10.666667-12.544 11.648-8.874667 13.610667-9.088 86.570666-9.173333L341.333333 170.666667v341.333333m483.84-338.517333c4.906667 1.664 11.221333 5.76 15.402667 9.941333 13.824 13.824 12.757333-13.738667 12.757333 328.576s1.066667 314.752-12.757333 328.576c-13.568 13.568 0.554667 12.757333-218.794667 12.757333H426.666667V170.666667h195.114666c177.109333 0 195.882667 0.256 203.392 2.816" p-id="7654"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.html b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.htmlindex 7f3946a5fe..131dfecafd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.html+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.html@@ -1,9 +1,6 @@<wicket:panel><div wicket:id="tree" class="blob-selector"></div>- <wicket:fragment wicket:id="folderFrag">- <svg wicket:id="icon" class="icon"></svg> <span wicket:id="label"></span>- </wicket:fragment>- <wicket:fragment wicket:id="fileFrag">+ <wicket:fragment wicket:id="nodeFrag"><a wicket:id="link"><svg wicket:id="icon" class="icon"></svg> <span wicket:id="label"></span></a></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.javaindex 5f6dc4b905..9bd134f3a7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/BlobSelector.java@@ -1,17 +1,16 @@package io.onedev.server.web.component.blob;-import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;-import java.util.Set;--import javax.annotation.Nullable;-+import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.BlobIdentFilter;+import io.onedev.server.model.Project;+import io.onedev.server.util.ChildrenAggregator;+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;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.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -20,14 +19,16 @@ 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.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.BlobIdentFilter;-import io.onedev.server.model.Project;-import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;+import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;+import java.util.Set;@SuppressWarnings("serial")public abstract class BlobSelector extends Panel {@@ -46,7 +47,14 @@ public abstract class BlobSelector extends Panel {protected void onInitialize() {super.onInitialize();- add(new NestedTree<BlobIdent>("tree", new ITreeProvider<BlobIdent>() {+ var childrenAggregator = new ChildrenAggregator<BlobIdent>() {++ @Override+ protected List<BlobIdent> getChildren(BlobIdent node) {+ return projectModel.getObject().getBlobChildren(node, getBlobIdentFilter(), commitId);+ }+ };+ add(new NestedTree<BlobIdent>("tree", new ITreeProvider<>() {@Overridepublic void detach() {@@ -55,7 +63,7 @@ public abstract class BlobSelector extends Panel {@Overridepublic Iterator<? extends BlobIdent> getRoots() {if (commitId != null)- return getChildren(new BlobIdent(commitId.name(), null, FileMode.TYPE_TREE));+ return childrenAggregator.getAggregatedChildren(new BlobIdent(commitId.name(), null, FileMode.TYPE_TREE)).iterator();elsereturn new ArrayList<BlobIdent>().iterator();}@@ -67,29 +75,29 @@ public abstract class BlobSelector extends Panel {@Overridepublic Iterator<? extends BlobIdent> getChildren(BlobIdent node) {- return projectModel.getObject().getBlobChildren(node, getBlobIdentFilter(), commitId).iterator();+ return childrenAggregator.getAggregatedChildren(node).iterator();}@Overridepublic IModel<BlobIdent> model(BlobIdent object) {return Model.of(object);}-+}, new AbstractReadOnlyModel<Set<BlobIdent>>() {@Overridepublic Set<BlobIdent> getObject() {return getState();}-+}) {@Overrideprotected void onInitialize() {super.onInitialize();- add(new HumanTheme());+ add(new HumanTheme());}-+@Overridepublic void collapse(BlobIdent blobIdent) {super.collapse(blobIdent);@@ -99,40 +107,57 @@ public abstract class BlobSelector extends Panel {@Overridepublic void expand(BlobIdent blobIdent) {super.expand(blobIdent);-+List<BlobIdent> children = projectModel.getObject().getBlobChildren(blobIdent, getBlobIdentFilter(), commitId);- if (children.size() == 1 && children.get(0).isTree())+ if (children.size() == 1 && children.get(0).isTree())expand(children.get(0));-+onStateChange();}+ private IModel<String> newLabelModel(Fragment fragment, BlobIdent blobIdent) {+ return new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ var label = blobIdent.path;+ var branchItem = fragment.getParent().getParent().findParent(BranchItem.class);+ if (branchItem != null) {+ var parentBlobIdent = (BlobIdent) branchItem.getModelObject();+ label = label.substring(parentBlobIdent.path.length() + 1);+ }+ return label;+ }+ };+ }+@Overrideprotected Component newContentComponent(String id, IModel<BlobIdent> node) {BlobIdent blobIdent = node.getObject();- if (blobIdent.isTree()) {- Fragment fragment = new Fragment(id, "folderFrag", BlobSelector.this);- fragment.add(new BlobIcon("icon", node));- fragment.add(new Label("label", blobIdent.getName()));- return fragment;- } else {- Fragment fragment = new Fragment(id, "fileFrag", BlobSelector.this);- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {++ Fragment fragment = new Fragment(id, "nodeFrag", BlobSelector.this);+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (blobIdent.isTree()) {+ if (getState(blobIdent) == State.EXPANDED)+ collapse(blobIdent);+ else+ expand(blobIdent);+ } else {onSelect(target, blobIdent.path);}-- };- link.add(new BlobIcon("icon", node));- link.add(new Label("label", blobIdent.getName()));- fragment.add(link);- return fragment;- }+ }++ };+ link.add(new BlobIcon("icon", node));+ link.add(new Label("label", newLabelModel(fragment, blobIdent)));+ fragment.add(link);+ return fragment;}-+});}diff --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 a5344087ec..b6d73f0715 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@@ -8,9 +8,9 @@<div class="head no-autofocus d-flex align-items-center flex-nowrap"><span wicket:id="operations" class="btn-group mr-3"><a wicket:id="batchedSuggestions" class="batched-suggestions btn btn-light flex-shrink-0" title="Batched suggestions"><wicket:svg href="diff" class="icon icon-lg mr-2"/> <span wicket:id="count" class="mr-1">3</span><wicket:svg href="arrow" class="icon rotate-90"/></a>- <a wicket:id="option" class="btn btn-light btn-icon btn-lg flex-shrink-0"><wicket:svg href="gear" class="icon"/></a>+ <a wicket:id="option" class="btn btn-light btn-icon btn-lg flex-shrink-0" title="Diff options"><wicket:svg href="gear" class="icon"/></a></span>- <div class="path-filter flex-grow-1">+ <div class="path-filter flex-grow-1 mr-3"><form wicket:id="pathFilter"><div class="clearable-wrapper"><div class="input-group">@@ -22,12 +22,13 @@</div></form></div>+ <a wicket:id="toggleNavigation" class="btn btn-icon btn-light" title="Toggle navigation"><wicket:svg href="sidebar" class="icon flip-x"/></a></div><div wicket:id="body" class="body"><div wicket:id="feedback"></div><div wicket:id="tooManyFiles" class="alert alert-notice alert-light-warning"></div><div class="detail d-flex align-items-stretch">- <div wicket:id="comment" class="comment need-width border border-right-0 rounded d-flex overflow-hidden flex-shrink-0 position-sticky mr-4">+ <div wicket:id="comment" class="comment need-width border border-right-0 rounded d-flex overflow-hidden flex-shrink-0 position-sticky mr-3"><div class="content flex-grow-1 overflow-hidden d-flex flex-column"><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>@@ -45,6 +46,10 @@<div wicket:id="diff"></div></li></ul>+ <div wicket:id="navigation" class="navigation need-width border border-left-0 rounded d-flex overflow-hidden flex-shrink-0 position-sticky ml-3">+ <div class="ui-resizable-handle ui-resizable-w flex-shrink-0"></div>+ <div wicket:id="content" class="content flex-grow-1 overflow-auto p-3"></div>+ </div></div></div></div>@@ -60,4 +65,7 @@</div></form></wicket:fragment>+ <wicket:fragment wicket:id="navTreeNodeFrag">+ <a wicket:id="link"><svg wicket:id="icon" class="icon mr-1"/><span wicket:id="label"/></a>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --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 f65cf26545..0c38e0a920 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,6 +1,8 @@package io.onedev.server.web.component.diff.revision;+import com.google.common.base.Joiner;import com.google.common.base.Optional;+import com.google.common.base.Splitter;import com.google.common.collect.Lists;import com.google.common.collect.Sets;import io.onedev.commons.codeassist.InputSuggestion;@@ -57,6 +59,8 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestimport io.onedev.server.web.util.DiffPlanarRange;import io.onedev.server.web.util.RevisionDiff;import io.onedev.server.web.util.SuggestionUtils;+import io.onedev.server.web.util.WicketUtils;+import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -65,10 +69,15 @@ 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.head.IHeaderResponse;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.Form;@@ -93,8 +102,11 @@ import org.eclipse.jgit.lib.ObjectId;import javax.annotation.Nullable;import javax.servlet.http.Cookie;+import java.nio.file.Paths;import java.util.*;+import static java.util.stream.Collectors.toList;+/*** Make sure to add only one revision diff panel on a page*@@ -108,6 +120,10 @@ public abstract class RevisionDiffPanel extends Panel {private static final String COOKIE_COMMENT_WIDTH = "revisionDiff.comment.width";+ private static final String COOKIE_NAVIGATION = "revisionDiff.navigation";++ private static final String COOKIE_NAVIGATION_WIDTH = "revisionDiff.navigation.width";+private final String oldRev;private final String newRev;@@ -122,7 +138,7 @@ public abstract class RevisionDiffPanel extends Panel {private DiffViewMode viewMode;- private final IModel<List<DiffEntryFacade>> diffEntriesModel = new LoadableDetachableModel<List<DiffEntryFacade>>() {+ private final IModel<List<DiffEntryFacade>> diffEntriesModel = new LoadableDetachableModel<>() {@Overrideprotected List<DiffEntryFacade> load() {@@ -130,19 +146,19 @@ public abstract class RevisionDiffPanel extends Panel {AnyObjectId newRevId = getProject().getObjectId(newRev, true);return getGitService().diff(getProject(), oldRevId, newRevId);}-+};- private IModel<List<BlobChange>> totalChangesModel = new LoadableDetachableModel<List<BlobChange>>() {+ private IModel<List<BlobChange>> totalChangesModel = new LoadableDetachableModel<>() {@Overrideprotected List<BlobChange> load() {List<DiffEntryFacade> diffEntries = diffEntriesModel.getObject();-+List<BlobChange> changes = new ArrayList<>();- for (DiffEntryFacade entry: diffEntries) {+ for (DiffEntryFacade entry : diffEntries) {ChangeType changeType;- if (entry.getChangeType() == ChangeType.RENAME+ if (entry.getChangeType() == ChangeType.RENAME&& entry.getOldPath().equals(entry.getNewPath())) {// for some unknown reason, jgit detects rename even if path// is the same@@ -152,122 +168,122 @@ public abstract class RevisionDiffPanel extends Panel {}BlobIdent oldBlobIdent = GitUtils.getOldBlobIdent(entry, oldRev);BlobIdent newBlobIdent = GitUtils.getNewBlobIdent(entry, newRev);- changes.add(newBlobChange(changeType, oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject()));+ changes.add(newBlobChange(changeType, oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject()));}-+List<BlobChange> filteredChanges = new ArrayList<>();- String patternSetString = pathFilterModel.getObject();- if (StringUtils.isNotBlank(patternSetString)) {- try {- PatternSet patternSet = PatternSet.parse(patternSetString.toLowerCase());- Matcher matcher = new PathMatcher();- for (BlobChange change: changes) {- String oldPath = change.getOldBlobIdent().path;- if (oldPath != null)- oldPath = oldPath.toLowerCase();- String newPath = change.getNewBlobIdent().path;- if (newPath != null)- newPath = newPath.toLowerCase();- if (oldPath != null && patternSet.matches(matcher, oldPath)- || newPath != null && patternSet.matches(matcher, newPath)) {- filteredChanges.add(change);- }- }- } catch (Exception e) {- error("Malformed path filter");- }- } else {- filteredChanges.addAll(changes);- }-- // for some unknown reason, some paths in the diff entries is DELETE/ADD- // pair instead MODIFICATION, here we normalize those as a single- // MODIFICATION entry- Map<String, BlobIdent> deleted = new HashMap<>();- Map<String, BlobIdent> added = new HashMap<>();- for (BlobChange change: filteredChanges) {- if (change.getType() == ChangeType.DELETE)- deleted.put(change.getPath(), change.getOldBlobIdent());- else if (change.getType() == ChangeType.ADD)- added.put(change.getPath(), change.getNewBlobIdent());- }-- List<BlobChange> normalizedChanges = new ArrayList<>();- for (BlobChange change: filteredChanges) {- BlobIdent oldBlobIdent = deleted.get(change.getPath());- BlobIdent newBlobIdent = added.get(change.getPath());- if (oldBlobIdent != null && newBlobIdent != null) {- if (change.getType() == ChangeType.DELETE) {- BlobChange normalizedChange = newBlobChange(ChangeType.MODIFY,- oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject());- normalizedChanges.add(normalizedChange);- }- } else {- normalizedChanges.add(change);- }- }-- PathComparator comparator = new PathComparator();- normalizedChanges.sort((change1, change2)->comparator.compare(change1.getPath(), change2.getPath()));-- return normalizedChanges;- }-+ String patternSetString = pathFilterModel.getObject();+ if (StringUtils.isNotBlank(patternSetString)) {+ try {+ PatternSet patternSet = PatternSet.parse(patternSetString.toLowerCase());+ Matcher matcher = new PathMatcher();+ for (BlobChange change : changes) {+ String oldPath = change.getOldBlobIdent().path;+ if (oldPath != null)+ oldPath = oldPath.toLowerCase();+ String newPath = change.getNewBlobIdent().path;+ if (newPath != null)+ newPath = newPath.toLowerCase();+ if (oldPath != null && patternSet.matches(matcher, oldPath)+ || newPath != null && patternSet.matches(matcher, newPath)) {+ filteredChanges.add(change);+ }+ }+ } catch (Exception e) {+ error("Malformed path filter");+ }+ } else {+ filteredChanges.addAll(changes);+ }++ // for some unknown reason, some paths in the diff entries is DELETE/ADD+ // pair instead MODIFICATION, here we normalize those as a single+ // MODIFICATION entry+ Map<String, BlobIdent> deleted = new HashMap<>();+ Map<String, BlobIdent> added = new HashMap<>();+ for (BlobChange change : filteredChanges) {+ if (change.getType() == ChangeType.DELETE)+ deleted.put(change.getPath(), change.getOldBlobIdent());+ else if (change.getType() == ChangeType.ADD)+ added.put(change.getPath(), change.getNewBlobIdent());+ }++ List<BlobChange> normalizedChanges = new ArrayList<>();+ for (BlobChange change : filteredChanges) {+ BlobIdent oldBlobIdent = deleted.get(change.getPath());+ BlobIdent newBlobIdent = added.get(change.getPath());+ if (oldBlobIdent != null && newBlobIdent != null) {+ if (change.getType() == ChangeType.DELETE) {+ BlobChange normalizedChange = newBlobChange(ChangeType.MODIFY,+ oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject());+ normalizedChanges.add(normalizedChange);+ }+ } else {+ normalizedChanges.add(change);+ }+ }++ PathComparator comparator = new PathComparator();+ normalizedChanges.sort((change1, change2) -> comparator.compare(change1.getPath(), change2.getPath()));++ return normalizedChanges;+ }+};- private final IModel<List<BlobChange>> displayChangesModel = new LoadableDetachableModel<List<BlobChange>>() {+ private final IModel<List<BlobChange>> displayChangesModel = new LoadableDetachableModel<>() {@Overrideprotected List<BlobChange> load() {- List<BlobChange> diffChanges = new ArrayList<>();- if (getTotalChanges().size() > WebConstants.MAX_DIFF_FILES)+ List<BlobChange> diffChanges;+ if (getTotalChanges().size() > WebConstants.MAX_DIFF_FILES)diffChanges = getTotalChanges().subList(0, WebConstants.MAX_DIFF_FILES);- else+ elsediffChanges = getTotalChanges();-- List<BlobChange> displayChanges = new ArrayList<>();- int totalChangedLines = 0;- for (BlobChange change: diffChanges) {- int changedLines = change.getAdditions() + change.getDeletions();- /*- * we do not count large diff in a single file in order to- * display smaller diffs from different files as many as- * possible- */- if (changedLines <= WebConstants.MAX_SINGLE_DIFF_LINES) {- totalChangedLines += changedLines;- if (totalChangedLines <= WebConstants.MAX_TOTAL_DIFF_LINES)- displayChanges.add(change);- else- break;- } else {- /*- * large diff in a single file will not be displayed, but- * we still add it into the list as otherwise we may- * incorrectly display the "too many changed files" warning- */- displayChanges.add(change);- }- }- return displayChanges;- }-- };-- private final IModel<List<PendingSuggestionApply>> pendingSuggestionAppliesModel =- new LoadableDetachableModel<List<PendingSuggestionApply>>() {- @Override- protected List<PendingSuggestionApply> load() {- return OneDev.getInstance(PendingSuggestionApplyManager.class)- .query(SecurityUtils.getAuthUser(), getPullRequest());+ List<BlobChange> displayChanges = new ArrayList<>();+ int totalChangedLines = 0;+ for (BlobChange change : diffChanges) {+ int changedLines = change.getAdditions() + change.getDeletions();+ /*+ * we do not count large diff in a single file in order to+ * display smaller diffs from different files as many as+ * possible+ */+ if (changedLines <= WebConstants.MAX_SINGLE_DIFF_LINES) {+ totalChangedLines += changedLines;+ if (totalChangedLines <= WebConstants.MAX_TOTAL_DIFF_LINES)+ displayChanges.add(change);+ else+ break;+ } else {+ /*+ * large diff in a single file will not be displayed, but+ * we still add it into the list as otherwise we may+ * incorrectly display the "too many changed files" warning+ */+ displayChanges.add(change);+ }+ }+ return displayChanges;}-+};- private float commentWidth = 360;+ private final IModel<List<PendingSuggestionApply>> pendingSuggestionAppliesModel =+ new LoadableDetachableModel<>() {++ @Override+ protected List<PendingSuggestionApply> load() {+ return OneDev.getInstance(PendingSuggestionApplyManager.class)+ .query(SecurityUtils.getAuthUser(), getPullRequest());+ }++ };private WebMarkupContainer commentContainer;++ private WebMarkupContainer navigationContainer;private ListView<BlobChange> diffsView;@@ -319,6 +335,7 @@ public abstract class RevisionDiffPanel extends Panel {private void doFilter(AjaxRequestTarget target) {body.replace(commentContainer = newCommentContainer());+ body.replace(navigationContainer = newNavigationContainer());target.add(body);}@@ -637,12 +654,21 @@ public abstract class RevisionDiffPanel extends Panel {add(pathFilterForm);+ add(new AjaxLink<Void>("toggleNavigation") {+ @Override+ public void onClick(AjaxRequestTarget target) {+ toggleNavigation(target);+ }++ });+body = new WebMarkupContainer("body");body.setOutputMarkupId(true);add(body);body.add(new FencedFeedbackPanel("feedback", this));body.add(commentContainer = newCommentContainer());+ body.add(navigationContainer = newNavigationContainer());body.add(new Label("tooManyFiles", new AbstractReadOnlyModel<String>() {@@ -661,29 +687,32 @@ public abstract class RevisionDiffPanel extends Panel {});- body.add(diffsView = new ListView<BlobChange>("diffs", new AbstractReadOnlyModel<List<BlobChange>>() {+ body.add(diffsView = new ListView<>("diffs", new AbstractReadOnlyModel<List<BlobChange>>() {@Overridepublic List<BlobChange> getObject() {return getDisplayChanges();}-+}) {@Overrideprotected void populateItem(ListItem<BlobChange> item) {BlobChange change = item.getModelObject();item.setMarkupId("diff-" + encodePath(change.getPath()));- item.add(new BlobDiffPanel("diff", change, viewMode, getBlobBlameModel(change)) {+ var diffPanel = new BlobDiffPanel("diff", change, viewMode, getBlobBlameModel(change)) {@Overrideprotected PullRequest getPullRequest() {return RevisionDiffPanel.this.getPullRequest();}-- });++ };+ item.add(diffPanel);+ if (change.getOldBlobIdent().path != null && !change.getOldBlobIdent().path.equals(change.getPath()))+ diffPanel.setMarkupId("diff-" + encodePath(change.getOldBlobIdent().path));}-+});add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {@@ -697,6 +726,32 @@ public abstract class RevisionDiffPanel extends Panel {setOutputMarkupId(true);}++ private void toggleNavigation(AjaxRequestTarget target) {+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();+ Cookie cookie;+ if (navigationContainer.isVisible()) {+ cookie = new Cookie(COOKIE_NAVIGATION, "no");+ navigationContainer.setVisible(false);+ } else {+ cookie = new Cookie(COOKIE_NAVIGATION, "yes");+ navigationContainer.setVisible(true);+ }+ cookie.setPath("/");+ cookie.setMaxAge(Integer.MAX_VALUE);+ response.addCookie(cookie);+ target.add(navigationContainer);+ target.appendJavaScript("onedev.server.revisionDiff.onToggleNavigation();");+ }++ private boolean isNavigationVisibleInitially() {+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(COOKIE_NAVIGATION);+ if (cookie != null)+ return cookie.getValue().equals("yes");+ else+ return !WicketUtils.isDevice();+ }private List<BlobChange> getTotalChanges() {return totalChangesModel.getObject();@@ -1196,36 +1251,174 @@ public abstract class RevisionDiffPanel extends Panel {return OneDev.getInstance(GitService.class);}- private WebMarkupContainer newCommentContainer() {- WebMarkupContainer commentContainer = new WebMarkupContainer("comment", Model.of((Mark)null)) {+ private WebMarkupContainer newNavigationContainer() {+ WebMarkupContainer navigationContainer = new WebMarkupContainer("navigation") {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionDiff.initComment();"));+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionDiff.initNavigation();"));}};- commentContainer.setOutputMarkupPlaceholderTag(true);+ navigationContainer.setOutputMarkupPlaceholderTag(true);+ navigationContainer.setVisible(isNavigationVisibleInitially());++ float navigationWidth = 360;+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(COOKIE_NAVIGATION_WIDTH);+ // cookie will not be sent for websocket request+ if (cookie != null)+ navigationWidth = Float.parseFloat(cookie.getValue());++ navigationContainer.add(AttributeAppender.append("style", "width:" + navigationWidth + "px"));- commentContainer.add(AttributeAppender.append("style", new LoadableDetachableModel<String>() {+ var paths = new TreeSet<String>();+ var treeState = new HashSet<String>();+ for (var change: getDisplayChanges()) {+ for (var path: change.getPaths()) {+ paths.add(path);+ var parent = Paths.get(path).getParent();+ while (parent != null) {+ treeState.add(parent + "/");+ parent = parent.getParent();+ }+ }+ }++ navigationContainer.add(new NestedTree<String>("content", new ITreeProvider<>() {++ @Override+ public Iterator<? extends String> getRoots() {+ return RevisionDiffPanel.this.getChildren(paths, "").iterator();+ }@Override- protected String load() {- WebRequest request = (WebRequest) RequestCycle.get().getRequest();- Cookie cookie = request.getCookie(COOKIE_COMMENT_WIDTH);- // cookie will not be sent for websocket request- if (cookie != null)- commentWidth = Float.parseFloat(cookie.getValue());- return "width:" + commentWidth + "px";+ public boolean hasChildren(String node) {+ return node.endsWith("/");+ }++ @Override+ public Iterator<? extends String> getChildren(String node) {+ return RevisionDiffPanel.this.getChildren(paths, node).iterator();+ }++ @Override+ public IModel<String> model(String object) {+ return Model.of(object);+ }++ @Override+ public void detach() {}- }));+ }, Model.ofSet(treeState)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new HumanTheme());+ }++ @Override+ protected Component newContentComponent(String id, IModel<String> model) {+ var path = model.getObject();+ var fragment = new Fragment(id, "navTreeNodeFrag", RevisionDiffPanel.this);+ WebMarkupContainer link;+ if (path.endsWith("/")) {+ link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (getState(path) == State.EXPANDED)+ collapse(path);+ else+ expand(path);+ }+ };+ link.add(new SpriteImage("icon", "folder"));+ } else {+ link = new WebMarkupContainer("link");+ link.add(AttributeModifier.replace("href", "#diff-" + encodePath(path)));+ link.add(new SpriteImage("icon", "diff2"));+ }++ link.add(new Label("label", new LoadableDetachableModel<String>() {+ @Override+ protected String load() {+ String label = path;+ var branchItem = fragment.getParent().getParent().findParent(BranchItem.class);+ if (branchItem != null) {+ var parentPath = (String) branchItem.getModelObject();+ label = path.substring(parentPath.length());+ }+ return StringUtils.stripEnd(label, "/");+ }+ }));+ fragment.add(link);++ return fragment;+ }+ });+ return navigationContainer;+ }++ public static List<String> getChildren(Collection<String> sortedPaths, String currentPath) {+ List<String> children = new ArrayList<>();+ for (var path: sortedPaths) {+ if (path.startsWith(currentPath)) {+ var childPath = path.substring(currentPath.length());+ if (children.isEmpty()) {+ children.add(childPath);+ } else {+ var lastChildPath = children.get(children.size()-1);+ var lastChildPathSegments = Splitter.on('/').splitToList(lastChildPath);+ var childPathSegments = Splitter.on('/').splitToList(childPath);+ int index = 0;+ while (true) {+ if (index<lastChildPathSegments.size()-1 && index<childPathSegments.size()-1+ && lastChildPathSegments.get(index).equals(childPathSegments.get(index))) {+ index++;+ } else {+ break;+ }+ }+ if (index != 0)+ children.set(children.size()-1, Joiner.on('/').join(childPathSegments.subList(0, index)) + "/");+ else+ children.add(childPath);+ }+ }+ }+ return children.stream().map(it->currentPath+it).collect(toList());+ }++ private WebMarkupContainer newCommentContainer() {+ WebMarkupContainer commentContainer = new WebMarkupContainer("comment", Model.of((Mark)null)) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionDiff.initComment();"));+ }++ };+ commentContainer.setOutputMarkupPlaceholderTag(true);++ float commentWidth = 360;+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(COOKIE_COMMENT_WIDTH);+ // cookie will not be sent for websocket request+ if (cookie != null)+ commentWidth = Float.parseFloat(cookie.getValue());++ commentContainer.add(AttributeAppender.append("style", "width:" + commentWidth + "px"));+WebMarkupContainer head = new WebMarkupContainer("head");head.setOutputMarkupId(true);commentContainer.add(head);-+head.add(new WebMarkupContainer("outdated") {@Override@@ -1233,44 +1426,44 @@ public abstract class RevisionDiffPanel extends Panel {super.onConfigure();setVisible(commentContainer.getDefaultModelObject() == null);}-+});-+head.add(new Label("status", new LoadableDetachableModel<String>() {@Overrideprotected String load() {if (annotationSupport.getOpenComment().isResolved()) {return String.format(- "<svg class='icon text-success mr-1'><use xlink:href='%s'/></svg>",+ "<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>",+ "<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>() {@Overridepublic String getObject() {- if (annotationSupport.getOpenComment().isResolved())+ if (annotationSupport.getOpenComment().isResolved())return "Resolved";- else+ elsereturn "Unresolved";}-+}));-+add(new ChangeObserver() {-+@Overridepublic Collection<String> findObservables() {Set<String> observables = new HashSet<>();@@ -1278,7 +1471,7 @@ public abstract class RevisionDiffPanel extends Panel {observables.add(CodeComment.getChangeObservable(annotationSupport.getOpenComment().getId()));return observables;}-+});setEscapeModelStrings(false);}@@ -1288,9 +1481,9 @@ public abstract class RevisionDiffPanel extends Panel {super.onConfigure();setVisible(annotationSupport != null && annotationSupport.getOpenComment() != null);}-+}.setOutputMarkupId(true));-+head.add(new AjaxLink<Void>("locate") {@Override@@ -1310,7 +1503,7 @@ public abstract class RevisionDiffPanel extends Panel {}}.setOutputMarkupId(true));-+head.add(new AjaxLink<Void>("close") {@Override@@ -1318,27 +1511,27 @@ public abstract class RevisionDiffPanel extends Panel {super.updateAjaxAttributes(attributes);attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));}-+@Overridepublic void onClick(AjaxRequestTarget target) {CodeComment comment = annotationSupport.getOpenComment();clearComment(target);if (comment != null) {BlobDiffPanel blobDiffPanel = getBlobDiffPanel(comment.getMark().getPath());- if (blobDiffPanel != null)+ if (blobDiffPanel != null)blobDiffPanel.onCommentClosed(target);annotationSupport.onCommentClosed(target);} else {Mark mark = annotationSupport.getMark();if (mark != null) {BlobDiffPanel blobDiffPanel = getBlobDiffPanel(mark.getPath());- if (blobDiffPanel != null)+ if (blobDiffPanel != null)blobDiffPanel.unmark(target);annotationSupport.onUnmark(target);}}}-+});if (annotationSupport != null) {@@ -1356,7 +1549,7 @@ public abstract class RevisionDiffPanel extends Panel {protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {onCommentDeleted(target, comment);}-+@Overrideprotected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {annotationSupport.onSaveComment(comment);@@ -1368,23 +1561,23 @@ public abstract class RevisionDiffPanel extends Panel {reply.setCompareContext(getCompareContext());annotationSupport.onSaveCommentReply(reply);}-+@Overrideprotected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {change.setCompareContext(getCompareContext());annotationSupport.onSaveCommentStatusChange(change, note);}-+@Overrideprotected boolean isContextDifferent(CompareContext compareContext) {return RevisionDiffPanel.this.isContextDifferent(compareContext);}-+@Overrideprotected SuggestionSupport getSuggestionSupport() {return RevisionDiffPanel.this.getSuggestionSupport(getComment().getMark());}-+};commentContainer.add(commentPanel);} else {@@ -1395,7 +1588,7 @@ public abstract class RevisionDiffPanel extends Panel {commentContainer.add(new WebMarkupContainer("body"));commentContainer.setVisible(false);}-+return commentContainer;}@@ -1643,6 +1836,7 @@ public abstract class RevisionDiffPanel extends Panel {public void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new RevisionDiffResourceReference()));+ response.render(OnLoadHeaderItem.forScript("onedev.server.revisionDiff.onLoad();"));}private Set<String> getChangeObservables() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.cssindex 7451a909bc..5fcf350d2d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css@@ -50,12 +50,14 @@margin-right: 0.3rem;}-.revision-diff>.body>.detail>.comment {+.revision-diff>.body>.detail>.comment,+.revision-diff>.body>.detail>.navigation {top: 64px;max-height: calc(100vh - 64px - var(--topbar-height));}-.revision-diff>.body>.detail>.comment>.ui-resizable-handle {+.revision-diff>.body>.detail>.comment>.ui-resizable-handle,+.revision-diff>.body>.detail>.navigation>.ui-resizable-handle {border-right: 1px solid var(--light-gray);background: var(--light) url(/~icon/grip3.svg) no-repeat scroll center center;background-size: 18px 18px;@@ -64,11 +66,18 @@position: relative;right: 0;}-.dark-mode .revision-diff>.body>.detail>.comment>.ui-resizable-handle {+.dark-mode .revision-diff>.body>.detail>.comment>.ui-resizable-handle,+.dark-mode .revision-diff>.body>.detail>.navigation>.ui-resizable-handle {border-right-color: var(--dark-mode-lighter-dark);background: var(--dark-mode-light-dark) url(/~icon/dark-grip3.svg) no-repeat scroll center center;background-size: 18px 18px;}+.revision-diff>.body>.detail>.comment>.ui-resizable-handle {+ right: 0;+}+.revision-diff>.body>.detail>.navigation>.ui-resizable-handle {+ left: 0;+}.revision-diff>.body>.detail>.diffs>.diff:last-child {margin-bottom: 0 !important;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.jsindex 14018cd96d..5354b92185 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js@@ -1,4 +1,7 @@onedev.server.revisionDiff = {+ onLoad: function() {+ $(".revision-diff").scrollParent().css("scroll-padding-top", $(".revision-diff>.head").outerHeight() + "px");+ },scrollToFilesTop: function() {var $textDiffContent = $(".blob-text-diff>tbody").first();if ($textDiffContent.length != 0) {@@ -22,6 +25,24 @@ onedev.server.revisionDiff = {});}},+ initNavigation: function() {+ var $navigation = $(".revision-diff>.body>.detail>.navigation");+ if ($navigation.is(":visible")) {+ var $navigationResizeHandle = $navigation.children(".ui-resizable-handle");+ $navigation.resizable({+ autoHide: false,+ handles: {"e": $navigationResizeHandle},+ minWidth: 200,+ stop: function(e, ui) {+ Cookies.set("revisionDiff.navigation.width", ui.size.width, {expires: Infinity});+ }+ });+ }+ },+ onToggleNavigation: function() {+ $(".navigation-toggle").prop("checked", $(".revision-diff>.body>.detail>.navigation").is(":visible"));+ $(window).resize();+ },onSuggestionBatchChanged: function() {var $batch = $(".revision-diff .batched-suggestions");$batch.removeClass("btn-light");diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex dab4cf9ce5..a6f50343ec 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -209,7 +209,7 @@color: inherit;}-.insert-url .blob-picker {+.insert-url .blob-selector {padding: 0;}.insert-url .attachment {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.javaindex d77c03f6df..662c10994c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java@@ -1,355 +1,364 @@-package io.onedev.server.web.page.project.blob.navigator;--import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxChannel;-import org.apache.wicket.ajax.AjaxChannel.Type;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;-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.theme.HumanTheme;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.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.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;--import com.google.common.base.Splitter;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.BlobIdentFilter;-import io.onedev.server.git.GitUtils;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.ajaxlistener.TrackViewStateListener;-import io.onedev.server.web.asset.dropdowntriangleindicator.DropdownTriangleIndicatorCssResourceReference;-import io.onedev.server.web.behavior.CtrlAwareOnClickAjaxBehavior;-import io.onedev.server.web.component.blob.BlobIcon;-import io.onedev.server.web.component.floating.AlignPlacement;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;--@SuppressWarnings("serial")-public class BlobNavigator extends Panel {-- private final static String LAST_SEGMENT_ID = "lastSegment";-- private final BlobRenderContext context;-- private TextField<String> nameInput;-- public BlobNavigator(String id, BlobRenderContext context) {- super(id);-- this.context = context;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ListView<BlobIdent>("treeSegments", new LoadableDetachableModel<List<BlobIdent>>() {-- @Override- protected List<BlobIdent> load() {- BlobIdent file = context.getBlobIdent();- List<BlobIdent> treeSegments = new ArrayList<>();- treeSegments.add(new BlobIdent(file.revision, null, FileMode.TREE.getBits()));-- if (file.path != null) {- List<String> segments = Splitter.on('/').omitEmptyStrings().splitToList(file.path);-- for (int i=0; i<segments.size(); i++) {- BlobIdent parent = treeSegments.get(treeSegments.size()-1);- int treeMode = FileMode.TREE.getBits();- if (i<segments.size()-1 || file.mode == treeMode) {- String treePath = segments.get(i);- if (parent.path != null)- treePath = parent.path + "/" + treePath;- treeSegments.add(new BlobIdent(file.revision, treePath, treeMode));- }- }- }-- return treeSegments;- }-- }) {-- @Override- protected void populateItem(final ListItem<BlobIdent> item) {- final BlobIdent blobIdent = item.getModelObject();- WebMarkupContainer link = new WebMarkupContainer("link") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);- tag.put("href", urlFor(ProjectBlobPage.class, params));- }-- };-- link.add(new CtrlAwareOnClickAjaxBehavior() {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.setPreventDefault(true);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- attributes.getAjaxCallListeners().add(new TrackViewStateListener(false));- }-- @Override- protected void respond(AjaxRequestTarget target) {- context.onSelect(target, blobIdent, null);- }-- });-- link.setEnabled(!context.getBlobIdent().isTree() || item.getIndex() != getViewSize()-1);-- if (blobIdent.path != null) {- if (blobIdent.path.indexOf('/') != -1)- link.add(new Label("label", StringUtils.substringAfterLast(blobIdent.path, "/")));- else- link.add(new Label("label", blobIdent.path));- } else {- link.add(new Label("label", "ROOT"));- }-- item.add(link);-- item.add(new DropdownLink("subtreeDropdownTrigger", AlignPlacement.bottom(6)) {-- @Override- protected void onInitialize(FloatingPanel dropdown) {- super.onInitialize(dropdown);- dropdown.add(AttributeAppender.append("class", "subtree-dropdown"));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- return new NestedTree<BlobIdent>(id, new ITreeProvider<BlobIdent>() {-- @Override- public void detach() {- }-- @Override- public Iterator<? extends BlobIdent> getRoots() {- if (blobIdent.revision != null)- return context.getProject().getBlobChildren(blobIdent, BlobIdentFilter.ALL).iterator();- else- return new ArrayList<BlobIdent>().iterator();- }-- @Override- public boolean hasChildren(BlobIdent blobIdent) {- return blobIdent.isTree();- }-- @Override- public Iterator<? extends BlobIdent> getChildren(BlobIdent blobIdent) {- return context.getProject().getBlobChildren(blobIdent, BlobIdentFilter.ALL).iterator();- }-- @Override- public IModel<BlobIdent> model(BlobIdent blobIdent) {- return Model.of(blobIdent);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new HumanTheme());- }-- @Override- public void expand(BlobIdent blobIdent) {- super.expand(blobIdent);-- List<BlobIdent> children = context.getProject().getBlobChildren(blobIdent, BlobIdentFilter.ALL);- if (children.size() == 1 && children.get(0).isTree())- expand(children.get(0));- }-- @Override- protected Component newContentComponent(String id, final IModel<BlobIdent> model) {- BlobIdent blobIdent = model.getObject();- Fragment fragment = new Fragment(id, "treeNodeFrag", BlobNavigator.this);-- WebMarkupContainer link = new WebMarkupContainer("link") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);-- ProjectBlobPage.State state = new ProjectBlobPage.State(model.getObject());- PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);- tag.put("href", urlFor(ProjectBlobPage.class, params));- }-- };-- link.add(new CtrlAwareOnClickAjaxBehavior() {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.setPreventDefault(true);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- attributes.getAjaxCallListeners().add(new TrackViewStateListener(false));- }-- @Override- protected void respond(AjaxRequestTarget target) {- context.onSelect(target, model.getObject(), null);- dropdown.close();- }-- });-- link.add(new BlobIcon("icon", model));-- if (blobIdent.path.indexOf('/') != -1)- link.add(new Label("label", StringUtils.substringAfterLast(blobIdent.path, "/")));- else- link.add(new Label("label", blobIdent.path));- fragment.add(link);-- return fragment;- }-- };- }-- });- }-- });-- WebMarkupContainer lastSegment;- BlobIdent file = context.getBlobIdent();- if (context.getMode() == Mode.EDIT || context.getMode() == Mode.ADD) {- lastSegment = new Fragment(LAST_SEGMENT_ID, "nameEditFrag", this);-- Form<?> form = new Form<Void>("form");- lastSegment.add(form);- String name;- if (context.getMode() == Mode.ADD)- name = context.getInitialNewPath();- else if (file.path.contains("/"))- name = StringUtils.substringAfterLast(file.path, "/");- else if (file.path.equals(".onedev-buildspec"))- name = BuildSpec.BLOB_PATH;- else- name = file.path;-- nameInput = new TextField<String>("input", Model.of(name));- form.add(nameInput);- nameInput.add(new AjaxFormSubmitBehavior(form, "input") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.setChannel(new AjaxChannel("blob-name-edit", Type.DROP));- }-- @Override- protected void onSubmit(AjaxRequestTarget target) {- super.onSubmit(target);- send(getPage(), Broadcast.BREADTH, new BlobNameChanging(target));- }-- });-- if (context.getMode() != Mode.ADD)- nameInput.add(AttributeAppender.append("class", "no-autofocus"));- lastSegment.add(AttributeAppender.append("class", "input"));- } else if (file.isTree()) {- lastSegment = new WebMarkupContainer(LAST_SEGMENT_ID);- lastSegment.setVisible(false);- } else {- lastSegment = new Fragment(LAST_SEGMENT_ID, "blobNameFrag", this);-- String blobName = file.path;- if (blobName.contains("/"))- blobName = StringUtils.substringAfterLast(blobName, "/");- lastSegment.add(new Label("label", blobName));- }- add(lastSegment);-- setOutputMarkupId(true);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new DropdownTriangleIndicatorCssResourceReference()));- response.render(CssHeaderItem.forReference(new BlobNavigatorResourceReference()));-- if (context.getBlobIdent().isTree()) {- String script = String.format("$('#%s input[type=text]').focus();", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- String script = String.format("$('#%s form').submit(false);", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- @Nullable- public String getNewPath() {- if (nameInput != null) {- String newPath;- String name = nameInput.getModelObject();- if (StringUtils.isNotBlank(name)) {- if (context.getBlobIdent().isTree()) {- if (context.getBlobIdent().path != null)- newPath = context.getBlobIdent().path + "/" + name;- else- newPath = name;- } else {- if (context.getBlobIdent().path.contains("/"))- newPath = StringUtils.substringBeforeLast(context.getBlobIdent().path, "/") + "/" + name;- else- newPath = name;- }- return GitUtils.normalizePath(newPath);- } else {- return null;- }- } else {- throw new IllegalStateException();- }- }--}+package io.onedev.server.web.page.project.blob.navigator;++import com.google.common.base.Splitter;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.BlobIdentFilter;+import io.onedev.server.git.GitUtils;+import io.onedev.server.util.ChildrenAggregator;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.ajaxlistener.TrackViewStateListener;+import io.onedev.server.web.asset.dropdowntriangleindicator.DropdownTriangleIndicatorCssResourceReference;+import io.onedev.server.web.behavior.CtrlAwareOnClickAjaxBehavior;+import io.onedev.server.web.component.blob.BlobIcon;+import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxChannel;+import org.apache.wicket.ajax.AjaxChannel.Type;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;+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.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+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.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++@SuppressWarnings("serial")+public class BlobNavigator extends Panel {++ private final static String LAST_SEGMENT_ID = "lastSegment";++ private final BlobRenderContext context;++ private TextField<String> nameInput;++ public BlobNavigator(String id, BlobRenderContext context) {+ super(id);++ this.context = context;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ListView<BlobIdent>("treeSegments", new LoadableDetachableModel<List<BlobIdent>>() {++ @Override+ protected List<BlobIdent> load() {+ BlobIdent file = context.getBlobIdent();+ List<BlobIdent> treeSegments = new ArrayList<>();+ treeSegments.add(new BlobIdent(file.revision, null, FileMode.TREE.getBits()));++ if (file.path != null) {+ List<String> segments = Splitter.on('/').omitEmptyStrings().splitToList(file.path);++ for (int i=0; i<segments.size(); i++) {+ BlobIdent parent = treeSegments.get(treeSegments.size()-1);+ int treeMode = FileMode.TREE.getBits();+ if (i<segments.size()-1 || file.mode == treeMode) {+ String treePath = segments.get(i);+ if (parent.path != null)+ treePath = parent.path + "/" + treePath;+ treeSegments.add(new BlobIdent(file.revision, treePath, treeMode));+ }+ }+ }++ return treeSegments;+ }++ }) {++ @Override+ protected void populateItem(final ListItem<BlobIdent> item) {+ final BlobIdent blobIdent = item.getModelObject();+ WebMarkupContainer link = new WebMarkupContainer("link") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);+ tag.put("href", urlFor(ProjectBlobPage.class, params));+ }++ };++ link.add(new CtrlAwareOnClickAjaxBehavior() {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.setPreventDefault(true);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ attributes.getAjaxCallListeners().add(new TrackViewStateListener(false));+ }++ @Override+ protected void respond(AjaxRequestTarget target) {+ context.onSelect(target, blobIdent, null);+ }++ });++ link.setEnabled(!context.getBlobIdent().isTree() || item.getIndex() != getViewSize()-1);++ if (blobIdent.path != null) {+ if (blobIdent.path.indexOf('/') != -1)+ link.add(new Label("label", StringUtils.substringAfterLast(blobIdent.path, "/")));+ else+ link.add(new Label("label", blobIdent.path));+ } else {+ link.add(new Label("label", "ROOT"));+ }++ item.add(link);++ item.add(new DropdownLink("subtreeDropdownTrigger", AlignPlacement.bottom(6)) {++ @Override+ protected void onInitialize(FloatingPanel dropdown) {+ super.onInitialize(dropdown);+ dropdown.add(AttributeAppender.append("class", "subtree-dropdown"));+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ var childrenAggregator = new ChildrenAggregator<BlobIdent>() {++ @Override+ protected List<BlobIdent> getChildren(BlobIdent node) {+ if (blobIdent.isTree())+ return context.getProject().getBlobChildren(node, BlobIdentFilter.ALL);+ else+ return new ArrayList<>();+ }++ };+ return new NestedTree<BlobIdent>(id, new ITreeProvider<BlobIdent>() {++ @Override+ public void detach() {+ }++ @Override+ public Iterator<? extends BlobIdent> getRoots() {+ if (blobIdent.revision != null)+ return childrenAggregator.getAggregatedChildren(blobIdent).iterator();+ else+ return new ArrayList<BlobIdent>().iterator();+ }++ @Override+ public boolean hasChildren(BlobIdent blobIdent) {+ return blobIdent.isTree();+ }++ @Override+ public Iterator<? extends BlobIdent> getChildren(BlobIdent blobIdent) {+ return childrenAggregator.getAggregatedChildren(blobIdent).iterator();+ }++ @Override+ public IModel<BlobIdent> model(BlobIdent blobIdent) {+ return Model.of(blobIdent);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new HumanTheme());+ }++ @Override+ protected Component newContentComponent(String id, final IModel<BlobIdent> model) {+ BlobIdent currentBlobIdent = model.getObject();+ Fragment fragment = new Fragment(id, "treeNodeFrag", BlobNavigator.this);++ WebMarkupContainer link = new WebMarkupContainer("link") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ ProjectBlobPage.State state = new ProjectBlobPage.State(model.getObject());+ PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);+ tag.put("href", urlFor(ProjectBlobPage.class, params));+ }++ };++ link.add(new CtrlAwareOnClickAjaxBehavior() {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.setPreventDefault(true);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ attributes.getAjaxCallListeners().add(new TrackViewStateListener(false));+ }++ @Override+ protected void respond(AjaxRequestTarget target) {+ context.onSelect(target, model.getObject(), null);+ dropdown.close();+ }++ });++ link.add(new BlobIcon("icon", model));+ link.add(new Label("label", new LoadableDetachableModel<String>() {+ @Override+ protected String load() {+ var label = currentBlobIdent.path;+ var parentBlobIdent = blobIdent;+ var branchItem = fragment.getParent().getParent().findParent(BranchItem.class);+ if (branchItem != null) {+ parentBlobIdent = (BlobIdent) branchItem.getModelObject();+ label = label.substring(parentBlobIdent.path.length() + 1);+ }+ return label;+ }+ }));+ fragment.add(link);++ return fragment;+ }++ };+ }++ });+ }++ });++ WebMarkupContainer lastSegment;+ BlobIdent file = context.getBlobIdent();+ if (context.getMode() == Mode.EDIT || context.getMode() == Mode.ADD) {+ lastSegment = new Fragment(LAST_SEGMENT_ID, "nameEditFrag", this);++ Form<?> form = new Form<Void>("form");+ lastSegment.add(form);+ String name;+ if (context.getMode() == Mode.ADD)+ name = context.getInitialNewPath();+ else if (file.path.contains("/"))+ name = StringUtils.substringAfterLast(file.path, "/");+ else if (file.path.equals(".onedev-buildspec"))+ name = BuildSpec.BLOB_PATH;+ else+ name = file.path;++ nameInput = new TextField<String>("input", Model.of(name));+ form.add(nameInput);+ nameInput.add(new AjaxFormSubmitBehavior(form, "input") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.setChannel(new AjaxChannel("blob-name-edit", Type.DROP));+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);+ send(getPage(), Broadcast.BREADTH, new BlobNameChanging(target));+ }++ });++ if (context.getMode() != Mode.ADD)+ nameInput.add(AttributeAppender.append("class", "no-autofocus"));+ lastSegment.add(AttributeAppender.append("class", "input"));+ } else if (file.isTree()) {+ lastSegment = new WebMarkupContainer(LAST_SEGMENT_ID);+ lastSegment.setVisible(false);+ } else {+ lastSegment = new Fragment(LAST_SEGMENT_ID, "blobNameFrag", this);++ String blobName = file.path;+ if (blobName.contains("/"))+ blobName = StringUtils.substringAfterLast(blobName, "/");+ lastSegment.add(new Label("label", blobName));+ }+ add(lastSegment);++ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new DropdownTriangleIndicatorCssResourceReference()));+ response.render(CssHeaderItem.forReference(new BlobNavigatorResourceReference()));++ if (context.getBlobIdent().isTree()) {+ String script = String.format("$('#%s input[type=text]').focus();", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ String script = String.format("$('#%s form').submit(false);", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ @Nullable+ public String getNewPath() {+ if (nameInput != null) {+ String newPath;+ String name = nameInput.getModelObject();+ if (StringUtils.isNotBlank(name)) {+ if (context.getBlobIdent().isTree()) {+ if (context.getBlobIdent().path != null)+ newPath = context.getBlobIdent().path + "/" + name;+ else+ newPath = name;+ } else {+ if (context.getBlobIdent().path.contains("/"))+ newPath = StringUtils.substringBeforeLast(context.getBlobIdent().path, "/") + "/" + name;+ else+ newPath = name;+ }+ return GitUtils.normalizePath(newPath);+ } else {+ return null;+ }+ } else {+ throw new IllegalStateException();+ }+ }++}diff --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 3e22753e40..3d0a7ff6db 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@@ -16,13 +16,7 @@<div class="code flex-grow-1 autofit overflow-hidden d-flex flex-column resize-aware"></div><div wicket:id="outline" class="outline need-width d-flex overflow-hidden flex-shrink-0"><div class="ui-resizable-handle ui-resizable-w flex-shrink-0"></div>- <div class="content flex-grow-1 overflow-hidden d-flex flex-column">- <div class="head d-flex align-items-center px-3 py-2 flex-shrink-0 border-bottom">- <h6 class="mb-0 mr-auto">Outline</h6>- <a wicket:id="close" class="text-muted text-hover-primary ml-3" title="Close"><wicket:svg href="times" class="icon"></wicket:svg></a>- </div>- <div wicket:id="body" class="body overflow-auto flex-grow-1"></div>- </div>+ <div wicket:id="content" class="content flex-grow-1 overflow-auto d-flex"></div></div></div><div wicket:id="symbolTooltip"></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 36767e4855..317bedd367 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@@ -160,7 +160,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprivate WebMarkupContainer commentContainer;- private WebMarkupContainer outline;+ private WebMarkupContainer outlineContainer;private SourceFormatPanel sourceFormat;@@ -242,17 +242,17 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprivate void toggleOutline(AjaxRequestTarget target) {WebResponse response = (WebResponse) RequestCycle.get().getResponse();Cookie cookie;- if (outline.isVisible()) {+ if (outlineContainer.isVisible()) {cookie = new Cookie(COOKIE_OUTLINE, "no");- outline.setVisible(false);+ outlineContainer.setVisible(false);} else {cookie = new Cookie(COOKIE_OUTLINE, "yes");- outline.setVisible(true);+ outlineContainer.setVisible(true);}cookie.setPath("/");cookie.setMaxAge(Integer.MAX_VALUE);response.addCookie(cookie);- target.add(outline);+ target.add(outlineContainer);target.appendJavaScript("onedev.server.sourceView.onToggleOutline();");}@@ -707,7 +707,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}if (closest != null) {@SuppressWarnings("unchecked")- NestedTree<Symbol> tree = (NestedTree<Symbol>) outline.get("body");+ NestedTree<Symbol> tree = (NestedTree<Symbol>) outlineContainer.get("content");Symbol current = closest;while (current != null) {tree.expand(current);@@ -731,7 +731,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}});- outline = new WebMarkupContainer("outline") {+ outlineContainer = new WebMarkupContainer("outline") {@Overridepublic void renderHead(IHeaderResponse response) {@@ -748,18 +748,10 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearelseoutlineWidth = 300;- outline.add(AttributeAppender.append("style", "width:" + outlineWidth + "px"));- outline.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- toggleOutline(target);- }-- });+ outlineContainer.add(AttributeAppender.append("style", "width:" + outlineWidth + "px"));IModel<HashSet<Symbol>> state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));- NestedTree<Symbol> tree = new NestedTree<Symbol>("body", newSymbolTreeProvider(symbols), state) {+ NestedTree<Symbol> tree = new NestedTree<Symbol>("content", newSymbolTreeProvider(symbols), state) {@Overrideprotected void onInitialize() {@@ -794,12 +786,12 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear};- outline.add(tree);+ outlineContainer.add(tree);- outline.setOutputMarkupPlaceholderTag(true);- add(outline);+ outlineContainer.setOutputMarkupPlaceholderTag(true);+ add(outlineContainer);- outline.setVisible(isOutlineVisibleInitially());+ outlineContainer.setVisible(isOutlineVisibleInitially());add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.cssindex d61e90e3a7..d1a356d33b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css@@ -38,17 +38,17 @@background: var(--dark-mode-light-dark) url(/~icon/dark-grip3.svg) no-repeat scroll center center;background-size: 18px 18px;}-.source-view>.outline>.content>.body {+.source-view>.outline>.content {padding: 0.5rem 1rem;}-.source-view>.outline>.content>.body .tree-content {+.source-view>.outline>.content .tree-content {border-radius: 4px;padding: 1px 4px 1px 3px;}-.source-view>.outline>.content>.body .tree-content.active {+.source-view>.outline>.content .tree-content.active {background: #FCF5DA;}-.dark-mode .source-view>.outline>.content>.body .tree-content.active {+.dark-mode .source-view>.outline>.content .tree-content.active {background: var(--dark-mode-light-warning);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.javaindex 0366cf9ec1..f24f0f31df 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java@@ -1,11 +1,12 @@package io.onedev.server.web.page.project.builds.detail.artifacts;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ChildrenAggregator;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.Pair;import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.artifact.FileInfo;@@ -93,14 +94,14 @@ public class BuildArtifactsPage extends BuildDetailPage {});- List<IColumn<ArtifactInfo, Void>> columns = new ArrayList<>();+ List<IColumn<Pair<String, ArtifactInfo>, Void>> columns = new ArrayList<>();columns.add(new TreeColumn<>(Model.of("Name")));columns.add(new AbstractColumn<>(Model.of("Size")) {@Override- public void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {- ArtifactInfo artifact = rowModel.getObject();+ public void populateItem(Item<ICellPopulator<Pair<String, ArtifactInfo>>> cellItem, String componentId, IModel<Pair<String, ArtifactInfo>> rowModel) {+ var artifact = rowModel.getObject().getRight();if (artifact instanceof DirectoryInfo) {cellItem.add(new Label(componentId, ""));} else {@@ -114,8 +115,8 @@ public class BuildArtifactsPage extends BuildDetailPage {columns.add(new AbstractColumn<>(Model.of("Last Modified")) {@Override- public void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {- ArtifactInfo artifact = rowModel.getObject();+ public void populateItem(Item<ICellPopulator<Pair<String, ArtifactInfo>>> cellItem, String componentId, IModel<Pair<String, ArtifactInfo>> rowModel) {+ ArtifactInfo artifact = rowModel.getObject().getRight();cellItem.add(new Label(componentId, DateUtils.formatAge(new Date(artifact.getLastModified()))));}@@ -124,14 +125,14 @@ public class BuildArtifactsPage extends BuildDetailPage {columns.add(new AbstractColumn<>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {+ public void populateItem(Item<ICellPopulator<Pair<String, ArtifactInfo>>> cellItem, String componentId, IModel<Pair<String, ArtifactInfo>> rowModel) {Fragment fragment = new Fragment(componentId, "deleteFrag", BuildArtifactsPage.this);AjaxLink<?> link = new AjaxLink<Void>("link") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);String confirmMessage;- if (rowModel.getObject() instanceof DirectoryInfo)+ if (rowModel.getObject().getRight() instanceof DirectoryInfo)confirmMessage = "Do you really want to delete this directory?";elseconfirmMessage = "Do you really want to delete this file?";@@ -140,7 +141,7 @@ public class BuildArtifactsPage extends BuildDetailPage {@Overridepublic void onClick(AjaxRequestTarget target) {- getBuildManager().deleteArtifact(getBuild(), rowModel.getObject().getPath());+ getBuildManager().deleteArtifact(getBuild(), rowModel.getObject().getRight().getPath());updateArtifacts(target);}@@ -152,38 +153,57 @@ public class BuildArtifactsPage extends BuildDetailPage {});}- ITreeProvider<ArtifactInfo> dataProvider = new ITreeProvider<>() {+ var childrenAggregator = new ChildrenAggregator<ArtifactInfo>() {++ @Override+ protected List<ArtifactInfo> getChildren(ArtifactInfo node) {+ if (node != null) {+ if (node instanceof DirectoryInfo) {+ var directoryNode = (DirectoryInfo) node;+ if (directoryNode.getChildren() != null) {+ return directoryNode.getChildren();+ } else {+ directoryNode = ((DirectoryInfo) getBuildManager()+ .getArtifactInfo(getBuild(), directoryNode.getPath()));+ return directoryNode.getChildren();+ }+ } else {+ return new ArrayList<>();+ }+ } else {+ return getBuild().getRootArtifacts();+ }+ }+ };+ ITreeProvider<Pair<String, ArtifactInfo>> dataProvider = new ITreeProvider<>() {@Overridepublic void detach() {}@Override- public Iterator<? extends ArtifactInfo> getChildren(ArtifactInfo node) {- String artifactPath = node != null ? node.getPath() : null;- DirectoryInfo directory = ((DirectoryInfo) getBuildManager()- .getArtifactInfo(getBuild(), artifactPath));- return directory.getChildren().iterator();+ public Iterator<? extends Pair<String, ArtifactInfo>> getChildren(Pair<String, ArtifactInfo> node) {+ return childrenAggregator.getAggregatedChildren(node.getRight()).stream().map(it->new Pair<>(node.getRight().getPath(), it)).iterator();}@Override- public Iterator<? extends ArtifactInfo> getRoots() {- return getBuild().getRootArtifacts().iterator();+ public Iterator<? extends Pair<String, ArtifactInfo>> getRoots() {+ return childrenAggregator.getAggregatedChildren(null).stream().map(it->new Pair<String, ArtifactInfo>(null, it)).iterator();}@Override- public boolean hasChildren(ArtifactInfo node) {- return node instanceof DirectoryInfo && getChildren(node).hasNext();+ public boolean hasChildren(Pair<String, ArtifactInfo> node) {+ return node.getRight() instanceof DirectoryInfo;}@Override- public IModel<ArtifactInfo> model(ArtifactInfo object) {+ public IModel<Pair<String, ArtifactInfo>> model(Pair<String, ArtifactInfo> object) {return Model.of(object);}};- add(new TableTree<>("artifacts", columns, dataProvider, Integer.MAX_VALUE) {+ add(new TableTree<Pair<String, ArtifactInfo>, Void>("artifacts", columns, dataProvider, Integer.MAX_VALUE) {@Overrideprotected void onInitialize() {@@ -204,38 +224,24 @@ public class BuildArtifactsPage extends BuildDetailPage {}@Override- protected Item<ArtifactInfo> newRowItem(String id, int index, IModel<ArtifactInfo> model) {+ protected Item<Pair<String, ArtifactInfo>> newRowItem(String id, int index, IModel<Pair<String, ArtifactInfo>> model) {return new OddEvenItem<>(id, index, model);}@Override- public void expand(ArtifactInfo artifact) {- super.expand(artifact);-- String artifactPath = artifact != null ? artifact.getPath() : null;- DirectoryInfo directory = ((DirectoryInfo) getBuildManager()- .getArtifactInfo(getBuild(), artifactPath));- if (directory != null- && directory.getChildren().size() == 1- && directory.getChildren().get(0) instanceof DirectoryInfo) {- expand(directory.getChildren().get(0));- }- }-- @Override- protected Component newContentComponent(String id, IModel<ArtifactInfo> model) {+ protected Component newContentComponent(String id, IModel<Pair<String, ArtifactInfo>> model) {Fragment fragment = new Fragment(id, "artifactFrag", BuildArtifactsPage.this);- ArtifactInfo artifact = model.getObject();+ Pair<String, ArtifactInfo> pair = model.getObject();WebMarkupContainer link;- if (artifact instanceof DirectoryInfo) {+ if (pair.getRight() instanceof DirectoryInfo) {link = new AjaxLink<Void>("link") {@Overridepublic void onClick(AjaxRequestTarget target) {- if (getState(artifact) == State.EXPANDED)- collapse(artifact);+ if (getState(pair) == State.EXPANDED)+ collapse(pair);else- expand(artifact);+ expand(pair);}};@@ -243,15 +249,15 @@ public class BuildArtifactsPage extends BuildDetailPage {link.add(AttributeAppender.append("class", "folder"));} else {PageParameters params = ArtifactResource.paramsOf(- getBuild().getProject().getId(), getBuild().getNumber(), artifact.getPath());+ getBuild().getProject().getId(), getBuild().getNumber(), pair.getRight().getPath());link = new ResourceLink<Void>("link", new ArtifactResourceReference(), params);link.add(new SpriteImage("icon", "file"));link.add(AttributeAppender.append("class", "file"));}- String fileName = artifact.getPath();- if (fileName.contains("/"))- fileName = StringUtils.substringAfterLast(fileName, "/");- link.add(new Label("label", fileName));+ var label = pair.getRight().getPath();+ if (pair.getLeft() != null)+ label = label.substring(pair.getLeft().length()+1);+ link.add(new Label("label", label));fragment.add(link);return fragment;diff --git a/server-core/src/test/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanelTest.java b/server-core/src/test/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanelTest.javanew file mode 100644index 0000000000..d6ea89aa6a--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanelTest.java@@ -0,0 +1,31 @@+package io.onedev.server.web.component.diff.revision;++import com.google.common.collect.Lists;+import org.junit.Test;++import static com.google.common.collect.Lists.newArrayList;+import static io.onedev.server.web.component.diff.revision.RevisionDiffPanel.getChildren;+import static org.junit.Assert.*;++public class RevisionDiffPanelTest {++ @Test+ public void testGetChildren() {+ var paths = newArrayList("a/b/c", "a/b/d", "a/c", "b/c/d/e", "b/c/d/f");+ assertEquals(newArrayList("a/", "b/c/d/"), getChildren(paths, ""));+ assertEquals(newArrayList("a/b/", "a/c"), getChildren(paths, "a/"));++ paths = newArrayList("a", "a/b");+ assertEquals(newArrayList("a", "a/b"), getChildren(paths, ""));++ paths = newArrayList("a/b", "a");+ assertEquals(newArrayList("a/b", "a"), getChildren(paths, ""));++ paths = newArrayList("a/b", "a/c", "a/d");+ assertEquals(newArrayList("a/"), getChildren(paths, ""));++ paths = newArrayList("a/b/c/d", "a/b/d/e", "a/b/d/f");+ assertEquals(newArrayList("a/b/c/d", "a/b/d/"), getChildren(paths, "a/b/"));+ }++}\ No newline at end of file