The Unified and Autonomous Development Platform
fix issue #18: Wield behavior when edit readme.md from root directory
Robin Shen820f9b2af8fa
diff --git a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java b/server-core/src/main/java/io/onedev/server/git/BlobEdits.javaindex 80ea8e1d7a..1c243c27c5 100644--- a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java+++ b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java@@ -31,6 +31,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;+import io.onedev.server.git.exception.BlobEditException;import io.onedev.server.git.exception.NotTreeException;import io.onedev.server.git.exception.ObjectAlreadyExistsException;import io.onedev.server.git.exception.ObjectNotFoundException;@@ -51,7 +52,7 @@ public class BlobEdits implements Serializable {if (normalizedPath != null)this.oldPaths.add(normalizedPath);else- throw new IllegalArgumentException("Invalid old path: " + oldPath);+ throw new BlobEditException("Invalid old path: " + oldPath);}this.newBlobs = new HashMap<>();for (Map.Entry<String, BlobContent> entry: newBlobs.entrySet()) {@@ -59,7 +60,7 @@ public class BlobEdits implements Serializable {if (normalizedPath != null)this.newBlobs.put(normalizedPath, entry.getValue());else- throw new IllegalArgumentException("Invalid new path: " + entry.getKey());+ throw new BlobEditException("Invalid new path: " + entry.getKey());}}diff --git a/server-core/src/main/java/io/onedev/server/git/BlobIdentFilter.java b/server-core/src/main/java/io/onedev/server/git/BlobIdentFilter.javaindex 31d2365209..bae01be945 100644--- a/server-core/src/main/java/io/onedev/server/git/BlobIdentFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/BlobIdentFilter.java@@ -17,4 +17,15 @@ public interface BlobIdentFilter extends Serializable {};+ public static final BlobIdentFilter TREE = new BlobIdentFilter() {++ private static final long serialVersionUID = 1L;++ @Override+ public boolean filter(BlobIdent blobIdent) {+ return blobIdent.isTree();+ }++ };+}diff --git a/server-core/src/main/java/io/onedev/server/git/exception/BlobEditException.java b/server-core/src/main/java/io/onedev/server/git/exception/BlobEditException.javanew file mode 100644index 0000000000..394a8ab5bf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/git/exception/BlobEditException.java@@ -0,0 +1,11 @@+package io.onedev.server.git.exception;++public class BlobEditException extends GitException {++ private static final long serialVersionUID = 1L;++ public BlobEditException(String message) {+ super(message);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/UrlUtils.java b/server-core/src/main/java/io/onedev/server/util/UrlUtils.javaindex 35a7b92516..358866fc6f 100644--- a/server-core/src/main/java/io/onedev/server/util/UrlUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/UrlUtils.java@@ -1,7 +1,11 @@package io.onedev.server.util;+import java.nio.charset.StandardCharsets;import java.util.regex.Pattern;+import org.apache.wicket.util.encoding.UrlDecoder;+import org.apache.wicket.util.encoding.UrlEncoder;+import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.WordUtils;@@ -33,4 +37,20 @@ public class UrlUtils {return WordUtils.capitalize(url);}+ public static String encodePath(String url) {+ return UrlEncoder.PATH_INSTANCE.encode(url, StandardCharsets.UTF_8);+ }++ public static String decodePath(String url) {+ return UrlDecoder.PATH_INSTANCE.decode(url, StandardCharsets.UTF_8.name());+ }++ public static String encodeQuery(String query) {+ return UrlEncoder.QUERY_INSTANCE.encode(query, StandardCharsets.UTF_8);+ }++ public static String decodeQuery(String query) {+ return UrlDecoder.QUERY_INSTANCE.decode(query, StandardCharsets.UTF_8.name());+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.javaindex 8ed03d697d..3c23e509b5 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java@@ -1,8 +1,6 @@package io.onedev.server.util.markdown;import java.io.IOException;-import java.net.URLDecoder;-import java.nio.charset.StandardCharsets;import org.apache.commons.lang.StringUtils;import org.apache.wicket.request.cycle.RequestCycle;@@ -60,7 +58,7 @@ public class UrlProcessor implements MarkdownProcessor {Element element = (Element) node;element.attr("href", resolveUrl(blobRenderContext.getDirectoryUrl(), url));try {- String path = UrlUtils.trimHashAndQuery(URLDecoder.decode(url, StandardCharsets.UTF_8.name()));+ String path = UrlUtils.decodePath(UrlUtils.trimHashAndQuery(url));String directory = blobRenderContext.getDirectory();String referencedPath = PathUtils.resolve(directory, path);referencedPath = GitUtils.normalizePath(referencedPath);@@ -97,7 +95,7 @@ public class UrlProcessor implements MarkdownProcessor {element.attr("src", blobRenderContext.appendRaw(resolveUrl(blobRenderContext.getDirectoryUrl(), url)));try {String basePath = blobRenderContext.getDirectory();- String referencedPath = PathUtils.resolve(basePath, UrlUtils.trimHashAndQuery(URLDecoder.decode(url, StandardCharsets.UTF_8.name())));+ String referencedPath = PathUtils.resolve(basePath, UrlUtils.decodePath(UrlUtils.trimHashAndQuery(url)));referencedPath = GitUtils.normalizePath(referencedPath);if (referencedPath != null && (commit == null || TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null)) {element.after("<span class='missing'>!!missing!!</span>");diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.html b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.htmlnew file mode 100644index 0000000000..6ed1f6dbd1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.html@@ -0,0 +1,6 @@+<wicket:panel>+ <div wicket:id="tree" class="blob-folder-picker"></div>+ <wicket:fragment wicket:id="contentFrag">+ <a wicket:id="link"><span class="fa fa-folder-o"></span> <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/folderpicker/BlobFolderPicker.java b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.javanew file mode 100644index 0000000000..165038a36d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPicker.java@@ -0,0 +1,145 @@+package io.onedev.server.web.component.blob.folderpicker;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;+import java.util.Set;++import javax.annotation.Nullable;++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.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.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+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;++@SuppressWarnings("serial")+public abstract class BlobFolderPicker extends Panel {++ private final ObjectId commitId;++ public BlobFolderPicker(String id, @Nullable ObjectId commitId) {+ super(id);++ this.commitId = commitId;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new NestedTree<BlobIdent>("tree", new ITreeProvider<BlobIdent>() {++ @Override+ public void detach() {+ }++ @Override+ public Iterator<? extends BlobIdent> getRoots() {+ if (commitId != null)+ return getChildren(new BlobIdent(commitId.name(), null, FileMode.TYPE_TREE));+ else+ return new ArrayList<BlobIdent>().iterator();+ }++ @Override+ public boolean hasChildren(BlobIdent node) {+ return node.isTree();+ }++ @Override+ public Iterator<? extends BlobIdent> getChildren(BlobIdent node) {+ return getProject().getChildren(node, BlobIdentFilter.TREE, commitId).iterator();+ }++ @Override+ public IModel<BlobIdent> model(BlobIdent object) {+ return Model.of(object);+ }++ }, new AbstractReadOnlyModel<Set<BlobIdent>>() {++ @Override+ public Set<BlobIdent> getObject() {+ return getState();+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new HumanTheme());+ }++ @Override+ public void collapse(BlobIdent blobIdent) {+ super.collapse(blobIdent);+ onStateChange();+ }++ @Override+ public void expand(BlobIdent blobIdent) {+ super.expand(blobIdent);++ List<BlobIdent> children = getProject().getChildren(blobIdent, BlobIdentFilter.TREE, commitId);+ if (children.size() == 1 && children.get(0).isTree())+ expand(children.get(0));++ onStateChange();+ }++ @Override+ protected Component newContentComponent(String id, IModel<BlobIdent> node) {+ BlobIdent blobIdent = node.getObject();+ Fragment fragment = new Fragment(id, "contentFrag", BlobFolderPicker.this);+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onSelect(target, blobIdent);+ }++ };+ link.add(new Label("label", blobIdent.getName()));+ fragment.add(link);+ return fragment;+ }++ });++ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new BlobFolderPickerResourceReference()));+ }++ protected void onStateChange() {++ }++ protected abstract Project getProject();++ protected abstract Set<BlobIdent> getState();++ protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPickerResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPickerResourceReference.javanew file mode 100644index 0000000000..3cd93acd98--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/BlobFolderPickerResourceReference.java@@ -0,0 +1,12 @@+package io.onedev.server.web.component.blob.folderpicker;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++@SuppressWarnings("serial")+public class BlobFolderPickerResourceReference extends BaseDependentCssResourceReference {++ public BlobFolderPickerResourceReference() {+ super(BlobFolderPickerResourceReference.class, "blob-folder-picker.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/blob-folder-picker.css b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/blob-folder-picker.cssnew file mode 100644index 0000000000..52f8761a10--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/folderpicker/blob-folder-picker.css@@ -0,0 +1,5 @@+.blob-folder-picker {+ padding: 8px 24px 8px 4px;+ max-width: 800px;+ min-width: 180px;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.html b/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.htmlrename to server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java b/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.javarename to server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.javaindex 6450a166c6..153aa89f62 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPicker.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.blob;+package io.onedev.server.web.component.blob.picker;import java.util.ArrayList;import java.util.Iterator;@@ -27,6 +27,7 @@ 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.blob.BlobIcon;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPickerResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPickerResourceReference.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/web/component/blob/BlobPickerResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPickerResourceReference.javaindex 07239fcfab..0d5491752f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/blob/BlobPickerResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/blob/picker/BlobPickerResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.blob;+package io.onedev.server.web.component.blob.picker;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/component/blob/blob-picker.css b/server-core/src/main/java/io/onedev/server/web/component/blob/picker/blob-picker.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/blob/blob-picker.cssrename to server-core/src/main/java/io/onedev/server/web/component/blob/picker/blob-picker.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.htmlindex 088934b203..688fdfaac4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html@@ -66,11 +66,13 @@<div class="form-group"><div wicket:id="file"></div></div>- <div class="form-group">+ <div class="form-group directory"><label>Directory</label>- <input wicket:id="directory" class="form-control"></input>- <p class="help-block">Optionally specify the directory to put uploaded files. This value- is considered to be relative to current repository directory</p>+ <div>+ <input wicket:id="directory" class="form-control"></input>+ <a wicket:id="select" title="Select" class="btn btn-default"><i class="fa fa-folder-open-o"></i></a>+ </div>+ <p class="help-block">Optionally specify relative directory to put uploaded files</p></div><div class="form-group"><label>Summary Commit Message</label>diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex 43e67f23cf..484cd69583 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -11,6 +11,7 @@ import java.util.Map;import java.util.Set;import javax.activation.MimetypesFileTypeMap;+import javax.annotation.Nullable;import org.apache.commons.fileupload.FileUploadException;import org.apache.commons.text.StringEscapeUtils;@@ -40,6 +41,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.util.lang.Bytes;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;+import org.unbescape.javascript.JavaScriptEscape;import com.google.common.base.Preconditions;@@ -48,17 +50,20 @@ import io.onedev.commons.utils.PathUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;+import io.onedev.server.git.exception.GitException;import io.onedev.server.model.Project;import io.onedev.server.util.UrlUtils;import io.onedev.server.web.behavior.ReferenceInputBehavior;-import io.onedev.server.web.component.blob.BlobPicker;+import io.onedev.server.web.component.blob.folderpicker.BlobFolderPicker;+import io.onedev.server.web.component.blob.picker.BlobPicker;import io.onedev.server.web.component.dropzonefield.DropzoneField;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;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.BlobUploadException;@SuppressWarnings("serial")abstract class InsertUrlPanel extends Panel {@@ -69,7 +74,9 @@ abstract class InsertUrlPanel extends Panel {private static final MetaDataKey<String> UPLOAD_DIRECTORY = new MetaDataKey<String>(){};- private static final MetaDataKey<HashSet<String>> BLOB_PICKER_STATE = new MetaDataKey<HashSet<String>>(){};+ private static final MetaDataKey<HashSet<String>> FILE_PICKER_STATE = new MetaDataKey<HashSet<String>>(){};++ private static final MetaDataKey<HashSet<String>> FOLDER_PICKER_STATE = new MetaDataKey<HashSet<String>>(){};static final String TAB_INPUT_URL = "Input URL";@@ -147,6 +154,49 @@ abstract class InsertUrlPanel extends Panel {return fragment;}+ private ObjectId resolveCommitId(BlobRenderContext context) {+ /*+ * We resolve revision to get latest commit id so that we can select to insert newly+ * added/uploaded files while editing a markdown file+ */+ String revision = context.getBlobIdent().revision;+ if (revision == null)+ revision = "master";+ try {+ return context.getProject().getRepository().resolve(revision);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ private Set<BlobIdent> getPickerState(@Nullable ObjectId commitId, BlobIdent currentBlobIdent,+ @Nullable Set<String> expandedPaths) {+ Set<BlobIdent> pickerState = new HashSet<>();+ if (commitId != null) {+ if (expandedPaths != null) {+ for (String path: expandedPaths)+ pickerState.add(new BlobIdent(commitId.name(), path, FileMode.TREE.getBits()));+ }++ String parentPath;+ if (currentBlobIdent.isTree())+ parentPath = currentBlobIdent.path;+ else if (currentBlobIdent.path.contains("/"))+ parentPath = StringUtils.substringBeforeLast(currentBlobIdent.path, "/");+ else+ parentPath = null;++ while (parentPath != null) {+ pickerState.add(new BlobIdent(commitId.name(), parentPath, FileMode.TYPE_TREE));+ if (parentPath.contains("/"))+ parentPath = StringUtils.substringBeforeLast(parentPath, "/");+ else+ parentPath = null;+ }+ }+ return pickerState;+ }+private Component newPickExistingPanel() {Fragment fragment;BlobRenderContext context = markdownEditor.getBlobRenderContext();@@ -170,47 +220,10 @@ abstract class InsertUrlPanel extends Panel {};- /*- * 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;- if (context.getBlobIdent().revision != null) {- try {- commitId = context.getProject().getRepository().resolve(context.getBlobIdent().revision);- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- commitId = null;- }+ ObjectId commitId = resolveCommitId(context);- Set<BlobIdent> blobPickerState = new HashSet<>();-- if (commitId != null) {- Set<String> expandedPaths = WebSession.get().getMetaData(BLOB_PICKER_STATE);- if (expandedPaths != null) {- for (String path: expandedPaths)- blobPickerState.add(new BlobIdent(commitId.name(), path, FileMode.TREE.getBits()));- }-- BlobIdent blobIdent = context.getBlobIdent();- String parentPath;- if (blobIdent.isTree())- parentPath = blobIdent.path;- else if (blobIdent.path.contains("/"))- parentPath = StringUtils.substringBeforeLast(blobIdent.path, "/");- else- parentPath = null;-- while (parentPath != null) {- blobPickerState.add(new BlobIdent(commitId.name(), parentPath, FileMode.TYPE_TREE));- if (parentPath.contains("/"))- parentPath = StringUtils.substringBeforeLast(parentPath, "/");- else- parentPath = null;- }- }+ Set<BlobIdent> filePickerState = getPickerState(commitId, context.getBlobIdent(),+ WebSession.get().getMetaData(FILE_PICKER_STATE));fragment.add(new BlobPicker("files", commitId) {@@ -238,14 +251,14 @@ abstract class InsertUrlPanel extends Panel {@Overrideprotected void onStateChange() {HashSet<String> expandedPaths = new HashSet<>();- for (BlobIdent blobIdent: blobPickerState)+ for (BlobIdent blobIdent: filePickerState)expandedPaths.add(blobIdent.path);- WebSession.get().setMetaData(BLOB_PICKER_STATE, expandedPaths);+ WebSession.get().setMetaData(FILE_PICKER_STATE, expandedPaths);}@Overrideprotected Set<BlobIdent> getState() {- return blobPickerState;+ return filePickerState;}});@@ -428,6 +441,50 @@ abstract class InsertUrlPanel extends Panel {}}));++ BlobRenderContext context = Preconditions.checkNotNull(markdownEditor.getBlobRenderContext());+ ObjectId commitId = resolveCommitId(context);+ Set<BlobIdent> folderPickerState = getPickerState(commitId, context.getBlobIdent(),+ WebSession.get().getMetaData(FOLDER_PICKER_STATE));++ form.add(new DropdownLink("select") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new BlobFolderPicker(id, commitId) {++ @Override+ protected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {+ dropdown.close();++ String relativePath = PathUtils.relativize(context.getDirectory(), blobIdent.path);+ String script = String.format("$('form.upload-blob .directory input').val('%s');",+ JavaScriptEscape.escapeJavaScript(relativePath));+ target.appendJavaScript(script);+ }++ @Override+ protected Project getProject() {+ return markdownEditor.getBlobRenderContext().getProject();+ }++ @Override+ protected void onStateChange() {+ HashSet<String> expandedPaths = new HashSet<>();+ for (BlobIdent blobIdent: folderPickerState)+ expandedPaths.add(blobIdent.path);+ WebSession.get().setMetaData(FOLDER_PICKER_STATE, expandedPaths);+ }++ @Override+ protected Set<BlobIdent> getState() {+ return folderPickerState;+ }++ };+ }++ });ReferenceInputBehavior behavior = new ReferenceInputBehavior(true) {@@ -471,14 +528,13 @@ abstract class InsertUrlPanel extends Panel {String fileName = uploads.iterator().next().getClientFileName();String url;- if (directory != null) {- url = directory + "/" + fileName;- } else {- url = fileName;- }+ if (directory != null)+ url = directory + "/" + UrlUtils.encodePath(fileName);+ else+ url = UrlUtils.encodePath(fileName);markdownEditor.insertUrl(target, isImage, url, UrlUtils.describe(fileName), null);onClose(target);- } catch (BlobUploadException e) {+ } catch (GitException e) {form.error(e.getMessage());target.add(feedback);}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 1fe8fbb963..b4945f811f 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@@ -207,6 +207,18 @@ body.fullscreen {color: inherit;}+.insert-url .directory>div {+ position: relative;+ padding-right: 48px;+}+.insert-url .directory>div>a {+ position: absolute;+ right: 0;+ top: 0;+}+.insert-url .blob-picker {+ padding: 0;+}.insert-url .attachment {margin-bottom: 20px;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex a45f094d88..16ee233c84 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -666,3 +666,6 @@ td.ellipsis {margin: 0;}+.tree-theme-human span.tree-content a {+ color: #1f3b7b !important;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.htmlindex 5076908be3..6d695550fa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html@@ -12,8 +12,7 @@<div class="form-group"><label>Directory</label><input wicket:id="directory" class="form-control"></input>- <p class="help-block">Optionally specify the directory to put uploaded files. This value- is considered to be relative to current repository directory</p>+ <p class="help-block">Optionally specify relative directory to put uploaded files</p></div><div class="form-group"><label>Summary Commit Message</label>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 1f383aaa26..d43a2c3978 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -68,6 +68,7 @@ import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;+import io.onedev.server.git.exception.BlobEditException;import io.onedev.server.git.exception.NotTreeException;import io.onedev.server.git.exception.ObjectAlreadyExistsException;import io.onedev.server.git.exception.ObsoleteCommitException;@@ -104,7 +105,6 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.navigator.BlobNavigator;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;-import io.onedev.server.web.page.project.blob.render.BlobUploadException;import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;import io.onedev.server.web.page.project.blob.render.view.Positionable;import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;@@ -1254,49 +1254,51 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S});- if (state.urlAfterEdit != null) {- throw new RedirectToUrlException(state.urlAfterEdit);- } else if (target != null) {- BlobIdent newBlobIdent;- if (state.mode == Mode.DELETE) {- try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {- RevTree revTree = getProject().getRevCommit(refUpdated.getNewCommitId(), true).getTree();- String parentPath = StringUtils.substringBeforeLast(state.blobIdent.path, "/");- while (TreeWalk.forPath(getProject().getRepository(), parentPath, revTree) == null) {- if (parentPath.contains("/")) {- parentPath = StringUtils.substringBeforeLast(parentPath, "/");- } else {- parentPath = null;- break;- }- }- newBlobIdent = new BlobIdent(branch, parentPath, FileMode.TREE.getBits());- } catch (IOException e) {- throw new RuntimeException(e);- }- } else if (state.mode == Mode.ADD) {- newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());- } else if (state.mode == Mode.EDIT) {- newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());- } else {- // We've uploaded some files- newBlobIdent = null;- }-- if (newBlobIdent != null) {- state.blobIdent = newBlobIdent;- state.position = position;- state.commentId = null;- state.mode = Mode.VIEW;- onResolvedRevisionChange(target);- pushState(target);+ if (target != null) {+ if (state.urlAfterEdit != null) {+ throw new RedirectToUrlException(state.urlAfterEdit);} else {- state.mode = Mode.VIEW;- onResolvedRevisionChange(target);+ BlobIdent newBlobIdent;+ if (state.mode == Mode.DELETE) {+ try (RevWalk revWalk = new RevWalk(getProject().getRepository())) {+ RevTree revTree = getProject().getRevCommit(refUpdated.getNewCommitId(), true).getTree();+ String parentPath = StringUtils.substringBeforeLast(state.blobIdent.path, "/");+ while (TreeWalk.forPath(getProject().getRepository(), parentPath, revTree) == null) {+ if (parentPath.contains("/")) {+ parentPath = StringUtils.substringBeforeLast(parentPath, "/");+ } else {+ parentPath = null;+ break;+ }+ }+ newBlobIdent = new BlobIdent(branch, parentPath, FileMode.TREE.getBits());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else if (state.mode == Mode.ADD) {+ newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());+ } else if (state.mode == Mode.EDIT) {+ newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());+ } else {+ // We've uploaded some files+ newBlobIdent = null;+ }++ if (newBlobIdent != null) {+ state.blobIdent = newBlobIdent;+ state.position = position;+ state.commentId = null;+ state.mode = Mode.VIEW;+ onResolvedRevisionChange(target);+ pushState(target);+ } else {+ state.mode = Mode.VIEW;+ onResolvedRevisionChange(target);+ }++ // fix the issue that sometimes indexing indicator of new commit does not disappear+ target.appendJavaScript("Wicket.WebSocket.send('RenderCallback');");}-- // fix the issue that sometimes indexing indicator of new commit does not disappear- target.appendJavaScript("Wicket.WebSocket.send('RenderCallback');");}}@@ -1380,18 +1382,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Spublic RefUpdated uploadFiles(Collection<FileUpload> uploads, String directory, String commitMessage) {Map<String, BlobContent> newBlobs = new HashMap<>();- String parentPath;- BlobIdent blobIdent = getBlobIdent();- if (blobIdent.path != null) {- if (blobIdent.isTree())- parentPath = blobIdent.path;- else if (blobIdent.path.contains("/"))- parentPath = StringUtils.substringBeforeLast(blobIdent.path, "/");- else- parentPath = null;- } else {- parentPath = null;- }+ String parentPath = getDirectory();if (directory != null) {if (parentPath != null)@@ -1401,6 +1392,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S}User user = Preconditions.checkNotNull(SecurityUtils.getUser());+ BlobIdent blobIdent = getBlobIdent();for (FileUpload upload: uploads) {String blobPath = upload.getClientFileName();@@ -1408,9 +1400,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SblobPath = parentPath + "/" + blobPath;if (getProject().isReviewRequiredForModification(user, blobIdent.revision, blobPath))- throw new BlobUploadException("Review required for this change. Please submit pull request instead");+ throw new BlobEditException("Review required for this change. Please submit pull request instead");else if (getProject().isBuildRequiredForModification(user, blobIdent.revision, blobPath))- throw new BlobUploadException("Build required for this change. Please submit pull request instead");+ throw new BlobEditException("Build required for this change. Please submit pull request instead");BlobContent blobContent = new BlobContent.Immutable(upload.getBytes(), FileMode.REGULAR_FILE);newBlobs.put(blobPath, blobContent);@@ -1431,7 +1423,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SprevCommitId, user.asPerson(), commitMessage);return new RefUpdated(getProject(), refName, prevCommitId, newCommitId);} catch (ObjectAlreadyExistsException|NotTreeException e) {- throw new BlobUploadException(e.getMessage());+ throw new BlobEditException(e.getMessage());} catch (ObsoleteCommitException e) {prevCommitId = e.getOldCommitId();}@@ -1446,7 +1438,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overridepublic String appendRaw(String url) {try {- URIBuilder builder = new URIBuilder(url);+ URIBuilder builder;+ builder = new URIBuilder(url);for (NameValuePair pair: builder.getQueryParams()) {if (pair.getName().equals(PARAM_RAW))return url;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.cssindex 721fe04dd7..a497cc8b87 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css@@ -11,10 +11,6 @@padding: 8px 24px 8px 4px;max-width: 800px;}-.subtree-dropdown .tree-theme-human span.tree-content a {- color: #1f3b7b;- font-size: 13px;-}.blob-navigator .add {font-size: 18px;line-height: 20px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobUploadException.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobUploadException.javadeleted file mode 100644index cedbabb655..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobUploadException.java+++ /dev/null@@ -1,11 +0,0 @@-package io.onedev.server.web.page.project.blob.render;--public class BlobUploadException extends RuntimeException {-- private static final long serialVersionUID = 1L;-- public BlobUploadException(String message) {- super(message);- }--}diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex ea126ea925..e29e84b6bf 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -5,4 +5,5 @@ public class Test {@org.junit.Testpublic void test() {}+}\ No newline at end of file