Skip to content

The Unified and Autonomous Development Platform

feat: Add build time in Build list page (OD-1950)

Robin Shen90f77eb7e839
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 8b398c13e9..d8aa1d767f 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -6504,6 +6504,10 @@ public class DataMigrator {
milestoneNameElement.setName("iterationName");
}
}
+ for (Node node : dom.selectNodes("//io.onedev.server.ee.dashboard.widgets.BuildListWidget")) {
+ if (node instanceof Element)
+ ((Element) node).addElement("showDuration").setText("false");
+ }
dom.writeToFile(file, false);
} else if (file.getName().startsWith("IssueFields.xml")) {
VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 554b66d3cb..95de9f0e64 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -104,6 +104,8 @@ public abstract class BuildListPanel extends Panel {
private final boolean showRef;
+ private final boolean showDuration;
+
private final int expectedCount;
private final IModel<BuildQuery> queryModel = new LoadableDetachableModel<BuildQuery>() {
@@ -131,10 +133,12 @@ public abstract class BuildListPanel extends Panel {
private boolean querySubmitted = true;
- public BuildListPanel(String id, IModel<String> queryModel, boolean showRef, int expectedCount) {
+ public BuildListPanel(String id, IModel<String> queryModel, boolean showRef,
+ boolean showDuration, int expectedCount) {
super(id);
this.queryStringModel = queryModel;
this.showRef = showRef;
+ this.showDuration = showDuration;
this.expectedCount = expectedCount;
}
@@ -1116,9 +1120,36 @@ public abstract class BuildListPanel extends Panel {
}
});
- }
-
- columns.add(new AbstractColumn<Build, Void>(Model.of("Last Update")) {
+ }
+
+ if (showDuration) {
+ columns.add(new AbstractColumn<>(Model.of("Duration")) {
+
+ @Override
+ public String getCssClass() {
+ return "d-none d-xl-table-cell";
+ }
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId, IModel<Build> rowModel) {
+ Build build = rowModel.getObject();
+ if (build.getRunningDate() != null) {
+ long duration;
+ if (build.getFinishDate() != null)
+ duration = build.getFinishDate().getTime() - build.getRunningDate().getTime();
+ else
+ duration = System.currentTimeMillis() - build.getRunningDate().getTime();
+ if (duration < 0)
+ duration = 0;
+ cellItem.add(new Label(componentId, DateUtils.formatDuration(duration)));
+ } else {
+ cellItem.add(new Label(componentId, "<i>n/a</i>").setEscapeModelStrings(false));
+ }
+ }
+ });
+ }
+
+ columns.add(new AbstractColumn<>(Model.of("Last Update")) {
@Override
public String getCssClass() {
@@ -1137,7 +1168,7 @@ public abstract class BuildListPanel extends Panel {
public String getObject() {
return rowModel.getObject().getStatus().toString();
}
-
+
}) {
@Override
@@ -1146,7 +1177,7 @@ public abstract class BuildListPanel extends Panel {
add(newBuildObserver(buildId));
setOutputMarkupId(true);
}
-
+
});
fragment.add(new Label("date", new LoadableDetachableModel<String>() {
@@ -1154,7 +1185,7 @@ public abstract class BuildListPanel extends Panel {
protected String load() {
return DateUtils.formatAge(rowModel.getObject().getStatusDate());
}
-
+
}));
fragment.add(newBuildObserver(buildId));
fragment.setOutputMarkupId(true);
@@ -1162,7 +1193,7 @@ public abstract class BuildListPanel extends Panel {
}
});
- body.add(buildsTable = new DefaultDataTable<Build, Void>("builds", columns, dataProvider,
+ body.add(buildsTable = new DefaultDataTable<>("builds", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()));
setOutputMarkupId(true);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java
index 11b587f304..120a2033c5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java
@@ -58,7 +58,7 @@ public class AgentBuildsPage extends AgentDetailPage {
pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
}
- }, true, 0) {
+ }, true, true, 0) {
@Override
protected BuildQuery getBaseQuery() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
index 8e9264ea17..60152c844b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
@@ -119,7 +119,7 @@ public class BuildListPage extends LayoutPage {
pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
}
- }, true, expectedCount) {
+ }, true, true, expectedCount) {
@Override
protected PagingHistorySupport getPagingHistorySupport() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index 55f6b0628c..26d0856b09 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -126,7 +126,7 @@ public class ProjectBuildsPage extends ProjectPage {
pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
}
- }, true, 0) {
+ }, true, true, 0) {
@Override
protected PagingHistorySupport getPagingHistorySupport() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index 1afa7c4d18..02e3ff8a2e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -161,7 +161,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, 0) {
+ Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, true, 0) {
@Override
protected BuildQuery getBaseQuery() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
index 1738d70cbf..5519a742e1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
@@ -57,7 +57,7 @@ public class IssueBuildsPage extends IssueDetailPage {
pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
}
- }, true, 0) {
+ }, true, true, 0) {
@Override
protected BuildQuery getBaseQuery() {
diff --git a/server-ee b/server-ee
index 0f3a32877e..58e68373d0 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 0f3a32877eec5a7f0e9a90fe4c1d4de6b500c1f6
+Subproject commit 58e68373d09d376cc8d74ed9d79405276b889ce5