The Unified and Autonomous Development Platform
Automatically open current directory when select files for insert while editing markdown
robin shence192399d01d
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.javaindex eb3709d42b..e4656b2ecc 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CommentInput.java@@ -28,7 +28,7 @@ import com.gitplex.server.web.component.markdown.UserMentionSupport;public abstract class CommentInput extends MarkdownEditor {public CommentInput(String id, IModel<String> model, boolean compactMode) {- super(id, model, compactMode);+ super(id, model, compactMode, null);}@Overridediff --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.javadeleted file mode 100644index 1313d017d4..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/markdown/BlobReferenceSupport.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.component.markdown;--import java.io.Serializable;--import com.gitplex.server.model.Project;--public interface BlobReferenceSupport extends Serializable {-- Project getProject();-- 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 494164e549..ad3dd04135 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@@ -46,6 +46,7 @@ import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.projectfilepicker.ProjectFilePicker;import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -124,8 +125,8 @@ class InsertUrlPanel extends Panel {});- BlobReferenceSupport blobReferenceSupport = markdownEditor.getBlobReferenceSupport();- if (blobReferenceSupport != null) {+ BlobRenderContext blobRenderContext = markdownEditor.getBlobRenderContext();+ if (blobRenderContext != null) {BlobIdentFilter blobIdentFilter = new BlobIdentFilter() {@Override@@ -144,34 +145,48 @@ class InsertUrlPanel extends Panel {};- BlobIdent rootBlobIdent = new BlobIdent(blobReferenceSupport.getRevision(), null,+ BlobIdent rootBlobIdent = new BlobIdent(blobRenderContext.getBlobIdent().revision, null,FileMode.TYPE_TREE);- if (!blobReferenceSupport.getProject().getChildren(rootBlobIdent, blobIdentFilter).isEmpty()) {+ if (!blobRenderContext.getProject().getChildren(rootBlobIdent, blobIdentFilter).isEmpty()) {add(new DropdownLink("blobPicker") {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {+ /*+ * We resolve revision to get latest commit id so that we can select to insert newly+ * added/uploaded files while editing a markdown file+ */ObjectId commitId;try {- commitId = blobReferenceSupport.getProject().getRepository()- .resolve(blobReferenceSupport.getRevision());+ commitId = blobRenderContext.getProject().getRepository()+ .resolve(blobRenderContext.getBlobIdent().revision);} catch (IOException e) {throw new RuntimeException(e);}++ BlobIdent blobIdent = blobRenderContext.getBlobIdent();+ String openDirectory;+ if (blobIdent.isTree())+ openDirectory = blobIdent.path;+ else if (blobIdent.path.contains("/"))+ openDirectory = StringUtils.substringBeforeLast(blobIdent.path, "/");+ else+ openDirectory = null;+return new ProjectFilePicker(id, new AbstractReadOnlyModel<Project>() {@Overridepublic Project getObject() {- return blobReferenceSupport.getProject();+ return blobRenderContext.getProject();}- }, blobReferenceSupport.getRevision(), commitId) {+ }, blobRenderContext.getBlobIdent().revision, commitId, openDirectory) {@Overrideprotected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {String baseUrl = markdownEditor.getBaseUrl();String referenceUrl = urlFor(ProjectBlobPage.class,- ProjectBlobPage.paramsOf(blobReferenceSupport.getProject(), blobIdent)).toString();+ ProjectBlobPage.paramsOf(blobRenderContext.getProject(), blobIdent)).toString();String relativized = PathUtils.relativize(baseUrl, referenceUrl);String relativePath;if (relativized.length() != 0) {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 6719892c46..4820d1b7fe 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@@ -38,18 +38,22 @@ import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.PackageResourceReference;import org.apache.wicket.util.crypt.Base64;+import org.eclipse.jgit.lib.FileMode;import org.unbescape.javascript.JavaScriptEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.GitPlex;+import com.gitplex.server.git.BlobIdent;import com.gitplex.server.manager.MarkdownManager;-import com.gitplex.server.model.User;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.User;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.component.markdown.emoji.EmojiOnes;import com.gitplex.server.web.page.base.BasePage;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;import com.gitplex.server.web.util.avatar.AvatarManager;import com.google.common.base.Charsets;@@ -62,6 +66,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {private final boolean initialSplit;+ private final BlobRenderContext blobRenderContext;+private WebMarkupContainer container;private TextArea<String> input;@@ -77,7 +83,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {* editor in compact mode occupies horizontal space and is suitable* to be used in places such as comment aside the code*/- public MarkdownEditor(String id, IModel<String> model, boolean compactMode) {+ public MarkdownEditor(String id, IModel<String> model, boolean compactMode,+ @Nullable BlobRenderContext blobRenderContext) {super(id, model);this.compactMode = compactMode;@@ -94,6 +101,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {} else {initialSplit = !compactMode;}++ this.blobRenderContext = blobRenderContext;}@Override@@ -102,6 +111,18 @@ public class MarkdownEditor extends FormComponentPanel<String> {input.setModelObject(getModelObject());}+ @Nullable+ public String getBaseUrl() {+ if (blobRenderContext != null) {+ BlobIdent blobIdent = new BlobIdent(blobRenderContext.getBlobIdent().revision, blobRenderContext.getNewPath(),+ FileMode.REGULAR_FILE.getBits());+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(blobRenderContext.getProject(), state)).toString();+ } else {+ return null;+ }+ }+private String render(String markdown) {if (StringUtils.isNotBlank(markdown)) {MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);@@ -412,17 +433,14 @@ public class MarkdownEditor extends FormComponentPanel<String> {return new ArrayList<>();}- protected BlobReferenceSupport getBlobReferenceSupport() {- return null;- }-@Nullableprotected String getAutosaveKey() {return null;}-- protected String getBaseUrl() {- return null;- };++ @Nullable+ public BlobRenderContext getBlobRenderContext() {+ return blobRenderContext;+ }}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.java b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.javaindex 163ff73990..5c86d74df3 100644--- a/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectfilepicker/ProjectFilePicker.java@@ -3,6 +3,9 @@ package com.gitplex.server.web.component.projectfilepicker;import java.util.Iterator;import java.util.List;+import javax.annotation.Nullable;++import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -32,14 +35,18 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {private final ObjectId commitId;+ private final String initialDirectoryToOpen;+public ProjectFilePicker(String id, IModel<Project> projectModel, String revision) {- this(id, projectModel, revision, projectModel.getObject().getObjectId(revision));+ this(id, projectModel, revision, projectModel.getObject().getObjectId(revision), null);}- public ProjectFilePicker(String id, IModel<Project> projectModel, String revision, ObjectId commitId) {+ public ProjectFilePicker(String id, IModel<Project> projectModel, String revision, ObjectId commitId,+ @Nullable String initialDirectoryToOpen) {super(id, projectModel);this.revision = revision;this.commitId = commitId;+ this.initialDirectoryToOpen = initialDirectoryToOpen;}@Override@@ -77,7 +84,18 @@ public abstract class ProjectFilePicker extends GenericPanel<Project> {@Overrideprotected void onInitialize() {super.onInitialize();- add(new HumanTheme());+ add(new HumanTheme());++ if (initialDirectoryToOpen != null) {+ reveal(initialDirectoryToOpen);+ }+ }++ private void reveal(String directory) {+ expand(new BlobIdent(revision, directory, FileMode.TREE.getBits()));+ if (directory.contains("/")) {+ reveal(StringUtils.substringBeforeLast(directory, "/"));+ }}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.javaindex 579a4fca19..e5a1461ec2 100644--- a/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java+++ b/web/src/main/java/com/gitplex/server/web/editable/string/StringPropertyEditor.java@@ -39,7 +39,7 @@ public class StringPropertyEditor extends PropertyEditor<String> {Method getter = getPropertyDescriptor().getPropertyGetter();if (getter.getAnnotation(Markdown.class) != null) {Fragment fragment = new Fragment("content", "markdownFrag", this);- fragment.add(input = new MarkdownEditor("input", Model.of(getModelObject()), false));+ fragment.add(input = new MarkdownEditor("input", Model.of(getModelObject()), false, null));add(fragment);} else if (getter.getAnnotation(Multiline.class) != null) {Fragment fragment = new Fragment("content", "multiLineFrag", this);diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.javaindex 7fb2a2ebb9..22562a2c86 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java@@ -3,14 +3,8 @@ package com.gitplex.server.web.page.project.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.Project;-import com.gitplex.server.web.component.markdown.BlobReferenceSupport;-import com.gitplex.server.web.page.project.blob.ProjectBlobPage;import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;-import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.page.project.blob.render.edit.BlobEditPanel;@SuppressWarnings("serial")@@ -28,38 +22,13 @@ public class MarkdownBlobEditPanel extends BlobEditPanel {@Overrideprotected FormComponentPanel<byte[]> newContentEditor(String componentId, byte[] initialContent) {- return new MarkdownBlobEditor(componentId, initialContent, context.getMode() == Mode.EDIT) {-- @Override- protected BlobReferenceSupport getBlobReferenceSupport() {- return new BlobReferenceSupport() {-- @Override- public Project getProject() {- return context.getProject();- }-- @Override- public String getRevision() {- return context.getBlobIdent().revision;- }-- };- }+ return new MarkdownBlobEditor(componentId, context, initialContent) {@Overrideprotected String getAutosaveKey() {return context.getAutosaveKey();}- @Override- protected String getBaseUrl() {- BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, context.getNewPath(),- FileMode.REGULAR_FILE.getBits());- ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- return urlFor(ProjectBlobPage.class, ProjectBlobPage.paramsOf(context.getProject(), state)).toString();- }-};}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex 407a6a9cd3..dfd7e9d31d 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -9,22 +9,24 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.model.Model;import com.gitplex.server.util.ContentDetector;-import com.gitplex.server.web.component.markdown.BlobReferenceSupport;import com.gitplex.server.web.component.markdown.MarkdownEditor;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.project.blob.render.BlobRenderContext.Mode;@SuppressWarnings("serial")abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {- private final boolean autoFocus;+ private final BlobRenderContext context;private final String charset;private MarkdownEditor input;- public MarkdownBlobEditor(String id, byte[] initialContent, boolean autoFocus) {+ public MarkdownBlobEditor(String id, BlobRenderContext context, byte[] initialContent) {super(id, Model.of(initialContent));- this.autoFocus = autoFocus;+ this.context = context;+Charset detectedCharset = ContentDetector.detectCharset(getModelObject());charset = (detectedCharset!=null?detectedCharset:Charset.defaultCharset()).name();}@@ -34,25 +36,15 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {super.onInitialize();add(input = new MarkdownEditor("input", Model.of(new String(getModelObject(), Charset.forName(charset))),- false) {-- @Override- protected BlobReferenceSupport getBlobReferenceSupport() {- return MarkdownBlobEditor.this.getBlobReferenceSupport();- }+ false, context) {@Overrideprotected String getAutosaveKey() {return MarkdownBlobEditor.this.getAutosaveKey();}- @Override- protected String getBaseUrl() {- return MarkdownBlobEditor.this.getBaseUrl();- }-});- if (!autoFocus) {+ if (context.getMode() != Mode.EDIT) {input.add(AttributeAppender.append("class", "no-autofocus"));}input.setOutputMarkupId(true);@@ -70,15 +62,12 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- if (autoFocus) {+ if (context.getMode() == Mode.EDIT) {String script = String.format("$('#%s textarea').focus();", input.getMarkupId());response.render(OnDomReadyHeaderItem.forScript(script));}}- protected abstract BlobReferenceSupport getBlobReferenceSupport();-protected abstract String getAutosaveKey();- protected abstract String getBaseUrl();}