Skip to content

The Unified and Autonomous Development Platform

Fix issue #253 - Link to edit build spec from build detail page for convenience

Robin Shen3de8cdaab14a
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
index ece6816a55..336cb6330f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
@@ -11,7 +11,7 @@
<div>
<div class="name">Branch</div>
<div class="value">
- <span wicket:id="branch"></span>
+ <a wicket:id="branch"><span wicket:id="label"></span></a>
</div>
</div>
</wicket:enclosure>
@@ -19,7 +19,7 @@
<div>
<div class="name">Tag</div>
<div class="value">
- <span wicket:id="tag"></span>
+ <a wicket:id="tag"><span wicket:id="label"></span></a>
</div>
</div>
</wicket:enclosure>
@@ -27,6 +27,7 @@
<div class="name">Job</div>
<div class="value">
<a wicket:id="job"><span wicket:id="label"></span></a>
+ <a wicket:id="editJob" title="Edit job"><wicket:svg href="edit" class="icon icon-sm ml-1 mb-1"/></a>
</div>
</div>
<div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index c713b3ba29..32ba30ae57 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -20,9 +20,13 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
import com.google.common.collect.Sets;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
@@ -42,6 +46,9 @@ import io.onedev.server.web.component.pullrequest.RequestStatusBadge;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.builds.BuildListPage;
+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.renderers.buildspec.BuildSpecRendererProvider;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
@@ -77,14 +84,50 @@ public abstract class BuildSidePanel extends Panel {
add(general);
String branch = getBuild().getBranch();
- general.add(new Label("branch", branch).setVisible(branch != null));
+
+ ProjectBlobPage.State state = new ProjectBlobPage.State();
+ state.blobIdent = new BlobIdent(branch, null, FileMode.TREE.getBits());
+ PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);
+
+ Link<Void> branchLink = new BookmarkablePageLink<Void>("branch", ProjectBlobPage.class, params) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (!isEnabled())
+ tag.setName("span");
+ }
+
+ };
+ branchLink.add(new Label("label", branch));
+ branchLink.setVisible(branch != null);
+ branchLink.setEnabled(SecurityUtils.canReadCode(getProject()));
+ general.add(branchLink);
String tag = getBuild().getTag();
- general.add(new Label("tag", tag).setVisible(tag != null));
+
+ state = new ProjectBlobPage.State();
+ state.blobIdent = new BlobIdent(tag, null, FileMode.TREE.getBits());
+ params = ProjectBlobPage.paramsOf(getProject(), state);
+
+ Link<Void> tagLink = new BookmarkablePageLink<Void>("tag", ProjectBlobPage.class, params) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (!isEnabled())
+ tag.setName("span");
+ }
+
+ };
+ tagLink.add(new Label("label", tag));
+ tagLink.setVisible(tag != null);
+ tagLink.setEnabled(SecurityUtils.canReadCode(getProject()));
+ general.add(tagLink);
CommitDetailPage.State commitState = new CommitDetailPage.State();
commitState.revision = getBuild().getCommitHash();
- PageParameters params = CommitDetailPage.paramsOf(getProject(), commitState);
+ params = CommitDetailPage.paramsOf(getProject(), commitState);
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("commit", CommitDetailPage.class, params) {
@@ -111,6 +154,39 @@ public abstract class BuildSidePanel extends Panel {
jobLink.add(new Label("label", getBuild().getJobName()));
general.add(jobLink);
+ if (branch != null) {
+ if (SecurityUtils.canModify(getProject(), branch, BuildSpec.BLOB_PATH)) {
+ state = new ProjectBlobPage.State();
+ state.blobIdent = new BlobIdent(getBuild().getBranch(), BuildSpec.BLOB_PATH,
+ FileMode.REGULAR_FILE.getBits());
+ state.mode = BlobRenderContext.Mode.EDIT;
+ state.position = BuildSpecRendererProvider.getPosition(Job.SELECTION_PREFIX + getBuild().getJobName());
+ state.urlBeforeEdit = urlFor(getPage().getClass(), getPage().getPageParameters()).toString();
+ params = ProjectBlobPage.paramsOf(getProject(), state);
+ general.add(new BookmarkablePageLink<Void>("editJob", ProjectBlobPage.class, params));
+ } else {
+ general.add(new WebMarkupContainer("editJob").setVisible(false));
+ }
+ } else {
+ PullRequest request = getBuild().getRequest();
+ if (request != null
+ && request.getSource() != null
+ && request.getSource().getObjectName(false) != null
+ && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), BuildSpec.BLOB_PATH)) {
+ BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), BuildSpec.BLOB_PATH,
+ FileMode.REGULAR_FILE.getBits());
+ state = new ProjectBlobPage.State(blobIdent);
+ state.requestId = request.getId();
+ state.mode = BlobRenderContext.Mode.EDIT;
+ state.urlBeforeEdit = urlFor(getPage().getClass(), getPage().getPageParameters()).toString();
+ state.urlAfterEdit = urlFor(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(request)).toString();
+ params = ProjectBlobPage.paramsOf(request.getSourceProject(), state);
+ general.add(new BookmarkablePageLink<Void>("editJob", ProjectBlobPage.class, params));
+ } else {
+ general.add(new WebMarkupContainer("editJob").setVisible(false));
+ }
+ }
+
general.add(new Label("submitDate", new LoadableDetachableModel<String>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
index c647ffb294..0bfac4ce3e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -77,7 +77,6 @@ import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
import io.onedev.server.web.util.AnnotationInfo;
import io.onedev.server.web.util.CodeCommentInfo;
import io.onedev.server.web.util.DiffPlanarRange;
@@ -235,8 +234,7 @@ public class TextDiffPanel extends Panel {
if (getPullRequest() != null
&& getPullRequest().getSource() != null
&& getPullRequest().getSource().getObjectName(false) != null
- && SecurityUtils.canModify(getPullRequest().getSourceProject(), getPullRequest().getSourceBranch(), change.getPath())
- && getPage() instanceof PullRequestChangesPage) {
+ && SecurityUtils.canModify(getPullRequest().getSourceProject(), getPullRequest().getSourceBranch(), change.getPath())) {
// we are in context of a pull request and pull request source branch exists, so we edit in source branch instead
Link<Void> editLink = new Link<Void>("editFile") {