The Unified and Autonomous Development Platform
Send RefUpdated event when upload files to repository while editing markdown
Robin Shenef487aa80eb3
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.javaindex fd49eb79de..1763d5d909 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java@@ -47,7 +47,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.commons.utils.PathUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.UrlUtils;-import io.onedev.server.event.RefUpdated;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.model.Project;@@ -443,8 +442,8 @@ abstract class InsertUrlPanel extends Panel {try {String directory = WebSession.get().getMetaData(UPLOAD_DIRECTORY);- RefUpdated refUpdated = context.uploadFiles(uploads, directory, commitMessage);- context.onCommitted(target, refUpdated);+ context.onCommitted(null, context.uploadFiles(uploads, directory, commitMessage));+String fileName = uploads.iterator().next().getClientFileName();String url;if (directory != null) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 88d2dc80ef..cfccdb951e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -993,35 +993,11 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}@Override- public void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated) {+ public void onCommitted(@Nullable AjaxRequestTarget target, RefUpdated refUpdated) {Project project = getProject();String branch = state.blobIdent.revision;- BlobIdent newBlobIdent;getProject().cacheObjectId(branch, refUpdated.getNewCommitId());- 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.EDIT) {- newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());- } else {- // We've uploaded some files- newBlobIdent = null;- }-Subject subject = SecurityUtils.getSubject();Long projectId = project.getId();String refName = refUpdated.getRefName();@@ -1038,7 +1014,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {ThreadContext.bind(subject);try {Project project = OneDev.getInstance(ProjectManager.class).load(projectId);- project.cacheObjectId(branch, refUpdated.getNewCommitId());+ project.cacheObjectId(branch, newCommitId);RefUpdated refUpdated = new RefUpdated(project, refName, oldCommitId, newCommitId);OneDev.getInstance(ListenerRegistry.class).post(refUpdated);} finally {@@ -1051,20 +1027,46 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {});- if (newBlobIdent != null) {- state.blobIdent = newBlobIdent;- state.position = null;- state.commentId = null;- state.mode = Mode.VIEW;- onResolvedRevisionChange(target);- pushState(target);- } else {- state.mode = Mode.VIEW;- onResolvedRevisionChange(target);+ 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.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 = null;+ 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');");}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.htmlindex 7c99f07633..14b224d4ba 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html@@ -6,7 +6,7 @@<div class="body"><div wicket:id="feedback"></div><div wicket:id="changed" class="changed">- <div class="alert alert-danger"><i class="fa fa-warning"></i> Someone has committed since you start editing.+ <div class="alert alert-warning">Someone has committed since you start editing.<a onclick="$(this).parent().next().show();">See what changed.</a></div><div wicket:id="changes" class="changes"></div>