The Unified and Autonomous Development Platform
Prompt for adding onedev-ci.xml in project blob page when appropriate
Robin Shen2f401a5fbd10
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.htmlindex ada073a057..19f2ca5974 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html@@ -17,6 +17,7 @@<img wicket:id="icon"><span>Revision indexing in progress... (search in this revision will be accurate after indexed)</span></div>+ <div wicket:id="ciSupportNote" class="ci-support-note"><i class="fa fa-info-circle"></i> Enable CI support by <a wicket:id="addFile">adding onedev-ci.xml</a></div><div wicket:id="blobContent" class="blob-content"></div><div wicket:id="searchResult" class="search-result"><div id="search-result-resize-handle" class="ui-resizable-handle ui-resizable-n"></div>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 6c59232145..0e93c1fbac 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@@ -55,6 +55,7 @@ import io.onedev.commons.jsymbol.util.NoAntiCacheImage;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;+import io.onedev.server.ci.CISpec;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -241,6 +242,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S});+ newCISupportNote(null);newBlobContent(null);add(searchResult = new WebMarkupContainer("searchResult"));@@ -380,7 +382,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overridepublic void onClick(AjaxRequestTarget target) {- onModeChange(target, Mode.ADD);+ onModeChange(target, Mode.ADD, null);dropdown.close();}@@ -556,7 +558,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Selsequery = null;blobOperations.add(new ViewStateAwarePageLink<Void>("history", ProjectCommitsPage.class,- ProjectCommitsPage.paramsOf(getProject(), query, compareWith)).setVisible(resolvedRevision!=null));+ ProjectCommitsPage.paramsOf(getProject(), query, compareWith)));blobOperations.add(new ArchiveMenuLink("download", projectModel) {@@ -696,6 +698,57 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S}}+ private void newCISupportNote(@Nullable AjaxRequestTarget target) {+ Component ciSupportNote = new WebMarkupContainer("ciSupportNote") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (SecurityUtils.canModify(getProject(), state.blobIdent.revision, CISpec.BLOB_PATH)) {+ add(new ViewStateAwareAjaxLink<Void>("addFile") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onModeChange(target, Mode.ADD, CISpec.BLOB_PATH);+ }++ });+ } else {+ add(new WebMarkupContainer("addFile") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }++ });+ }+ setOutputMarkupPlaceholderTag(true);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ if (resolvedRevision != null && isOnBranch() && state.blobIdent.path == null && state.mode == Mode.VIEW) {+ BlobIdent blobIdent = new BlobIdent(resolvedRevision.name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE);+ setVisible(getProject().getBlob(blobIdent, false) == null);+ } else {+ setVisible(false);+ }+ }++ };++ if (target != null) {+ replace(ciSupportNote);+ target.add(ciSupportNote);+ } else {+ add(ciSupportNote);+ }+ }+private void newRevisionPicker(@Nullable AjaxRequestTarget target) {String revision = state.blobIdent.revision;boolean canCreateRef;@@ -771,6 +824,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Starget.add(revisionIndexing);newBlobNavigator(target);newBlobOperations(target);+ newCISupportNote(target);newBlobContent(target);resizeWindow(target);}@@ -876,6 +930,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sstate = popState;newBlobNavigator(target);newBlobOperations(target);+ newCISupportNote(target);newBlobContent(target);resizeWindow(target);}@@ -934,6 +989,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sstate.commentId = null;newBlobNavigator(target);newBlobOperations(target);+ newCISupportNote(target);newBlobContent(target);resizeWindow(target);OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);@@ -945,12 +1001,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S} else {state.mode = Mode.VIEW;newBlobOperations(target);+ newCISupportNote(target);newBlobContent(target);resizeWindow(target);}} else if (prevPosition != null) {state.mode = Mode.VIEW;newBlobOperations(target);+ newCISupportNote(target);newBlobContent(target);resizeWindow(target);}@@ -1038,8 +1096,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S}@Override- public void onModeChange(AjaxRequestTarget target, Mode mode) {- state.initialNewPath = null;+ public void onModeChange(AjaxRequestTarget target, Mode mode, @Nullable String newPath) {+ state.initialNewPath = newPath;/** User might be changing blob name when adding a file, and onModeChange will be called.@@ -1053,6 +1111,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, SnewBlobOperations(target);}}+ newCISupportNote(target);newBlobContent(target);resizeWindow(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.cssindex e78a642839..f09de26bd9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css@@ -101,6 +101,12 @@ body.ProjectBlobPage.additionalWidth3 {color: #8a6d3b;font-size: 13px;}+#project-blob>.ci-support-note {+ padding: 8px;+ border-bottom: 1px solid #DDD;+ background: #E5FBE5;+ color: #399529;+}#project-blob>.search-result {height: 200px;border-top: 1px solid #E0E0E0;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.jsindex a5b9d9eed9..3da8fbd7fc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js@@ -48,7 +48,9 @@ onedev.server.projectBlob = {var headWidth = $head.width();// below code moves file navigator to bottom if it is too wide- var maxWidth = headWidth - $revisionPicker.outerWidth() - $buildStatus.outerWidth() - $operations.outerWidth();+ var maxWidth = headWidth - $revisionPicker.outerWidth() - $operations.outerWidth();+ if ($buildStatus.length != 0)+ maxWidth -= $buildStatus.outerWidth();var maxHeight = $head.height();var $blobNavigator = $head.children(".blob-navigator");@@ -58,7 +60,7 @@ onedev.server.projectBlob = {} else {$blobNavigator = $("#project-blob>.blob-navigator>div");if ($blobNavigator.outerWidth() <= maxWidth && $blobNavigator.outerHeight() <= maxHeight) {- $blobNavigator.insertAfter($buildStatus);+ $blobNavigator.insertAfter($revisionPicker.next());$("#project-blob>.blob-navigator").hide();}}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 1b9b7aa19b..0741f6e7db 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@@ -75,7 +75,7 @@ public interface BlobRenderContext extends Serializable {void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits);- void onModeChange(AjaxRequestTarget target, Mode mode);+ void onModeChange(AjaxRequestTarget target, Mode mode, @Nullable String newPath);void onCommitted(@Nullable AjaxRequestTarget target, RefUpdated refUpdated, @Nullable String position);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 2b2c33db6f..47832c1faa 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@@ -278,7 +278,7 @@ public abstract class CommitOptionPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- context.onModeChange(target, Mode.VIEW);+ context.onModeChange(target, Mode.VIEW, null);}});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 4902786107..367cd8a204 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@@ -72,7 +72,7 @@ public abstract class BlobEditPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- context.onModeChange(target, Mode.VIEW);+ context.onModeChange(target, Mode.VIEW, null);}});@@ -174,7 +174,7 @@ public abstract class BlobEditPanel extends Panel {@Overrideprotected void respond(AjaxRequestTarget target) {// recreate content editor as different name might be using different editor- context.onModeChange(target, Mode.ADD);+ context.onModeChange(target, Mode.ADD, null);}});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 93c945f3ae..04ae0cf3ae 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@@ -18,7 +18,7 @@<a title="Delete job" class="delete"><i class="fa fa-trash"></i></a></div></div><a wicket:id="add" class="add btn btn-success btn-block">- <i class="fa fa-plus"></i> Add New+ <i class="fa fa-plus"></i> Add Job</a></div><div class="contents">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex 14326e3a29..871815a3a4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -108,7 +108,7 @@ public abstract class BlobViewPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- context.onModeChange(target, Mode.EDIT);+ context.onModeChange(target, Mode.EDIT, null);}};@@ -143,7 +143,7 @@ public abstract class BlobViewPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- context.onModeChange(target, Mode.DELETE);+ context.onModeChange(target, Mode.DELETE, null);}};@@ -235,9 +235,9 @@ public abstract class BlobViewPanel extends Panel {@Overrideprotected void onUpdate(AjaxRequestTarget target) {if (context.getMode() == Mode.VIEW)- context.onModeChange(target, Mode.VIEW_PLAIN);+ context.onModeChange(target, Mode.VIEW_PLAIN, null);else- context.onModeChange(target, Mode.VIEW);+ context.onModeChange(target, Mode.VIEW, null);}}));@@ -263,9 +263,9 @@ public abstract class BlobViewPanel extends Panel {@Overrideprotected void onUpdate(AjaxRequestTarget target) {if (context.getMode() == Mode.BLAME)- context.onModeChange(target, Mode.VIEW);+ context.onModeChange(target, Mode.VIEW, null);else- context.onModeChange(target, Mode.BLAME);+ context.onModeChange(target, Mode.BLAME, null);}}));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.cssindex dc8ba2c7e1..b35e4b4c90 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css@@ -6,7 +6,7 @@ body.SourceLinesPage {}#project-stats .note {border-top: 1px solid #EEE;- margin-bottom: 20px;+ padding: 20px 0;color: #666;font-size: 16px;}