The Unified and Autonomous Development Platform
Fix minor issues while editing build spec
Robin Shend204a3fc3068
diff --git a/core/src/main/java/io/onedev/server/build/BuildSpec.java b/core/src/main/java/io/onedev/server/build/BuildSpec.javaindex 2393ffdd6a..16f2367cbd 100644--- a/core/src/main/java/io/onedev/server/build/BuildSpec.java+++ b/core/src/main/java/io/onedev/server/build/BuildSpec.java@@ -10,6 +10,8 @@ import io.onedev.server.web.editable.annotation.Editable;public class BuildSpec implements Serializable {private static final long serialVersionUID = 1L;++ public static final String BLOB_PATH = "onedev-buildspec.xml";private List<JobSpec> jobs = new ArrayList<>();diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex 8703f48652..f4686e14bc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -24,7 +24,7 @@ public interface BlobRenderContext extends Serializable {public enum Mode {VIEW,/*- * Some blob can be rendered in a way for easier understanding, such as onedev.buildspec,+ * Some blob can be rendered in a way for easier understanding, such as onedev-buildspec.xml,* In these cases, the VIEW_PLAIN mode enables to view plain text of the blob*/VIEW_PLAIN,diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.javaindex 21ab8b436a..ffb889e7b7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java@@ -10,10 +10,13 @@ import org.apache.wicket.model.Model;@SuppressWarnings("serial")public class PlainEditPanel extends FormComponentPanel<String> {+ private final String fileName;+private TextArea<String> input;- public PlainEditPanel(String id, String initialContent) {+ public PlainEditPanel(String id, String fileName, String initialContent) {super(id, Model.of(initialContent));+ this.fileName = fileName;}@Override@@ -32,7 +35,10 @@ public class PlainEditPanel extends FormComponentPanel<String> {@Overridepublic void convertInput() {- setConvertedInput(input.getConvertedInput());+ if (input.getConvertedInput() != null)+ setConvertedInput(input.getConvertedInput());+ else+ setConvertedInput("");}@Override@@ -40,7 +46,8 @@ public class PlainEditPanel extends FormComponentPanel<String> {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new PlainEditResourceReference()));- String script = String.format("onedev.server.plainEdit.onDomReady('%s');", getMarkupId());+ String script = String.format("onedev.server.plainEdit.onDomReady('%s', '%s');",+ getMarkupId(), fileName);response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.jsindex ace6507f28..f5bd400a49 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js@@ -1,5 +1,5 @@onedev.server.plainEdit = {- onDomReady: function(containerId) {+ onDomReady: function(containerId, fileName) {var $container = $("#" + containerId);var $plainEdit = $container.children(".plain-edit");var $source = $plainEdit.children(".source");@@ -20,7 +20,7 @@ onedev.server.plainEdit = {highlightIdentifiers: {delay: 500}});- onedev.server.codemirror.setMode(cm, "buildspec.xml");+ onedev.server.codemirror.setMode(cm, fileName);/** AreYouSure can not track dirty correctly for CodeMirror generateddiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex 18ad7038d6..f3042abd78 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -8,6 +8,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.FormComponentPanel;+import io.onedev.server.build.BuildSpec;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditPanel;@@ -99,7 +100,7 @@ public class BuildSpecEditPanel extends BlobEditPanel {@Overridepublic FormComponentPanel<String> newEditor(String componentId, String initialContent) {- return plainEditor = new PlainEditPanel(componentId, initialContent);+ return plainEditor = new PlainEditPanel(componentId, BuildSpec.BLOB_PATH, initialContent);}};diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.htmlindex a85e139b55..9213506312 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.html@@ -1,5 +1,8 @@<wicket:panel>- <div wicket:id="buildSpec" class="build-spec"></div>+ <div wicket:id="content" class="build-spec build-spec-editor"></div>+ <wicket:fragment wicket:id="validFrag">+ <div wicket:id="buildSpec" class="valid"></div>+ </wicket:fragment><wicket:fragment wicket:id="invalidFrag"><div class="invalid"><div class="title">Error rendering build spec</div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.javaindex ac39eeca28..0a9cfd69ba 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditor.java@@ -39,7 +39,7 @@ class BuildSpecEditor extends FormComponentPanel<byte[]> {try {buildSpec = (BuildSpec) VersionedDocument.fromXML(buildSpecString).toBean();} catch (Exception e) {- Fragment fragment = new Fragment("buildSpec", "invalidFrag", this);+ Fragment fragment = new Fragment("content", "invalidFrag", this);fragment.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString(e)));add(fragment);}@@ -47,8 +47,10 @@ class BuildSpecEditor extends FormComponentPanel<byte[]> {buildSpec = new BuildSpec();}- if (buildSpec != null)- add(beanEditor = BeanContext.editBean("buildSpec", buildSpec));+ if (buildSpec != null) {+ Fragment fragment = new Fragment("content", "validFrag", this);+ fragment.add(beanEditor = BeanContext.editBean("buildSpec", buildSpec));+ }}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.javaindex 55085edcdd..44c5ee26ba 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java@@ -4,6 +4,7 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;+import io.onedev.server.build.BuildSpec;import io.onedev.server.web.PrioritizedComponentRenderer;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;@@ -15,7 +16,7 @@ public class BuildSpecRendererProvider implements BlobRendererContribution {private static final long serialVersionUID = 1L;private boolean isBuildSpec(@Nullable String blobPath) {- return "onedev.buildspec".equals(blobPath);+ return BuildSpec.BLOB_PATH.equals(blobPath);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.htmlindex 9acf94ec1e..b491436b47 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.html@@ -1,5 +1,8 @@<wicket:extend>- <div wicket:id="buildSpec" class="build-spec"></div>+ <div wicket:id="content" class="build-spec build-spec-viewer"></div>+ <wicket:fragment wicket:id="validFrag">+ <div wicket:id="buildSpec" class="valid"></div>+ </wicket:fragment><wicket:fragment wicket:id="invalidFrag"><div class="invalid"><div class="title">Error rendering build spec</div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.javaindex 5f9eb6e7c4..0fa8e0dcfc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecViewPanel.java@@ -31,14 +31,16 @@ public class BuildSpecViewPanel extends BlobViewPanel {if (StringUtils.isNotBlank(buildSpecString)) {try {BuildSpec buildSpec = (BuildSpec) VersionedDocument.fromXML(buildSpecString).toBean();- add(BeanContext.viewBean("buildSpec", buildSpec));+ Fragment fragment = new Fragment("content", "validFrag", this);+ fragment.add(BeanContext.viewBean("buildSpec", buildSpec));+ add(fragment);} catch (Exception e) {- Fragment fragment = new Fragment("buildSpec", "invalidFrag", this);+ Fragment fragment = new Fragment("content", "invalidFrag", this);fragment.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString(e)));add(fragment);}} else {- add(new Fragment("buildSpec", "emptyFrag", this));+ add(new Fragment("content", "emptyFrag", this));}}