The Unified and Autonomous Development Platform
Resolve relative links in markdown while rendering as html
robin shen492eb3fa5151
diff --git a/core/src/main/java/com/gitplex/server/git/BlobIdent.java b/core/src/main/java/com/gitplex/server/git/BlobIdent.javaindex b83ae6f473..2f7444f9b7 100644--- a/core/src/main/java/com/gitplex/server/git/BlobIdent.java+++ b/core/src/main/java/com/gitplex/server/git/BlobIdent.java@@ -26,9 +26,6 @@ public class BlobIdent implements Serializable, Comparable<BlobIdent> {@Nullablepublic Integer mode;- public BlobIdent() {- }-public BlobIdent(BlobIdent blobIdent) {revision = blobIdent.revision;path = blobIdent.path;@@ -41,6 +38,9 @@ public class BlobIdent implements Serializable, Comparable<BlobIdent> {this.mode = mode;}+ public BlobIdent() {+ }+public BlobIdent(Depot depot, List<String> urlSegments) {StringBuilder revisionBuilder = new StringBuilder();for (int i=0; i<urlSegments.size(); i++) {@@ -55,13 +55,21 @@ public class BlobIdent implements Serializable, Comparable<BlobIdent> {pathBuilder.append("/");pathBuilder.append(urlSegments.get(j));}- if (pathBuilder.length() != 0)+ if (pathBuilder.length() != 0) {path = pathBuilder.toString();+ mode = depot.getMode(revision, path);+ } else {+ mode = FileMode.TREE.getBits();+ }return;}}- if (revisionBuilder.length() != 0)+ if (revisionBuilder.length() != 0) {throw new ObjectNotFoundException("Revision not found: " + revisionBuilder.toString());+ } else {+ revision = depot.getDefaultBranch();+ mode = FileMode.TREE.getBits();+ }}public boolean isTree() {diff --git a/core/src/main/java/com/gitplex/server/manager/MarkdownManager.java b/core/src/main/java/com/gitplex/server/manager/MarkdownManager.javaindex 3ddbb55b9a..adced56b58 100644--- a/core/src/main/java/com/gitplex/server/manager/MarkdownManager.java+++ b/core/src/main/java/com/gitplex/server/manager/MarkdownManager.java@@ -1,6 +1,6 @@package com.gitplex.server.manager;-import com.vladsch.flexmark.util.options.MutableDataHolder;+import javax.annotation.Nullable;public interface MarkdownManager {@@ -9,12 +9,11 @@ public interface MarkdownManager {** @param markdown* markdown to be rendered- * @param postProcess- * whether or not to post-process rendered html+ ** @return* rendered html*/- String render(String markdown, boolean postProcess);+ String render(String markdown, @Nullable String baseUrl, boolean postProcess);/*** Sanitize and transform specified html.@@ -37,6 +36,4 @@ public interface MarkdownManager {*/String escape(String markdown);- MutableDataHolder getOptions();-}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.javaindex e12498540c..eb63f09706 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java@@ -187,7 +187,7 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeCommentif (event.getMarkdown() != null) {CodeComment comment = event.getComment();Collection<Account> mentionedUsers = new HashSet<>();- for (Account user: new MentionParser().parseMentions(markdownManager.render(event.getMarkdown(), false))) {+ for (Account user: new MentionParser().parseMentions(markdownManager.render(event.getMarkdown(), null, false))) {mentionedUsers.add(user);}String subject = "You are mentioned in a code comment on file " + comment.getCommentPos().getPath();diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.javaindex fd8809a9f5..b26138511a 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Set;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;@@ -18,6 +19,8 @@ import org.jsoup.safety.Whitelist;import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.util.markdown.HtmlTransformer;+import com.gitplex.server.util.markdown.RelativeUrlResolveExtension;+import com.google.common.base.Preconditions;import com.vladsch.flexmark.Extension;import com.vladsch.flexmark.ast.Node;import com.vladsch.flexmark.ext.autolink.AutolinkExtension;@@ -51,36 +54,16 @@ public class DefaultMarkdownManager implements MarkdownManager {private static final String[] SAFE_ANCHOR_SCHEMES = new String[] { "http", "https", "mailto", };private final Whitelist whiteList;++ private final Set<Extension> contributedExtensions;private final Set<HtmlTransformer> htmlTransformers;-- private final MutableDataHolder options;-- private final Parser parser;-- private final HtmlRenderer htmlRenderer;-+@Injectpublic DefaultMarkdownManager(Set<Extension> contributedExtensions, Set<HtmlTransformer> htmlTransformers) {+ this.contributedExtensions = contributedExtensions;this.htmlTransformers = htmlTransformers;- List<Extension> extensions = new ArrayList<>();- extensions.add(TablesExtension.create());- extensions.add(TaskListExtension.create());- extensions.add(DefinitionExtension.create());- extensions.add(TocExtension.create());- extensions.add(AutolinkExtension.create());- extensions.addAll(contributedExtensions);-- options = new MutableDataSet();- options.set(Parser.SPACE_IN_LINK_URLS, true).setFrom(ParserEmulationProfile.GITHUB_DOC)- .set(TablesExtension.COLUMN_SPANS, false).set(TablesExtension.APPEND_MISSING_COLUMNS, true)- .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)- .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true).set(Parser.EXTENSIONS, extensions);-- parser = Parser.builder(options).build();- htmlRenderer = HtmlRenderer.builder(options).build();-whiteList = new Whitelist() {@Override@@ -107,12 +90,36 @@ public class DefaultMarkdownManager implements MarkdownManager {}@Override- public String render(String markdown, boolean postProcess) {+ public String render(String markdown, @Nullable String baseUrl, boolean postProcess) {+ Preconditions.checkArgument(baseUrl == null || baseUrl.startsWith("/"));++ List<Extension> extensions = new ArrayList<>();+ extensions.add(TablesExtension.create());+ extensions.add(TaskListExtension.create());+ extensions.add(DefinitionExtension.create());+ extensions.add(TocExtension.create());+ extensions.add(AutolinkExtension.create());+ extensions.add(new RelativeUrlResolveExtension());+ extensions.addAll(contributedExtensions);++ MutableDataHolder options = new MutableDataSet();+ options.set(Parser.SPACE_IN_LINK_URLS, true).setFrom(ParserEmulationProfile.GITHUB_DOC)+ .set(TablesExtension.COLUMN_SPANS, false).set(TablesExtension.APPEND_MISSING_COLUMNS, true)+ .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)+ .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)+ .set(RelativeUrlResolveExtension.BASE_URL, baseUrl)+ .set(Parser.EXTENSIONS, extensions);++ Parser parser = Parser.builder(options).build();++ HtmlRenderer htmlRenderer = HtmlRenderer.builder(options).build();+Node document = parser.parse(markdown);String html = htmlRenderer.render(document);if (postProcess)html = postProcess(html);+return html;}@@ -136,9 +143,4 @@ public class DefaultMarkdownManager implements MarkdownManager {return markdown;}- @Override- public MutableDataHolder getOptions() {- return options;- }-}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.javaindex d0cf95b729..86c1d4bedc 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReferenceManager.java@@ -43,7 +43,7 @@ public class DefaultPullRequestReferenceManager extends AbstractEntityManager<Puif (event instanceof MarkdownAware) {String markdown = ((MarkdownAware)event).getMarkdown();if (markdown != null) {- String html = markdownManager.render(markdown, false);+ String html = markdownManager.render(markdown, null, false);for (PullRequest referenced: new PullRequestParser().parseRequests(html)) {if (!referenced.equals(event.getRequest())) {diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.javaindex a344c15212..b5de4573ea 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestWatchManager.java@@ -124,7 +124,7 @@ public class DefaultPullRequestWatchManager extends AbstractEntityManager<PullReMarkdownAware markdownAware = (MarkdownAware) event;String markdown = markdownAware.getMarkdown();if (markdown != null) {- String html = markdownManager.render(markdown, false);+ String html = markdownManager.render(markdown, null, false);mentionUsers.addAll(new MentionParser().parseMentions(html));for (Account mention: mentionUsers) {watch(request, mention, "You are set to watch this pull request as you are mentioned in code comment.");diff --git a/core/src/main/java/com/gitplex/server/model/Depot.java b/core/src/main/java/com/gitplex/server/model/Depot.javaindex 492c2c56c5..f6925627a6 100644--- a/core/src/main/java/com/gitplex/server/model/Depot.java+++ b/core/src/main/java/com/gitplex/server/model/Depot.java@@ -1016,4 +1016,22 @@ public class Depot extends AbstractEntity implements AccountBelonging {}}+ public int getMode(String revision, @Nullable String path) {+ if (path != null) {+ RevCommit commit = getRevCommit(revision);+ try {+ TreeWalk treeWalk = TreeWalk.forPath(getRepository(), path, commit.getTree());+ if (treeWalk != null) {+ return treeWalk.getRawMode(0);+ } else {+ throw new ObjectNotFoundException("Unable to find blob path '" + path+ + "' in revision '" + revision + "'");+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ return FileMode.TREE.getBits();+ }+ }}diff --git a/core/src/main/java/com/gitplex/server/util/markdown/RelativeUrlResolveExtension.java b/core/src/main/java/com/gitplex/server/util/markdown/RelativeUrlResolveExtension.javanew file mode 100644index 0000000000..dd58a875ca--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/markdown/RelativeUrlResolveExtension.java@@ -0,0 +1,85 @@+package com.gitplex.server.util.markdown;++import java.nio.file.Path;+import java.nio.file.Paths;+import java.util.HashSet;+import java.util.Set;++import com.vladsch.flexmark.ast.Image;+import com.vladsch.flexmark.ast.Link;+import com.vladsch.flexmark.html.CustomNodeRenderer;+import com.vladsch.flexmark.html.HtmlRenderer;+import com.vladsch.flexmark.html.HtmlWriter;+import com.vladsch.flexmark.html.renderer.LinkType;+import com.vladsch.flexmark.html.renderer.NodeRenderer;+import com.vladsch.flexmark.html.renderer.NodeRendererContext;+import com.vladsch.flexmark.html.renderer.NodeRendererFactory;+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;+import com.vladsch.flexmark.html.renderer.ResolvedLink;+import com.vladsch.flexmark.util.options.DataHolder;+import com.vladsch.flexmark.util.options.DataKey;+import com.vladsch.flexmark.util.options.MutableDataHolder;++public class RelativeUrlResolveExtension implements HtmlRenderer.HtmlRendererExtension {++ public static final DataKey<String> BASE_URL = new DataKey<>("BASE_URL", (String)null);++ public void rendererOptions(MutableDataHolder options) {+ }++ @Override+ public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {+ rendererBuilder.nodeRendererFactory(new NodeRendererFactory() {++ @Override+ public NodeRenderer create(DataHolder options) {+ return new NodeRenderer() {++ @Override+ public Set<NodeRenderingHandler<?>> getNodeRenderingHandlers() {+ HashSet<NodeRenderingHandler<?>> set = new HashSet<NodeRenderingHandler<?>>();+ set.add(new NodeRenderingHandler<Image>(Image.class, new CustomNodeRenderer<Image>() {++ @Override+ public void render(Image image, NodeRendererContext context, HtmlWriter html) {+ String url = image.getUrl().toString();+ ResolvedLink resolvedLink = context.resolveLink(LinkType.IMAGE, url, null);+ html.attr("src", resolveUrl(options.get(BASE_URL), url));+ html.attr("alt", image.getText());+ html.withAttr(resolvedLink);+ html.tagVoid("img");+ }++ }));+ set.add(new NodeRenderingHandler<Link>(Link.class, new CustomNodeRenderer<Link>() {++ @Override+ public void render(Link link, NodeRendererContext context, HtmlWriter html) {+ String url = link.getUrl().toString();+ ResolvedLink resolvedLink = context.resolveLink(LinkType.LINK, url, null);+ html.attr("href", resolveUrl(options.get(BASE_URL), url));+ html.withAttr(resolvedLink);+ html.tag("a").text(link.getText()).closeTag("a");+ }++ }));++ return set;+ }++ };+ }++ });+ }++ private String resolveUrl(String baseUrl, String urlToResolve) {+ if (urlToResolve.contains(":") || urlToResolve.startsWith("/")) {+ return urlToResolve;+ } else {+ Path resolvedPath = Paths.get(baseUrl).resolveSibling(urlToResolve);+ return resolvedPath.normalize().toString().replace('\\', '/');+ }+ }++}diff --git a/product/src/test/java/com/gitplex/server/product/Test.java b/product/src/test/java/com/gitplex/server/product/Test.javaindex ccbd022f4f..dc0ad83bb5 100644--- a/product/src/test/java/com/gitplex/server/product/Test.java+++ b/product/src/test/java/com/gitplex/server/product/Test.java@@ -1,9 +1,12 @@package com.gitplex.server.product;+import java.nio.file.Paths;+public class Test {@org.junit.Testpublic void test() {+ System.out.println(Paths.get("/hello/world").resolveSibling("../just").normalize());}}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.javaindex c011b400bc..ccd936fc93 100644--- a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java@@ -151,8 +151,8 @@ public class CommitListPanel extends Panel {hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));- DepotBlobPage.State browseState = new DepotBlobPage.State();- browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);+ DepotBlobPage.State browseState = new DepotBlobPage.State(+ new BlobIdent(commit.name(), null, FileMode.TYPE_TREE));params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);fragment.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.java b/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.javaindex c31658f710..76109565f5 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePicker.java@@ -9,6 +9,8 @@ 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.theme.HumanTheme;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;@@ -108,6 +110,12 @@ public abstract class DepotFilePicker extends GenericPanel<Depot> {}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new DepotFilePickerResourceReference()));+ }+protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);protected BlobIdentFilter getBlobIdentFilter() {diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePickerResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePickerResourceReference.javanew file mode 100644index 0000000000..d13709f350--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/DepotFilePickerResourceReference.java@@ -0,0 +1,12 @@+package com.gitplex.server.web.component.depotfilepicker;++import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;++@SuppressWarnings("serial")+public class DepotFilePickerResourceReference extends BaseDependentCssResourceReference {++ public DepotFilePickerResourceReference() {+ super(DepotFilePickerResourceReference.class, "depot-file-picker.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/depot-file-picker.css b/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/depot-file-picker.cssnew file mode 100644index 0000000000..6400f9283f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/depotfilepicker/depot-file-picker.css@@ -0,0 +1,5 @@+.depot-file-picker {+ padding: 8px 24px 8px 4px;+ max-width: 800px;+ min-width: 180px;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.javaindex a4f461a3b2..4c03464c49 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java@@ -30,6 +30,7 @@ import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.diff.DiffEntry.ChangeType;+import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.revwalk.RevCommit;import org.unbescape.html.HtmlEscape;@@ -40,6 +41,7 @@ import com.gitplex.jsyntax.Token;import com.gitplex.server.GitPlex;import com.gitplex.server.git.Blame;import com.gitplex.server.git.BlobChange;+import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.BriefCommit;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.command.BlameCommand;@@ -195,10 +197,9 @@ public class TextDiffPanel extends Panel implements SourceAware {} else {comment = null;}- DepotBlobPage.State viewState = new DepotBlobPage.State();+ DepotBlobPage.State viewState = new DepotBlobPage.State(change.getBlobIdent());if (comment != null)viewState.commentId = comment.getId();- viewState.blobIdent = change.getBlobIdent();PageParameters params = DepotBlobPage.paramsOf(depot, viewState);actions.add(new ViewStateAwarePageLink<Void>("viewFile", DepotBlobPage.class, params));@@ -209,14 +210,14 @@ public class TextDiffPanel extends Panel implements SourceAware {&& request.getSource().getObjectName(false) != null&& SecurityUtils.canModify(request.getSourceDepot(), request.getSourceBranch(), change.getPath())&& (getPage() instanceof RequestChangesPage || getPage() instanceof IntegrationPreviewPage)) {- // we are in context of a pull request and pull request source branch exists, so we edit source branch instead+ // we are in context of a pull request and pull request source branch exists, so we edit in source branch insteadLink<Void> editLink = new Link<Void>("editFile") {@Overridepublic void onClick() {- DepotBlobPage.State editState = new DepotBlobPage.State();- editState.blobIdent.revision = request.getSourceBranch();- editState.blobIdent.path = change.getPath();+ BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), change.getPath(),+ FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.State editState = new DepotBlobPage.State(blobIdent);editState.mode = Mode.EDIT;editState.requestCompareInfo = new RequestCompareInfo();editState.requestCompareInfo.requestId = request.getId();@@ -241,8 +242,7 @@ public class TextDiffPanel extends Panel implements SourceAware {@Overridepublic void onClick() {- DepotBlobPage.State editState = new DepotBlobPage.State();- editState.blobIdent = change.getBlobIdent();+ DepotBlobPage.State editState = new DepotBlobPage.State(change.getBlobIdent());editState.mode = Mode.EDIT;PageParameters params = DepotBlobPage.paramsOf(depot, editState);setResponsePage(DepotBlobPage.class, params);diff --git a/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java b/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.javaindex 26fbe759e8..4dbd06d258 100644--- a/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java@@ -4,7 +4,9 @@ import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.web.page.depot.DepotPage;import com.gitplex.server.web.page.depot.blob.DepotBlobPage;@@ -15,13 +17,13 @@ public class BranchLink extends ViewStateAwarePageLink<Void> {private final DepotAndBranch depotAndBranch;public BranchLink(String id, DepotAndBranch depotAndBranch) {- super(id, DepotBlobPage.class, getPageParams(depotAndBranch));+ super(id, DepotBlobPage.class, paramsOf(depotAndBranch));this.depotAndBranch = depotAndBranch;}- private static PageParameters getPageParams(DepotAndBranch depotAndBranch) {- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = depotAndBranch.getBranch();+ private static PageParameters paramsOf(DepotAndBranch depotAndBranch) {+ BlobIdent blobIdent = new BlobIdent(depotAndBranch.getBranch(), null, FileMode.TREE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);return DepotBlobPage.paramsOf(depotAndBranch.getDepot(), state);}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.java b/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.javaindex dcedb27c2e..9901ed4978 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.java@@ -2,13 +2,12 @@ package com.gitplex.server.web.component.markdown;import java.io.Serializable;-import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.Depot;public interface BlobReferenceSupport extends Serializable {Depot getDepot();- BlobIdent getBaseBlobIdent();+ String getRevision();-}+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.javaindex 448bd44370..baedd11251 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java@@ -44,6 +44,7 @@ import com.gitplex.server.model.Depot;import com.gitplex.server.util.FileUtils;import com.gitplex.server.web.component.depotfilepicker.DepotFilePicker;import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -133,7 +134,7 @@ class InsertUrlPanel extends Panel {};- BlobIdent rootBlobIdent = new BlobIdent(blobReferenceSupport.getBaseBlobIdent().revision, null,+ BlobIdent rootBlobIdent = new BlobIdent(blobReferenceSupport.getRevision(), null,FileMode.TYPE_TREE);if (!blobReferenceSupport.getDepot().getChildren(rootBlobIdent, blobIdentFilter).isEmpty()) {add(new DropdownLink("blobPicker") {@@ -147,21 +148,14 @@ class InsertUrlPanel extends Panel {return blobReferenceSupport.getDepot();}- }, blobReferenceSupport.getBaseBlobIdent().revision) {+ }, blobReferenceSupport.getRevision()) {@Overrideprotected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {- BlobIdent baseBlobIdent = blobReferenceSupport.getBaseBlobIdent();- String basePath;- if (baseBlobIdent.isTree()) {- if (baseBlobIdent.path != null)- basePath = baseBlobIdent.path + "/newfile";- else- basePath = "newfile";- } else {- basePath = blobReferenceSupport.getBaseBlobIdent().path;- }- Path relativized = Paths.get(basePath).relativize(Paths.get(blobIdent.path));+ String baseUrl = markdownEditor.getBaseUrl();+ String referenceUrl = urlFor(DepotBlobPage.class,+ DepotBlobPage.paramsOf(blobReferenceSupport.getDepot(), blobIdent)).toString();+ Path relativized = Paths.get(baseUrl).relativize(Paths.get(referenceUrl));String relativePath = relativized.toString().replace('\\', '/').substring("../".length());markdownEditor.insertUrl(target, isImage, relativePath, blobIdent.getName(), null);markdownEditor.closeUrlSelector(target, InsertUrlPanel.this);diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.javaindex d91386b0cc..540b0f70c3 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java@@ -101,7 +101,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {private String render(String markdown) {if (StringUtils.isNotBlank(markdown)) {MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);- return markdownManager.render(markdown, true);+ return markdownManager.render(markdown, getBaseUrl(), true);} else {return "<div class='message'>Nothing to preview</div>";}@@ -410,4 +410,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {return null;}+ protected String getBaseUrl() {+ return null;+ };+}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.javaindex 7a9e67c101..487534f295 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java@@ -17,11 +17,9 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.hibernate.StaleStateException;import com.gitplex.launcher.loader.AppLoader;-import com.gitplex.server.GitPlex;import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;-import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -57,7 +55,7 @@ public class MarkdownViewer extends GenericPanel<String> {protected String load() {String markdown = MarkdownViewer.this.getModelObject();if (markdown != null) {- return AppLoader.getInstance(MarkdownManager.class).render(markdown, true);+ return AppLoader.getInstance(MarkdownManager.class).render(markdown, getBaseUrl(), true);} else {return null;}@@ -96,6 +94,10 @@ public class MarkdownViewer extends GenericPanel<String> {setOutputMarkupId(true);}++ protected String getBaseUrl() {+ return null;+ }@Overridepublic void renderHead(IHeaderResponse response) {@@ -106,9 +108,10 @@ public class MarkdownViewer extends GenericPanel<String> {explicit(SourcePositionTrackExtension.DATA_START_ATTRIBUTE),explicit(TASK_CHECKED));- String taskItemClass = GitPlex.getInstance(MarkdownManager.class).getOptions().get(TaskListExtension.ITEM_CLASS);- String script = String.format("gitplex.server.markdown.onViewerDomReady('%s', %s, '%s', '%s');",- getMarkupId(), callback, taskItemClass, SourcePositionTrackExtension.DATA_START_ATTRIBUTE);+ String script = String.format("gitplex.server.markdown.onViewerDomReady('%s', %s, '%s');",+ getMarkupId(),+ contentVersionSupport!=null?callback:"undefined",+ SourcePositionTrackExtension.DATA_START_ATTRIBUTE);response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.jsindex dd83512131..4e5ad08d21 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js@@ -858,15 +858,17 @@ gitplex.server.markdown = {gitplex.server.viewState.getFromViewAndSetToHistory();});},- onViewerDomReady: function(containerId, taskCallback, taskClass, taskSourcePositionDataAttribute) {+ onViewerDomReady: function(containerId, taskCallback, taskSourcePositionDataAttribute) {var $container = $("#" + containerId);- var $task = $container.find("." + taskClass);- var $taskCheckbox = $task.children("input");- $taskCheckbox.removeAttr("disabled").removeAttr("readonly");- $taskCheckbox.change(function() {- taskCallback($(this).parent().data(taskSourcePositionDataAttribute), $(this).prop("checked"));- });+ if (taskCallback) {+ var $task = $container.find(".task-list-item");+ var $taskCheckbox = $task.children("input");+ $taskCheckbox.removeAttr("disabled").removeAttr("readonly");+ $taskCheckbox.change(function() {+ taskCallback($(this).parent().data(taskSourcePositionDataAttribute), $(this).prop("checked"));+ });+ }gitplex.server.markdown.initRendered($container.find(".markdown-rendered"));},diff --git a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex 9717a44290..907571e01a 100644--- a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -296,17 +296,15 @@ public abstract class SymbolTooltipPanel extends Panel {}public PageParameters getQueryHitParams(QueryHit hit) {- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = revision;- state.blobIdent.path = hit.getBlobPath();+ BlobIdent blobIdent = new BlobIdent(revision, hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);state.mark = TextRange.of(hit.getTokenPos());return DepotBlobPage.paramsOf(depotModel.getObject(), state);}public PageParameters getFindOccurrencesParams() {- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = revision;- state.blobIdent.path = getBlobPath();+ BlobIdent blobIdent = new BlobIdent(revision, getBlobPath(), FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);state.query = symbolName;return DepotBlobPage.paramsOf(depotModel.getObject(), state);}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.javaindex 196bc456c4..3a2bc25283 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java@@ -46,7 +46,6 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.event.RefUpdated;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.git.exception.ObjectNotFoundException;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.PullRequestManager;@@ -125,16 +124,12 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {private WebMarkupContainer searchResult;- public DepotBlobPage(final PageParameters params) {+ public DepotBlobPage(PageParameters params) {super(params);if (getDepot().getDefaultBranch() == null)throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));-- String modeStr = params.get(PARAM_MODE).toString();- if (modeStr != null)- state.mode = Mode.valueOf(modeStr.toUpperCase());-+List<String> revisionAndPathSegments = new ArrayList<>();String segment = params.get(PARAM_REVISION).toString();if (segment != null && segment.length() != 0)@@ -148,42 +143,16 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {if (segment.length() != 0)revisionAndPathSegments.add(segment);}-- if (state.mode == Mode.ADD) {- /*- * In add mode, the url has a suffix "/newfile" which is added in order to- * make relative path referencing in markdown working, and here we need to- * trim it off to get the real blob path- */- state.blobIdent = new BlobIdent(getDepot(),- revisionAndPathSegments.subList(0, revisionAndPathSegments.size()-1));- } else {- state.blobIdent = new BlobIdent(getDepot(), revisionAndPathSegments);- }-- if (state.blobIdent.revision == null)- state.blobIdent.revision = getDepot().getDefaultBranch();++ BlobIdent blobIdent = new BlobIdent(getDepot(), revisionAndPathSegments);+ state = new State(blobIdent);++ String modeStr = params.get(PARAM_MODE).toString();+ if (modeStr != null)+ state.mode = Mode.valueOf(modeStr.toUpperCase());resolvedRevision = getDepot().getObjectId(state.blobIdent.revision);- RevCommit commit = getDepot().getRevCommit(state.blobIdent.revision);-- if (state.blobIdent.path != null) {- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {- RevTree revTree = commit.getTree();- TreeWalk treeWalk = TreeWalk.forPath(getDepot().getRepository(), state.blobIdent.path, revTree);- if (treeWalk == null) {- throw new ObjectNotFoundException("Unable to find blob path '" + state.blobIdent.path- + "' in revision '" + state.blobIdent.revision + "'");- }- state.blobIdent.mode = treeWalk.getRawMode(0);- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- state.blobIdent.mode = FileMode.TREE.getBits();- }-state.mark = TextRange.of(params.get(PARAM_MARK).toString());state.anchor = params.get(PARAM_ANCHOR).toString();@@ -579,8 +548,8 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {@Overrideprotected String getRevisionUrl(String revision) {- State state = new State();- state.blobIdent.revision = revision;+ BlobIdent blobIdent = new BlobIdent(revision, null, FileMode.TREE.getBits());+ State state = new State(blobIdent);PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), state);return urlFor(DepotBlobPage.class, params).toString();}@@ -653,29 +622,26 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {}public static PageParameters paramsOf(Depot depot, CodeComment comment, @Nullable String anchor) {- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = comment.getCommentPos().getCommit();- state.blobIdent.path = comment.getCommentPos().getPath();- state.blobIdent.mode = FileMode.TYPE_FILE;+ BlobIdent blobIdent = new BlobIdent(comment.getCommentPos().getCommit(), comment.getCommentPos().getPath(),+ FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);state.commentId = comment.getId();state.mark = comment.getCommentPos().getRange();state.anchor = anchor;return paramsOf(depot, state);}+ public static PageParameters paramsOf(Depot depot, BlobIdent blobIdent) {+ return paramsOf(depot, new State(blobIdent));+ }+public static PageParameters paramsOf(Depot depot, State state) {PageParameters params = paramsOf(depot);+if (state.blobIdent.revision != null)params.set(PARAM_REVISION, state.blobIdent.revision);- if (state.mode == Mode.ADD) {- // Without this, relative links in markdown file will not work- if (state.blobIdent.path != null)- params.set(PARAM_PATH, state.blobIdent.path + "/newfile");- else- params.set(PARAM_PATH, "newfile");- } else if (state.blobIdent.path != null) {+ if (state.blobIdent.path != null)params.set(PARAM_PATH, state.blobIdent.path);- }if (state.mark != null)params.set(PARAM_MARK, state.mark.toString());if (state.anchor != null)@@ -878,9 +844,9 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {private static final long serialVersionUID = 1L;- public Long commentId;+ public BlobIdent blobIdent;- public BlobIdent blobIdent = new BlobIdent();+ public Long commentId;public TextRange mark;@@ -891,6 +857,14 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {public RequestCompareInfo requestCompareInfo;public String query;++ public State(BlobIdent blobIdent) {+ this.blobIdent = blobIdent;+ }++ public State() {+ blobIdent = new BlobIdent();+ }}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.javaindex 123911111f..efe8c2b166 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java@@ -117,8 +117,7 @@ public class BlobNavigator extends Panel {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent = blobIdent;+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);tag.put("href", urlFor(DepotBlobPage.class, params));}@@ -215,8 +214,7 @@ public class BlobNavigator extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent = model.getObject();+ DepotBlobPage.State state = new DepotBlobPage.State(model.getObject());PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);tag.put("href", urlFor(DepotBlobPage.class, params));}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.javaindex 01fc15b51a..4ea424f3d3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java@@ -395,21 +395,19 @@ public class CommitOptionPanel extends Panel {private BlobChange getChange(TreeWalk treeWalk, RevCommit oldCommit, RevCommit newCommit) {DiffEntry.ChangeType changeType = DiffEntry.ChangeType.MODIFY;- BlobIdent oldBlobIdent = new BlobIdent();- oldBlobIdent.revision = oldCommit.name();+ BlobIdent oldBlobIdent;if (!treeWalk.getObjectId(0).equals(ObjectId.zeroId())) {- oldBlobIdent.path = treeWalk.getPathString();- oldBlobIdent.mode = treeWalk.getRawMode(0);+ oldBlobIdent = new BlobIdent(oldCommit.name(), treeWalk.getPathString(), treeWalk.getRawMode(0));} else {+ oldBlobIdent = new BlobIdent(oldCommit.name(), null, FileMode.TREE.getBits());changeType = DiffEntry.ChangeType.ADD;}- BlobIdent newBlobIdent = new BlobIdent();- newBlobIdent.revision = newCommit.name();+ BlobIdent newBlobIdent;if (!treeWalk.getObjectId(1).equals(ObjectId.zeroId())) {- newBlobIdent.path = treeWalk.getPathString();- newBlobIdent.mode = treeWalk.getRawMode(1);+ newBlobIdent = new BlobIdent(newCommit.name(), treeWalk.getPathString(), treeWalk.getRawMode(1));} else {+ newBlobIdent = new BlobIdent(newCommit.name(), null, FileMode.TREE.getBits());changeType = DiffEntry.ChangeType.DELETE;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.javaindex 251baa482c..a14c6e33e5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java@@ -149,8 +149,7 @@ public class FolderViewPanel extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent = parentIdent;+ DepotBlobPage.State state = new DepotBlobPage.State(parentIdent);PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);tag.put("href", urlFor(DepotBlobPage.class, params));}@@ -184,8 +183,7 @@ public class FolderViewPanel extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent = blobIdent;+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);tag.put("href", urlFor(DepotBlobPage.class, params));}@@ -234,8 +232,7 @@ public class FolderViewPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent = readmeModel.getObject();+ DepotBlobPage.State state = new DepotBlobPage.State(readmeModel.getObject());state.mode = Mode.EDIT;setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state));}@@ -262,7 +259,15 @@ public class FolderViewPanel extends Panel {return "This seems like a binary file!";}- }, null));+ }, null) {++ @Override+ protected String getBaseUrl() {+ DepotBlobPage.State state = new DepotBlobPage.State(readmeModel.getObject());+ return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();+ }++ });add(readmeContainer);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.javaindex fadfc26569..45e969eba4 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java@@ -3,10 +3,12 @@ package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.eclipse.jgit.lib.FileMode;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.Depot;import com.gitplex.server.web.component.markdown.BlobReferenceSupport;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.page.depot.blob.render.edit.BlobEditPanel;@@ -38,10 +40,10 @@ public class MarkdownBlobEditPanel extends BlobEditPanel {}@Override- public BlobIdent getBaseBlobIdent() {- return context.getBlobIdent();+ public String getRevision() {+ return context.getBlobIdent().revision;}-+};}@@ -50,6 +52,14 @@ public class MarkdownBlobEditPanel extends BlobEditPanel {return context.getAutosaveKey();}+ @Override+ protected String getBaseUrl() {+ BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, context.getNewPath(),+ FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);+ return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();+ }+};}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex 46e3297efc..496d7712a5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -45,6 +45,11 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {protected String getAutosaveKey() {return MarkdownBlobEditor.this.getAutosaveKey();}++ @Override+ protected String getBaseUrl() {+ return MarkdownBlobEditor.this.getBaseUrl();+ }});if (!autoFocus) {@@ -75,4 +80,5 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {protected abstract String getAutosaveKey();+ protected abstract String getBaseUrl();}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.javaindex f577460e33..ac80753b4c 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java@@ -6,6 +6,7 @@ import org.apache.wicket.model.Model;import com.gitplex.server.git.Blob;import com.gitplex.server.web.component.markdown.MarkdownViewer;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;@@ -21,7 +22,15 @@ public class MarkdownBlobViewPanel extends BlobViewPanel {super.onInitialize();Blob blob = context.getDepot().getBlob(context.getBlobIdent());- add(new MarkdownViewer("markdown", Model.of(blob.getText().getContent()), null));+ add(new MarkdownViewer("markdown", Model.of(blob.getText().getContent()), null) {++ @Override+ protected String getBaseUrl() {+ DepotBlobPage.State state = new DepotBlobPage.State(context.getBlobIdent());+ return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();+ }++ });}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.javaindex 21c979a8e3..e0d38515b2 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java@@ -306,9 +306,9 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {@Overrideprotected String load() {if (context.getOpenComment() != null) {- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent = new BlobIdent(context.getBlobIdent());- state.blobIdent.revision = context.getCommit().name();+ BlobIdent blobIdent = new BlobIdent(context.getBlobIdent());+ blobIdent.revision = context.getCommit().name();+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);state.commentId = context.getOpenComment().getId();state.mark = context.getOpenComment().getCommentPos().getRange();return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();@@ -672,8 +672,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport {}};- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent = context.getBlobIdent();+ DepotBlobPage.State state = new DepotBlobPage.State(context.getBlobIdent());state.commentId = CodeComment.idOf(context.getOpenComment());state.mark = TextRange.of(symbol.getPosition());PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.javaindex 62e5379d05..85db179bc4 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.java@@ -17,6 +17,7 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;import com.gitplex.server.git.Blob;+import com.gitplex.server.git.BlobIdent;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;@@ -40,21 +41,27 @@ public class SymbolLinkPanel extends BlobViewPanel {if (targetPath != null && (targetPath.startsWith("/") || new File(targetPath).isAbsolute()))targetPath = null;+ BlobIdent targetBlobIdent;if (targetPath != null) {Repository repository = context.getDepot().getRepository();try (RevWalk revWalk = new RevWalk(repository)) {ObjectId commitId = context.getDepot().getObjectId(context.getBlobIdent().revision);RevTree revTree = revWalk.parseCommit(commitId).getTree();TreeWalk treeWalk = TreeWalk.forPath(repository, targetPath, revTree);- if (treeWalk == null)- targetPath = null;+ if (treeWalk != null) {+ targetBlobIdent = new BlobIdent(context.getBlobIdent().revision, targetPath, treeWalk.getRawMode(0));+ } else {+ targetBlobIdent = null;+ }} catch (IOException e) {throw new RuntimeException(e);}+ } else {+ targetBlobIdent = null;}WebMarkupContainer link;- if (targetPath == null) {+ if (targetBlobIdent == null) {link = new Link<Void>("link") {@Override@@ -64,9 +71,7 @@ public class SymbolLinkPanel extends BlobViewPanel {};link.setEnabled(false);} else {- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = context.getBlobIdent().revision;- state.blobIdent.path = targetPath;+ DepotBlobPage.State state = new DepotBlobPage.State(targetBlobIdent);link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,DepotBlobPage.paramsOf(context.getDepot(), state));}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.javaindex 7b52f4964a..1b4a64fedb 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.java@@ -28,9 +28,11 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.GitPlex;+import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.Depot;import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.SearchManager;@@ -257,9 +259,9 @@ public abstract class InstantSearchPanel extends Panel {link.add(new Label("scope", hit.getNamespace()).setVisible(hit.getNamespace()!=null));item.add(link);- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = revisionModel.getObject();- state.blobIdent.path = hit.getBlobPath();+ BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),+ FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);state.mark = TextRange.of(hit.getTokenPos());PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), state);CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.javaindex df817a929e..e82b1f93c6 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.java@@ -405,9 +405,9 @@ public abstract class SearchResultPanel extends Panel {if (activeBlobIndex == blobItem.getIndex() && activeHitIndex == -1)add(AttributeAppender.append("class", " active"));- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = context.getBlobIdent().revision;- state.blobIdent.path = blobPath;+ BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, blobPath,+ FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));@@ -456,10 +456,10 @@ public abstract class SearchResultPanel extends Panel {if (activeBlobIndex == blobItem.getIndex() && activeHitIndex == hitItem.getIndex())add(AttributeAppender.append("class", " active"));- DepotBlobPage.State state = new DepotBlobPage.State();+ BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),+ FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);state.mark = TextRange.of(hit.getTokenPos());- state.blobIdent.revision = context.getBlobIdent().revision;- state.blobIdent.path = hit.getBlobPath();PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.javaindex b123ab9c71..36734bc267 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java@@ -39,6 +39,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.lib.Repository;@@ -46,6 +47,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import com.gitplex.server.GitPlex;+import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;import com.gitplex.server.manager.BranchWatchManager;@@ -416,8 +418,8 @@ public class DepotBranchesPage extends DepotPage {RefInfo ref = item.getModelObject();String branch = GitUtils.ref2branch(ref.getRef().getName());- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = branch;+ BlobIdent blobIdent = new BlobIdent(branch, null, FileMode.TREE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);AbstractLink link = new ViewStateAwarePageLink<Void>("branchLink",DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot(), state));link.add(new Label("name", branch));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.javaindex d1b9c6e69a..4f9b93eefb 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java@@ -112,9 +112,9 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {super.onInitialize();add(new CommitMessageLabel("text", depotModel, Model.of(getCommit().getShortMessage())));-- DepotBlobPage.State browseState = new DepotBlobPage.State();- browseState.blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);++ BlobIdent blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);+ DepotBlobPage.State browseState = new DepotBlobPage.State(blobIdent);PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));@@ -178,8 +178,8 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {String ref = item.getModelObject().getRef().getName();String branch = GitUtils.ref2branch(ref);if (branch != null) {- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = branch;+ BlobIdent blobIdent = new BlobIdent(branch, null, FileMode.TREE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);Link<Void> link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,DepotBlobPage.paramsOf(depotModel.getObject(), state));link.add(new Label("label", branch));@@ -187,8 +187,8 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {item.add(AttributeAppender.append("class", "branch"));} else {String tag = Preconditions.checkNotNull(GitUtils.ref2tag(ref));- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = tag;+ BlobIdent blobIdent = new BlobIdent(tag, null, FileMode.TREE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);Link<Void> link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,DepotBlobPage.paramsOf(depotModel.getObject(), state));link.add(new Label("label", tag));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.javaindex 0d45fe5bfc..f4f5704629 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java@@ -440,9 +440,13 @@ public class DepotCommitsPage extends DepotPage {}}- DepotBlobPage.State browseState = new DepotBlobPage.State();- browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- browseState.blobIdent.path = path;+ BlobIdent blobIdent;+ if (path != null) {+ blobIdent = new BlobIdent(commit.name(), path, null);+ } else {+ blobIdent = new BlobIdent(commit.name(), null, FileMode.TREE.getBits());+ }+ DepotBlobPage.State browseState = new DepotBlobPage.State(blobIdent);PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);item.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.javaindex 96fe66c05a..dc7a07b2b6 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java@@ -122,8 +122,8 @@ class UpdatedPanel extends GenericPanel<PullRequestUpdate> {hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));- DepotBlobPage.State browseState = new DepotBlobPage.State();- browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);+ BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);+ DepotBlobPage.State browseState = new DepotBlobPage.State(blobIdent);params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);item.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.javaindex 784b5e9677..da33eaf622 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java@@ -27,11 +27,13 @@ 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.Constants;+import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevTag;+import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;import com.gitplex.server.model.Depot;@@ -248,8 +250,8 @@ public class DepotTagsPage extends DepotPage {RefInfo ref = item.getModelObject();String tagName = GitUtils.ref2tag(ref.getRef().getName());- DepotBlobPage.State state = new DepotBlobPage.State();- state.blobIdent.revision = tagName;+ BlobIdent blobIdent = new BlobIdent(tagName, null, FileMode.TREE.getBits());+ DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);AbstractLink link = new ViewStateAwarePageLink<Void>("tagLink",DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot(), state));link.add(new Label("name", tagName));diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.htmlindex feb93d64c6..1ec49d6e1c 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html@@ -1,5 +1,5 @@<wicket:extend><div style="padding: 100px;">- <div wicket:id="markdownEditor"></div>+ <div wicket:id="markdown"></div></div></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.javaindex 792d19e65d..c1abb343b4 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java@@ -1,9 +1,8 @@package com.gitplex.server.web.page.test;-import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.model.Model;-import com.gitplex.server.web.component.markdown.MarkdownEditor;+import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -13,19 +12,14 @@ public class TestPage extends BasePage {protected void onInitialize() {super.onInitialize();- add(new MarkdownEditor("markdownEditor", Model.of(""), false) {+ add(new MarkdownViewer("markdown", Model.of("abc [child](img/child.png)"), null) {@Override- protected String getAutosaveKey() {- return "test";+ protected String getBaseUrl() {+ return "/hello";}});}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- }-}