The Unified and Autonomous Development Platform
Remember selected cispec job after committing
Robin Shenb24dc3bd6630
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 1763d5d909..fd902ee4a2 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@@ -442,7 +442,7 @@ abstract class InsertUrlPanel extends Panel {try {String directory = WebSession.get().getMetaData(UPLOAD_DIRECTORY);- context.onCommitted(null, context.uploadFiles(uploads, directory, commitMessage));+ context.onCommitted(null, context.uploadFiles(uploads, directory, commitMessage), null);String fileName = uploads.iterator().next().getClientFileName();String url;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 981846b20e..c49ec5b24d 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@@ -410,7 +410,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overridevoid onCommitted(AjaxRequestTarget target, RefUpdated refUpdated) {- ProjectBlobPage.this.onCommitted(target, refUpdated);+ ProjectBlobPage.this.onCommitted(target, refUpdated, null);modal.close();}@@ -1023,7 +1023,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S}@Override- public void onCommitted(@Nullable AjaxRequestTarget target, RefUpdated refUpdated) {+ public void onCommitted(@Nullable AjaxRequestTarget target, RefUpdated refUpdated, @Nullable String position) {Project project = getProject();String branch = state.blobIdent.revision;getProject().cacheObjectId(branch, refUpdated.getNewCommitId());@@ -1078,7 +1078,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sif (newBlobIdent != null) {state.blobIdent = newBlobIdent;- state.position = null;+ state.position = position;state.commentId = null;state.mode = Mode.VIEW;onResolvedRevisionChange(target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex 96af911a96..1b9b7aa19b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -77,7 +77,7 @@ public interface BlobRenderContext extends Serializable {void onModeChange(AjaxRequestTarget target, Mode mode);- void onCommitted(AjaxRequestTarget target, RefUpdated refUpdated);+ void onCommitted(@Nullable AjaxRequestTarget target, RefUpdated refUpdated, @Nullable String position);void onCommentOpened(AjaxRequestTarget target, @Nullable CodeComment comment);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 82dcef730f..4eced3f9cb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -70,7 +70,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;@SuppressWarnings("serial")-public class CommitOptionPanel extends Panel {+public abstract class CommitOptionPanel extends Panel {private final BlobRenderContext context;@@ -250,7 +250,7 @@ public class CommitOptionPanel extends Panel {@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- if (save(target, feedback)) {+ if (save(target, feedback, getPosition())) {String script = String.format(""+ "$('#%s').attr('disabled', 'disabled').val('Please wait...');"+ "onedev.server.form.markClean($('form'));", getMarkupId());@@ -293,7 +293,7 @@ public class CommitOptionPanel extends Panel {|| !Objects.equal(context.getBlobIdent().path, context.getNewPath());}- private boolean save(AjaxRequestTarget target, FeedbackPanel feedback) {+ private boolean save(AjaxRequestTarget target, FeedbackPanel feedback, @Nullable String position) {change = null;if (newContentProvider != null && StringUtils.isBlank(context.getNewPath())) {@@ -396,7 +396,7 @@ public class CommitOptionPanel extends Panel {}if (newCommitId != null) {RefUpdated refUpdated = new RefUpdated(context.getProject(), refName, prevCommitId, newCommitId);- context.onCommitted(target, refUpdated);+ context.onCommitted(target, refUpdated, position);if (autosaveKey != null)target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));return true;@@ -469,4 +469,6 @@ public class CommitOptionPanel extends Panel {partialPageRequestHandler.appendJavaScript(script);}+ protected abstract String getPosition();+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.htmlindex 643f43acd2..5889a7e9ea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html@@ -11,6 +11,7 @@<form wicket:id="content" class="content leave-confirm" onsubmit="return false;"><div wicket:id="feedback" class="feedback"></div><div wicket:id="editor" class="editor"></div>+ <input wicket:id="position" type="hidden" class="position"><a wicket:id="edit" class="edit submit">submit</a><a wicket:id="editPlain" class="edit-plain submit">submit</a><a wicket:id="save" class="save submit">submit</a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.javaindex f22f8e8dbe..4902786107 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.blob.render.edit;+import javax.annotation.Nullable;+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxCallListener;@@ -14,7 +16,9 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.apache.wicket.markup.html.form.HiddenField;import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.PropertyModel;import io.onedev.commons.utils.Provider;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;@@ -42,6 +46,8 @@ public abstract class BlobEditPanel extends Panel {private Tab currentTab = Tab.EDIT;private byte[] editingContent;++ private String position;public BlobEditPanel(String id, BlobRenderContext context) {super(id);@@ -83,8 +89,9 @@ public abstract class BlobEditPanel extends Panel {super.onSubmit(target, form);if (currentTab == Tab.EDIT && tab == Tab.EDIT_PLAIN|| currentTab == Tab.EDIT_PLAIN && tab == Tab.EDIT- || tab == Tab.SAVE)+ || tab == Tab.SAVE) {editingContent = editor.getModelObject();+ }if (tab != Tab.SAVE) {if (tab == Tab.EDIT)editor = newEditor("editor", editingContent);@@ -139,6 +146,7 @@ public abstract class BlobEditPanel extends Panel {add(newSubmitLink("edit", Tab.EDIT));add(newSubmitLink("editPlain", Tab.EDIT_PLAIN));add(newSubmitLink("save", Tab.SAVE));+ add(new HiddenField<String>("position", new PropertyModel<String>(BlobEditPanel.this, "position")));setOutputMarkupId(true);}@@ -152,7 +160,14 @@ public abstract class BlobEditPanel extends Panel {return editingContent;}- }));+ }) {++ @Override+ protected String getPosition() {+ return BlobEditPanel.this.getPosition();+ }++ });add(recreateBehavior = new AbstractPostAjaxBehavior() {@@ -208,4 +223,9 @@ public abstract class BlobEditPanel extends Panel {response.render(OnDomReadyHeaderItem.forScript(script));}+ @Nullable+ protected String getPosition() {+ return position;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.jsindex 05589fd43e..92119a5f21 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js@@ -16,7 +16,10 @@ onedev.server.blobEdit = {}});$head.find(".save>a").click(function() {- $body.find(">.content>.save.submit").click();+ var $content = $body.find(">.content");+ var position = $content.find(".position-aware").data("getPosition")();+ $content.children(".position").val(position);+ $content.children(".save.submit").click();});if ($body.find(".autofit:visible").length != 0)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.javaindex bff8d76034..c65ed262ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java@@ -22,7 +22,16 @@ public class BlobDeletionProvider implements BlobRendererContribution {@Overridepublic Component render(String componentId) {- return new CommitOptionPanel(componentId, context, null);+ return new CommitOptionPanel(componentId, context, null) {++ private static final long serialVersionUID = 1L;++ @Override+ protected String getPosition() {+ return null;+ }++ };}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.javaindex d9b38c1e6b..4997597948 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java@@ -24,5 +24,5 @@ public class CISpecBlobEditPanel extends BlobEditPanel implements PlainEditSuppopublic FormComponentPanel<byte[]> newPlainEditor(String componentId, byte[] initialContent) {return new PlainEditPanel(componentId, CISpec.BLOB_PATH, initialContent);}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.htmlindex 3116941505..93c945f3ae 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html@@ -10,7 +10,7 @@<div class="side"><!-- do not leave white space between navs and nav element as we are using .navs:not(:empty)in css -->- <div class="navs"><div wicket:id="navs" class="nav">+ <div class="navs position-aware"><div wicket:id="navs" class="nav"><a class="select"><span class="drag-indicator"><i class="fa fa-reorder"></i></span><span class="name"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex 5416e17084..5bf06d1046 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -91,7 +91,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpepublic void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);int index = WicketUtils.getChildIndex(jobContents, content);- String script = String.format("onedev.server.ciSpec.edit.trackJobNameChange(%d);", index);+ String script = String.format("onedev.server.ciSpec.trackJobNameChange(%d);", index);response.render(OnDomReadyHeaderItem.forScript(script));}@@ -165,7 +165,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpejobContents.swap(fromIndex-i, fromIndex-i-1);}}- target.appendJavaScript(String.format("onedev.server.ciSpec.edit.swapJobs(%d, %d)", fromIndex, toIndex));+ target.appendJavaScript(String.format("onedev.server.ciSpec.swapJobs(%d, %d)", fromIndex, toIndex));}}.sortable(".jobs>.body>.side>.navs"));@@ -277,4 +277,6 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe}}++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.jsindex d12283d0c6..ac7d43862f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js@@ -23,11 +23,15 @@ onedev.server.ciSpec = {onedev.server.ciSpec.showJob(activeJobIndex);+ var $navs = $body.find(".side>.navs");+ $navs.data("getPosition", function() {+ return "cispec-jobs/" + $navs.children(".active").data("name");+ });// use mouseup together with ui-sortable-helper (see selectJob method) class check// to avoid the issue that sortable will fire onclick event in firefox (hence cause// the job being selected while sorting$body.find(".side>.navs>.nav>.select").mouseup(onedev.server.ciSpec.selectJob);- $body.find(".side>.navs>.nav>.delete").mouseup(onedev.server.ciSpec.edit.deleteJob);+ $body.find(".side>.navs>.nav>.delete").mouseup(onedev.server.ciSpec.deleteJob);},selectJob: function() {var $nav = $(this).parent();@@ -51,56 +55,55 @@ onedev.server.ciSpec = {$(window).resize();onedev.server.focus.doFocus($content);},- edit: {- deleteJob: function() {- var $nav = $(this).parent();- if (!$nav.hasClass("ui-sortable-helper")) {- var $body = $(".ci-spec-edit .jobs>.body");- var $navs = $body.find(">.side>.navs");- var $contents = $body.children(".contents");- var index = $nav.index();- var $nav = $navs.children().eq(index);- $nav.remove();- $contents.children().eq(index).remove();-- if ($nav.hasClass("active"))- onedev.server.ciSpec.showJob(0);-- $body.data("deleteCallback")(index);- }- },- swapJobs: function(index1, index2) {- var $contents = $(".ci-spec-edit .jobs>.body>.contents");-- if (index1 < index2) {- for (var i = 0; i < index2-index1; i++)- $contents.children().eq(index1+i).before($contents.children().eq(index1+i+1));- } else {- for (var i = 0; i < index1-index2; i++)- $contents.children().eq(index1-i).after($contents.children().eq(index1-i-1));- }- },- trackJobNameChange: function(index) {+ deleteJob: function() {+ var $nav = $(this).parent();+ if (!$nav.hasClass("ui-sortable-helper")) {var $body = $(".ci-spec-edit .jobs>.body");var $navs = $body.find(">.side>.navs");- var $nav = $navs.children().eq(index);var $contents = $body.children(".contents");- var $content = $contents.children().eq(index);+ var index = $nav.index();+ var $nav = $navs.children().eq(index);+ $nav.remove();+ $contents.children().eq(index).remove();++ if ($nav.hasClass("active"))+ onedev.server.ciSpec.showJob(0);- var $input = $content.find(">div>table>tbody>tr.property-name>td input");+ $body.data("deleteCallback")(index);+ }+ },+ swapJobs: function(index1, index2) {+ var $contents = $(".ci-spec-edit .jobs>.body>.contents");- function syncName() {- var name = $input.val().trim();- var $name = $nav.find("a.select>.name");- if (name.length != 0)- $name.text(name);- else- $name.html("<i>Name not specified</i>");- }+ if (index1 < index2) {+ for (var i = 0; i < index2-index1; i++)+ $contents.children().eq(index1+i).before($contents.children().eq(index1+i+1));+ } else {+ for (var i = 0; i < index1-index2; i++)+ $contents.children().eq(index1-i).after($contents.children().eq(index1-i-1));+ }+ },+ trackJobNameChange: function(index) {+ var $body = $(".ci-spec-edit .jobs>.body");+ var $navs = $body.find(">.side>.navs");+ var $nav = $navs.children().eq(index);+ var $contents = $body.children(".contents");+ var $content = $contents.children().eq(index);++ var $input = $content.find(">div>table>tbody>tr.property-name>td input");- $input.on("input", syncName);-- syncName();+ function syncName() {+ var name = $input.val().trim();+ var $name = $nav.find("a.select>.name");+ if (name.length != 0)+ $name.text(name);+ else+ $name.html("<i>Name not specified</i>");+ $name.closest(".nav").data("name", name);}++ $input.on("input", syncName);++ syncName();}}\ No newline at end of file