Skip to content

The Unified and Autonomous Development Platform

Rework build description edit to save screen space

Robin Shen98aebb4b20e3
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
index 26d2eede09..e4ea8ed0fe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
@@ -10,6 +10,7 @@
<div class="mr-2">
<a wicket:id="rebuild" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2" title="Re-run this build"><wicket:svg href="re-run" class="icon"/></a>
<a wicket:id="cancel" class="btn btn-icon btn-light btn-hover-danger btn-xs mr-2" title="Cancel this build"><wicket:svg href="cancel" class="icon"/></a>
+ <a wicket:id="edit" title="Edit build description" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="edit" class="icon"/></a>
<a wicket:id="terminal" title="Open terminal of current running step" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="terminal" class="icon"/></a>
<a wicket:id="promotions" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2" title="Promotions"><wicket:svg href="next" class="icon"/></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index de8491164c..96e2eeeceb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -32,6 +32,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.collect.Sets;
+import io.onedev.commons.loader.ListenerRegistry;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobContext;
@@ -39,6 +40,7 @@ import io.onedev.server.buildspec.job.JobDependency;
import io.onedev.server.buildspec.job.JobManager;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.event.build.BuildUpdated;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
@@ -58,6 +60,7 @@ import io.onedev.server.util.script.identity.ScriptIdentityAware;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
@@ -66,9 +69,8 @@ import io.onedev.server.web.component.job.joblist.JobListPanel;
import io.onedev.server.web.component.link.BuildSpecLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
-import io.onedev.server.web.component.project.comment.CommentPanel;
+import io.onedev.server.web.component.markdown.MarkdownViewer;
import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.component.sideinfo.SideInfoPanel;
import io.onedev.server.web.component.tabbable.PageTabHead;
@@ -87,8 +89,6 @@ import io.onedev.server.web.util.BuildAware;
import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
public abstract class BuildDetailPage extends ProjectPage
@@ -284,6 +284,32 @@ public abstract class BuildDetailPage extends ProjectPage
}.add(newBuildObserver(getBuild().getId())).setOutputMarkupPlaceholderTag(true));
+ add(new AjaxLink<Void>("edit") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ DescriptionBean bean = new DescriptionBean();
+ bean.setValue(getBuild().getDescription());
+ new BeanEditModalPanel<Serializable>(target, bean) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Serializable bean) {
+ getBuild().setDescription(((DescriptionBean)bean).getValue());
+ OneDev.getInstance(BuildManager.class).save(getBuild());
+ OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(getBuild()));
+ close();
+ }
+
+ };
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canManage(getBuild()));
+ }
+
+ });
add(new AjaxLink<Void>("terminal") {
private TerminalManager getTerminalManager() {
@@ -392,63 +418,29 @@ public abstract class BuildDetailPage extends ProjectPage
add(jobNotFoundContainer);
- add(new CommentPanel("description") {
+ add(new MarkdownViewer("description", new AbstractReadOnlyModel<String>() {
@Override
- protected String getComment() {
+ public String getObject() {
return getBuild().getDescription();
}
+
+ }, new ContentVersionSupport() {
@Override
- protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getBuild().setDescription(comment);
- OneDev.getInstance(BuildManager.class).save(getBuild());
- }
-
- @Override
- protected Project getProject() {
- return getBuild().getProject();
- }
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getBuild().getUUID(),
- SecurityUtils.canManage(getBuild()));
- }
-
- @Override
- protected boolean canModifyOrDeleteComment() {
- return SecurityUtils.canManage(getBuild());
- }
-
- @Override
- protected String getRequiredLabel() {
- return null;
- }
-
- @Override
- protected String getEmptyDescription() {
- return "No description";
+ public long getVersion() {
+ return 0;
}
- @Override
- protected ContentVersionSupport getContentVersionSupport() {
- return new ContentVersionSupport() {
-
- @Override
- public long getVersion() {
- return 0;
- }
-
- };
- }
+ }) {
@Override
- protected DeleteCallback getDeleteCallback() {
- return null;
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getBuild().getDescription() != null);
}
- }.setOutputMarkupId(true).add(newBuildObserver(getBuild().getId())));
+ }.setOutputMarkupPlaceholderTag(true).add(newBuildObserver(getBuild().getId())));
add(new Tabbable("buildTabs", new LoadableDetachableModel<List<? extends Tab>>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/DescriptionBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/DescriptionBean.java
new file mode 100644
index 0000000000..5d085f06cd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/DescriptionBean.java
@@ -0,0 +1,27 @@
+package io.onedev.server.web.page.project.builds.detail;
+
+import java.io.Serializable;
+
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Markdown;
+import io.onedev.server.web.editable.annotation.OmitName;
+
+@Editable(name="Build Description")
+public class DescriptionBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String value;
+
+ @Editable
+ @Markdown
+ @OmitName
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}