Skip to content

The Unified and Autonomous Development Platform

Add build status to commits, pull requests, branches, and tags

Robin Shen7490a29f4036
diff --git a/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.java b/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.java
index 1ca91ebf3f..f4b3c9deee 100644
--- a/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.java
+++ b/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.java
@@ -139,6 +139,10 @@ public class DefaultBuildInfoManager extends AbstractEnvironmentManager implemen
public void execute(Transaction txn) {
ByteIterable jobKey = new StringByteIterable(build.getProject().getId() + ":" + build.getJobName());
Collection<ObjectId> lastCommits = readCommits(lastCommitsStore, txn, jobKey);
+ for (Iterator<ObjectId> it = lastCommits.iterator(); it.hasNext();) {
+ if (project.getRevCommit(it.next(), false) == null)
+ it.remove();
+ }
writeCommits(prevCommitsStore, txn, new LongByteIterable(build.getId()), lastCommits);
ObjectId buildCommit = ObjectId.fromString(build.getCommitHash());
diff --git a/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 81147e7dfe..f697a29edc 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -23,6 +23,8 @@ public interface BuildManager extends EntityManager<Build> {
Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName, Map<String, List<String>> params);
+ Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName);
+
Collection<Build> query(Project project, ObjectId commitId);
Map<ObjectId, Map<String, Status>> queryStatus(Project project, Collection<ObjectId> commitIds);
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 27d8608989..040c723c0c 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -91,7 +91,13 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
@Sessional
@Override
public Collection<Build> query(Project project, ObjectId commitId) {
- return query(project, commitId, null, new HashMap<>());
+ return query(project, commitId, null);
+ }
+
+ @Sessional
+ @Override
+ public Collection<Build> query(Project project, ObjectId commitId, String jobName) {
+ return query(project, commitId, jobName, new HashMap<>());
}
@Sessional
diff --git a/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java
index 982e255a37..3d9e92799b 100644
--- a/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java
@@ -41,7 +41,6 @@ public abstract class BeanEditModalPanel extends ModalPanel {
@Override
protected void onSave(AjaxRequestTarget target, Serializable bean) {
- close();
BeanEditModalPanel.this.onSave(target, bean);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 9865ac8e4c..79b81c1b30 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -50,6 +50,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
@@ -62,7 +63,7 @@ import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
-import io.onedev.server.web.component.job.JobLink;
+import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.model.EntityModel;
import io.onedev.server.web.page.project.builds.detail.BuildLogPage;
@@ -339,7 +340,21 @@ public abstract class BuildListPanel extends Panel {
Long buildId = rowModel.getObject().getId();
Fragment fragment = new Fragment(componentId, "statusFrag", BuildListPanel.this);
- fragment.add(new BuildStatusIcon("icon", rowModel.getObject(), true));
+ fragment.add(new BuildStatusIcon("icon", new LoadableDetachableModel<Status>() {
+
+ @Override
+ protected Status load() {
+ return getBuildManager().load(buildId).getStatus();
+ }
+
+ }) {
+
+ @Override
+ protected Collection<String> getWebSocketObservables() {
+ return Sets.newHashSet(Build.getWebSocketObservable(buildId));
+ }
+
+ });
fragment.add(new Label("label", new AbstractReadOnlyModel<String>() {
@@ -374,7 +389,7 @@ public abstract class BuildListPanel extends Panel {
IModel<Build> rowModel) {
Build build = rowModel.getObject();
Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);
- Link<Void> link = new JobLink("link", getProject(), build.getCommitId(), build.getJobName());
+ Link<Void> link = new JobDefLink("link", getProject(), build.getCommitId(), build.getJobName());
link.add(new Label("label", build.getJobName()));
fragment.add(link);
cellItem.add(fragment);
diff --git a/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index d3397fc06d..9804817986 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -41,7 +41,7 @@ import io.onedev.server.util.inputspec.SecretInput;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
-import io.onedev.server.web.component.job.JobLink;
+import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
@@ -110,7 +110,7 @@ public abstract class BuildSidePanel extends Panel {
general.add(new WebMarkupContainer("copyCommitHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
- Link<Void> jobLink = new JobLink("job", getProject(), getBuild().getCommitId(), getBuild().getJobName());
+ Link<Void> jobLink = new JobDefLink("job", getProject(), getBuild().getCommitId(), getBuild().getJobName());
jobLink.add(new Label("label", getBuild().getJobName()));
general.add(jobLink);
@@ -146,6 +146,8 @@ public abstract class BuildSidePanel extends Panel {
duration = getBuild().getRunningDate().getTime() - getBuild().getQueueingDate().getTime();
else
duration = System.currentTimeMillis() - getBuild().getQueueingDate().getTime();
+ if (duration < 0)
+ duration = 0;
return DateUtils.formatDuration(duration);
}
@@ -169,6 +171,8 @@ public abstract class BuildSidePanel extends Panel {
duration = getBuild().getFinishDate().getTime() - getBuild().getRunningDate().getTime();
else
duration = System.currentTimeMillis() - getBuild().getRunningDate().getTime();
+ if (duration < 0)
+ duration = 0;
return DateUtils.formatDuration(duration);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListCssResourceReference.java
new file mode 100644
index 0000000000..188d31a714
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.build.simplelist;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class SimpleBuildListCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public SimpleBuildListCssResourceReference() {
+ super(SimpleBuildListCssResourceReference.class, "simple-build-list.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html b/core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html
new file mode 100644
index 0000000000..6cc47e0e7f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html
@@ -0,0 +1,16 @@
+<wicket:panel>
+ <div class="simple-build-list">
+ <wicket:enclosure child="showInList">
+ <div class="head clearfix">
+ <span class="pull-left">Builds</span>
+ <a wicket:id="showInList" class="show-in-list pull-right" title="Show in build list"><i class="fa fa-list-ul"></i></a>
+ </div>
+ </wicket:enclosure>
+ <div class="body">
+ <div wicket:id="builds" class="build clearfix">
+ <span wicket:id="status" class="status pull-left"></span>
+ <a wicket:id="title" class="title pull-right"><span wicket:id="label"></span></a>
+ </div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
similarity index 52%
rename from core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.java
rename to core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
index a4349f6a03..22c303141e 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
@@ -1,12 +1,11 @@
-package io.onedev.server.web.component.build.status;
+package io.onedev.server.web.component.build.simplelist;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
import java.util.List;
+import org.apache.wicket.Component;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
@@ -16,31 +15,45 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.page.project.builds.detail.BuildLogPage;
@SuppressWarnings("serial")
-public class StatusListPanel extends GenericPanel<Collection<Build>> {
+public class SimpleBuildListPanel extends GenericPanel<List<Build>> {
- public StatusListPanel(String id, IModel<Collection<Build>> model) {
+ public SimpleBuildListPanel(String id, IModel<List<Build>> model) {
super(id, model);
-
- add(new ListView<Build>("builds", new LoadableDetachableModel<List<Build>>() {
+ }
- @Override
- protected List<Build> load() {
- List<Build> builds = new ArrayList<>(model.getObject());
- builds.sort(Comparator.comparing(Build::getNumber));
- return builds;
- }
-
- }) {
+ protected List<Build> getBuilds() {
+ return getModelObject();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(newListLink("showInList"));
+
+ add(new ListView<Build>("builds", getModel()) {
@Override
protected void populateItem(ListItem<Build> item) {
Build build = item.getModelObject();
- item.add(new BuildStatusIcon("icon", build, true));
+ Long buildId = build.getId();
+ item.add(new BuildStatusIcon("status", new LoadableDetachableModel<Status>() {
+
+ @Override
+ protected Status load() {
+ return OneDev.getInstance(BuildManager.class).load(buildId).getStatus();
+ }
+
+ }));
Link<Void> buildLink = new BookmarkablePageLink<Void>("title",
BuildLogPage.class, BuildLogPage.paramsOf(build, null));
@@ -48,23 +61,30 @@ public class StatusListPanel extends GenericPanel<Collection<Build>> {
StringBuilder builder = new StringBuilder("#" + build.getNumber());
if (build.getVersion() != null)
builder.append(" (" + build.getVersion() + ")");
- builder.append(" : ").append(build.getJobName());
buildLink.add(new Label("label", builder.toString()));
item.add(buildLink);
}
});
- }
+ add(new WebMarkupContainer("noBuilds") {
- @Override
- protected void onInitialize() {
- super.onInitialize();
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getBuilds().isEmpty());
+ }
+
+ });
}
+ protected Component newListLink(String componentId) {
+ return new WebMarkupContainer(componentId).setVisible(false);
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));
+ response.render(CssHeaderItem.forReference(new SimpleBuildListCssResourceReference()));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css b/core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css
new file mode 100644
index 0000000000..c8b286e4b1
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/build/simplelist/simple-build-list.css
@@ -0,0 +1,33 @@
+.simple-build-list>.head {
+ padding: 8px 16px;
+ border-bottom: 1px solid #DDD;
+ margin-bottom: 4px;
+ min-width: 100px;
+}
+.simple-build-list>.head>span {
+ font-weight: bold;
+ margin-right: 20px;
+ font-size: 15px;
+ display: inline-block;
+}
+.simple-build-list>.head>a {
+ color: #666;
+}
+
+.simple-build-list>.body>.build {
+ padding: 4px 16px;
+}
+.simple-build-list>.body>.build>.title {
+ margin: -2px 0 0 8px;
+}
+.simple-build-list>.body>div:hover {
+ background: #F0F0F0;
+}
+.simple-build-list>.body>.no-builds {
+ font-style: italic;
+ padding: 12px;
+}
+
+.commit-status, .commit-status>.job {
+ display: inline-block;
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
index fc9603948e..954f68e713 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
@@ -2,33 +2,27 @@ package io.onedev.server.web.component.build.status;
import java.util.Collection;
+import javax.annotation.Nullable;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import com.google.common.collect.Sets;
-import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.model.EntityModel;
@SuppressWarnings("serial")
-public class BuildStatusIcon extends Panel {
+public class BuildStatusIcon extends GenericPanel<Status> {
- private final IModel<Build> buildModel;
-
- private final boolean withTooltip;
-
- public BuildStatusIcon(String id, Build build, boolean withTooltip) {
- super(id);
- this.buildModel = new EntityModel<Build>(build);
- this.withTooltip = withTooltip;
+ public BuildStatusIcon(String id, IModel<Status> model) {
+ super(id, model);
}
@Override
@@ -41,25 +35,19 @@ public class BuildStatusIcon extends Panel {
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- Build.Status status = getBuild().getStatus();
- String cssClass = "fa fa-fw build-status build-status-" + status.name().toLowerCase();
+ Status status = getModelObject();
+ String cssClass = "fa fa-fw build-status build-status-";
+ if (status != null)
+ cssClass += status.name().toLowerCase();
+ else
+ cssClass += "none";
if (status == Status.RUNNING)
cssClass += " fa-spin";
-
- if (withTooltip) {
- String title;
-
- if (status == Status.WAITING)
- title = "Waiting for completion of dependency builds";
- else if (status == Status.QUEUEING)
- title = "Queued due to limited capacity";
- else
- title = StringUtils.capitalize(status.getDisplayName().toLowerCase());
-
- tag.put("title", title);
- }
-
tag.put("class", cssClass);
+
+ String title = getTooltip(status);
+ if (title != null)
+ tag.put("title", title);
}
});
@@ -73,29 +61,41 @@ public class BuildStatusIcon extends Panel {
@Override
public void onConnectionOpened(IPartialPageRequestHandler handler) {
- handler.add(component);
+ /*
+ * Do not refresh on connection as otherwise project commit status cache will not take
+ * effect on commit list page
+ */
+ // handler.add(component);
}
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(Build.getWebSocketObservable(getBuild().getId()));
+ return getWebSocketObservables();
}
});
- setOutputMarkupPlaceholderTag(true);
+ setOutputMarkupId(true);
}
- protected Build getBuild() {
- return buildModel.getObject();
+ protected Collection<String> getWebSocketObservables() {
+ return Sets.newHashSet();
}
- @Override
- protected void onDetach() {
- buildModel.detach();
- super.onDetach();
+ @Nullable
+ protected String getTooltip(@Nullable Status status) {
+ String title;
+ if (status == Status.WAITING)
+ title = "Waiting for completion of dependency builds";
+ else if (status == Status.QUEUEING)
+ title = "Queued due to limited capacity";
+ else if (status != null)
+ title = StringUtils.capitalize(status.getDisplayName().toLowerCase());
+ else
+ title = null;
+ return title;
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.html
deleted file mode 100644
index e0173b211c..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:panel>
- <a wicket:id="status"></a>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.java
deleted file mode 100644
index 9eec27479c..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/build/status/CommitStatusPanel.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package io.onedev.server.web.component.build.status;
-
-import java.util.Collection;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Build.Status;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.model.EntityModel;
-
-@SuppressWarnings("serial")
-public class CommitStatusPanel extends Panel {
-
- private final IModel<Project> projectModel;
-
- private final ObjectId commitId;
-
- private final IModel<Status> statusModel;
-
- public CommitStatusPanel(String id, Project project, ObjectId commitId) {
- super(id);
-
- this.projectModel = new EntityModel<Project>(project);
- this.commitId = commitId;
-
- statusModel = new LoadableDetachableModel<Status>() {
-
- @Override
- protected Status load() {
- return Status.getOverallStatus(getProject().getCommitStatus(commitId).values());
- }
-
- };
- }
-
- private Project getProject() {
- return projectModel.getObject();
- }
-
- private BuildManager getBuildManager() {
- return OneDev.getInstance(BuildManager.class);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new DropdownLink("status") {
-
- @Override
- protected Component newContent(String id, FloatingPanel floating) {
- return new StatusListPanel(id, new LoadableDetachableModel<Collection<Build>>() {
-
- @Override
- protected Collection<Build> load() {
- return getBuildManager().query(getProject(), commitId);
- }
-
- });
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
-
- String cssClass = "fa fa-fw overall-build-status build-status build-status-";
- String title = "";
-
- Status status = Preconditions.checkNotNull(statusModel.getObject());
- cssClass += status.name().toLowerCase();
- if (status == Status.RUNNING)
- cssClass += " fa-spin";
- if (status != Status.SUCCESSFUL)
- title = "Some builds are ";
- else
- title = "Builds are ";
- title += status.getDisplayName().toLowerCase() + ", click for details";
- tag.put("class", cssClass);
- tag.put("title", title);
- }
-
- });
-
- add(new WebSocketObserver() {
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler, String observable) {
- handler.add(component);
- }
-
- @Override
- public void onConnectionOpened(IPartialPageRequestHandler handler) {
- /*
- * Do not refresh on connection as otherwise project commit status cache will not take
- * effect on commit list page
- */
- // handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
- return Lists.newArrayList("commit-status:" + getProject().getId() + ":" + commitId.name());
- }
-
- });
-
- setOutputMarkupPlaceholderTag(true);
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(statusModel.getObject() != null);
- }
-
- @Override
- protected void onDetach() {
- projectModel.detach();
- statusModel.detach();
- super.onDetach();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.html
deleted file mode 100644
index 924ed639ae..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<wicket:panel>
- <table class="build-status-list">
- <tr wicket:id="builds">
- <td class="status">
- <span wicket:id="icon"></span>
- </td>
- <td class="title">
- <a wicket:id="title"><span wicket:id="label"></span></a>
- </td>
- </tr>
- </table>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/build-status.css b/core/src/main/java/io/onedev/server/web/component/build/status/build-status.css
index cd80033001..adc17e768f 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/status/build-status.css
+++ b/core/src/main/java/io/onedev/server/web/component/build/status/build-status.css
@@ -28,6 +28,9 @@
.build-status-queueing:before {
content: "\f192";
}
+.build-status-none:before {
+ content: "\f111";
+}
.build-status-successful {
color: #06BC06 !important;
}
@@ -37,27 +40,6 @@
.build-status-running, .build-status-waiting, .build-status-queueing {
color: #D2A906 !important;
}
-
-/* The pending status is for not generated pull request build */
-.build-status-pending {
- color: #D2A906 !important;
-}
-.build-status-pending:before {
- content: "\f017";
-}
-
-.build-status-list {
- width: auto;
-}
-.build-status-list>tbody>tr>td.status {
- padding: 4px 4px 4px 0;
-}
-.build-status-list>tbody>tr>td.title {
- padding: 4px 0 4px 4px;
-}
-.floating>.content>.build-status-list>tbody>tr>td.status {
- padding-left: 8px;
+.build-status-none {
+ color: #CCC !important;
}
-.floating>.content>.build-status-list>tbody>tr>td.title {
- padding-right: 8px;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
index e8d3cec64b..18b79ab73f 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
@@ -37,19 +37,17 @@
</div>
<div wicket:id="contribution"></div>
</div>
- <div class="pull-right actions">
- <span wicket:id="buildStatus"></span>
- <span class="btn-group">
- <a wicket:id="hashLink" class="btn btn-default hash"><span wicket:id="hash"></span></a>
- <a wicket:id="copyHash" class="btn btn-default"><i class="fa fa-clipboard"></i></a>
- </span>
- <span class="btn-group">
- <a wicket:id="browseCode" title="Browse code" class="btn btn-default"><i class="fa fa-file-text-o"></i></a>
- <wicket:enclosure>
- <a wicket:id="compare" class="compare btn btn-default" title="Compare with base revision"><i class="fa fa-ext fa-file-diff"></i></a>
- </wicket:enclosure>
- </span>
- </div>
+ <span class="btn-group browse pull-right">
+ <a wicket:id="browseCode" title="Browse code" class="btn btn-default"><i class="fa fa-file-text-o"></i></a>
+ <wicket:enclosure>
+ <a wicket:id="compare" class="compare btn btn-default" title="Compare with base revision"><i class="fa fa-ext fa-file-diff"></i></a>
+ </wicket:enclosure>
+ </span>
+ <span class="btn-group hash pull-right">
+ <a wicket:id="hashLink" class="btn btn-default hash"><span wicket:id="hash"></span></a>
+ <a wicket:id="copyHash" class="btn btn-default"><i class="fa fa-clipboard"></i></a>
+ </span>
+ <span wicket:id="buildStatus" class="build-status pull-right"></span>
</wicket:fragment>
<wicket:fragment wicket:id="dateFrag">
<i class="fa fa-calendar"></i> <span wicket:id="date"></span>
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index f5ff2a651b..f41aed06d0 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -69,10 +69,10 @@ import io.onedev.server.util.Constants;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.CommitQueryBehavior;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.build.status.CommitStatusPanel;
import io.onedev.server.web.component.commit.graph.CommitGraphResourceReference;
import io.onedev.server.web.component.commit.graph.CommitGraphUtils;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
+import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
index 65544d43b2..add07cd4ac 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
@@ -62,8 +62,14 @@
.commit-list>.body .message-and-labels .commit-message .ellipsis-expander {
margin-bottom: 2px;
}
-.commit-list>.body .actions>* {
- margin: 6px 0 0 8px;
+.commit-list>.body .commit>.pull-right {
+ margin: 6px 0 0 8px;
+}
+.commit-list>.body .commit>.pull-right.hash {
+ margin-left: 4px;
+}
+.commit-list>.body .commit>.pull-right.build-status {
+ margin-top: 10px;
}
.commit-list>.body>.list {
margin-bottom: 0;
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusCssResourceReference.java
new file mode 100644
index 0000000000..c51dc28aa5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.commit.status;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class CommitStatusCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public CommitStatusCssResourceReference() {
+ super(CommitStatusCssResourceReference.class, "commit-status.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
new file mode 100644
index 0000000000..d1a18154a1
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
@@ -0,0 +1,16 @@
+<wicket:panel>
+ <a wicket:id="link" class="commit-status"><span wicket:id="icon"></span></a>
+ <wicket:fragment wicket:id="detailFrag">
+ <div class="commit-status-detail">
+ <div wicket:id="jobs" class="job">
+ <div class="head clearfix">
+ <a wicket:id="jobDetailToggle" class="detail pull-left"><span wicket:id="icon"></span></a>
+ <a wicket:id="jobDef" class="def pull-left" title="Goto job definition"><span wicket:id="label"></span></a>
+ <a wicket:id="runJob" class="run pull-right" title="Run this job"><i class="fa fa-play"></i></a>
+ <a wicket:id="showInList" class="show-in-list pull-right" title="Show in build list"><i class="fa fa-list-ul"></i></a>
+ </div>
+ <div wicket:id="jobDetail" class="body"></div>
+ </div>
+ </div>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
new file mode 100644
index 0000000000..b6526cdbef
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
@@ -0,0 +1,239 @@
+package io.onedev.server.web.component.commit.status;
+
+import static io.onedev.server.search.entity.EntityQuery.quote;
+import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
+import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
+import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;
+import static io.onedev.server.util.BuildConstants.FIELD_JOB;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.eclipse.jgit.lib.ObjectId;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.job.Job;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
+import io.onedev.server.web.component.build.status.BuildStatusIcon;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.job.JobDefLink;
+import io.onedev.server.web.component.job.RunJobLink;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.model.EntityModel;
+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
+
+@SuppressWarnings("serial")
+public class CommitStatusPanel extends Panel {
+
+ private final IModel<Project> projectModel;
+
+ private final ObjectId commitId;
+
+ private final IModel<List<Job>> jobsModel = new LoadableDetachableModel<List<Job>>() {
+
+ @Override
+ protected List<Job> load() {
+ CISpec ciSpec = getProject().getCISpec(commitId);
+ if (ciSpec != null)
+ return ciSpec.getSortedJobs();
+ else
+ return new ArrayList<>();
+ }
+
+ };
+
+ public CommitStatusPanel(String id, Project project, ObjectId commitId) {
+ super(id);
+
+ this.projectModel = new EntityModel<Project>(project);
+ this.commitId = commitId;
+ }
+
+ private Project getProject() {
+ return projectModel.getObject();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ DropdownLink link = new DropdownLink("link") {
+
+ private boolean isShowJobDetail(WebMarkupContainer jobItem) {
+ return (boolean) jobItem.getDefaultModelObject();
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ Fragment fragment = new Fragment(id, "detailFrag", CommitStatusPanel.this);
+
+ RepeatingView jobsView = new RepeatingView("jobs");
+ fragment.add(jobsView);
+ for (Job job: jobsModel.getObject()) {
+ WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId(), Model.of(false));
+ AjaxLink<Void> detailLink = new AjaxLink<Void>("jobDetailToggle") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ jobItem.setDefaultModelObject(!isShowJobDetail(jobItem));
+ target.add(jobItem);
+ }
+
+ };
+ Status status = getProject().getCommitStatus(commitId).get(job.getName());
+ detailLink.add(new BuildStatusIcon("icon", Model.of(status)) {
+
+ @Override
+ protected String getTooltip(Status status) {
+ String title;
+ if (status != null) {
+ if (status != Status.SUCCESSFUL)
+ title = "Some builds in job are ";
+ else
+ title = "Builds in job are ";
+ title += status.getDisplayName().toLowerCase() + ", click to toggle details";
+ } else {
+ title = "No builds in job";
+ }
+ return title;
+ }
+
+ });
+ jobItem.add(detailLink);
+
+ Link<Void> defLink = new JobDefLink("jobDef", getProject(), commitId, job.getName());
+ defLink.add(new Label("label", job.getName()));
+ jobItem.add(defLink);
+
+ jobItem.add(new RunJobLink("runJob", getProject(), commitId, job.getName()) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+
+ });
+
+ String query = ""
+ + quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + quote(commitId.name())
+ + " " + getRuleName(And) + " "
+ + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(job.getName());
+
+ jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,
+ ProjectBuildsPage.paramsOf(getProject(), query, 0)) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(status != null && isShowJobDetail(jobItem));
+ }
+
+ });
+
+ jobItem.add(new SimpleBuildListPanel("jobDetail", new LoadableDetachableModel<List<Build>>() {
+
+ @Override
+ protected List<Build> load() {
+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);
+ List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId, job.getName()));
+ builds.sort(Comparator.comparing(Build::getNumber));
+ return builds;
+ }
+
+ }) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(isShowJobDetail(jobItem));
+ }
+
+ });
+
+ jobItem.setOutputMarkupId(true);
+ jobsView.add(jobItem);
+ }
+
+ return fragment;
+ }
+
+ };
+ link.add(new BuildStatusIcon("icon", new LoadableDetachableModel<Status>() {
+
+ @Override
+ protected Status load() {
+ return Status.getOverallStatus(getProject().getCommitStatus(commitId).values());
+ }
+
+ }) {
+
+ @Override
+ protected String getTooltip(Status status) {
+ String title;
+ if (status != null) {
+ if (status != Status.SUCCESSFUL)
+ title = "Some builds are ";
+ else
+ title = "Builds are ";
+ title += status.getDisplayName().toLowerCase() + ", click for details";
+ } else {
+ title = "No builds";
+ }
+ return title;
+ }
+
+ @Override
+ protected Collection<String> getWebSocketObservables() {
+ return Lists.newArrayList("commit-status:" + getProject().getId() + ":" + commitId.name());
+ }
+
+ });
+ add(link);
+ }
+
+ @Override
+ protected void onDetach() {
+ projectModel.detach();
+ jobsModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!jobsModel.getObject().isEmpty());
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css b/core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css
new file mode 100644
index 0000000000..ca4b2a11d6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/commit/status/commit-status.css
@@ -0,0 +1,29 @@
+.commit-status {
+ display: inline-block;
+}
+.commit-status-detail {
+ padding: 12px;
+}
+.commit-status-detail>.job>.head {
+ padding: 4px 0;
+}
+.commit-status-detail>.job>.head>.detail {
+ margin-right: 8px;
+}
+.commit-status-detail>.job>.head>.def {
+ margin-right: 40px;
+}
+.commit-status-detail>.job>.head>.run {
+ margin-left: 8px;
+ color: #666;
+}
+.commit-status-detail>.job>.head>.show-in-list {
+ color: #666;
+}
+.commit-status-detail>.job>.body {
+ border-top: 1px solid #D8D8D8;
+ padding: 8px 0 0 8px;
+}
+.commit-status-detail>.job>.head>.detail {
+ margin-top: 2px;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/job/JobLink.java b/core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/web/component/job/JobLink.java
rename to core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
index 257da18c63..c8a17d82bc 100644
--- a/core/src/main/java/io/onedev/server/web/component/job/JobLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
@@ -17,7 +17,7 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecRendererProvider;
@SuppressWarnings("serial")
-public class JobLink extends BookmarkablePageLink<Void> {
+public class JobDefLink extends BookmarkablePageLink<Void> {
private final IModel<Project> projectModel;
@@ -25,7 +25,7 @@ public class JobLink extends BookmarkablePageLink<Void> {
private final String jobName;
- public JobLink(String id, Project project, ObjectId commitId, String jobName) {
+ public JobDefLink(String id, Project project, ObjectId commitId, String jobName) {
super(id, ProjectBlobPage.class);
this.projectModel = new EntityModel<Project>(project);
this.commitId = commitId;
diff --git a/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.html
new file mode 100644
index 0000000000..acb0f72422
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <a wicket:id="link" class="job-status"><span wicket:id="icon"></span></a>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.java
new file mode 100644
index 0000000000..c76f687058
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/job/JobStatusPanel.java
@@ -0,0 +1,151 @@
+package io.onedev.server.web.component.job;
+
+import static io.onedev.server.search.entity.EntityQuery.quote;
+import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
+import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
+import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;
+import static io.onedev.server.util.BuildConstants.FIELD_JOB;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.eclipse.jgit.lib.ObjectId;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
+import io.onedev.server.web.component.build.status.BuildStatusIcon;
+import io.onedev.server.web.component.commit.status.CommitStatusCssResourceReference;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.model.EntityModel;
+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
+
+@SuppressWarnings("serial")
+public class JobStatusPanel extends Panel {
+
+ private final IModel<Project> projectModel;
+
+ private final ObjectId commitId;
+
+ private final String jobName;
+
+ private final IModel<Status> statusModel = new LoadableDetachableModel<Status>() {
+
+ @Override
+ protected Status load() {
+ return getProject().getCommitStatus(commitId).get(jobName);
+ }
+
+ };
+
+ public JobStatusPanel(String id, Project project, ObjectId commitId, String jobName) {
+ super(id);
+
+ this.projectModel = new EntityModel<Project>(project);
+ this.commitId = commitId;
+ this.jobName = jobName;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ DropdownLink link = new DropdownLink("link") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new SimpleBuildListPanel(id, new LoadableDetachableModel<List<Build>>() {
+
+ @Override
+ protected List<Build> load() {
+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);
+ List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId, jobName));
+ builds.sort(Comparator.comparing(Build::getNumber));
+ return builds;
+ }
+
+ }) {
+
+ @Override
+ protected Component newListLink(String componentId) {
+ String query = ""
+ + quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + quote(commitId.name())
+ + " " + getRuleName(And) + " "
+ + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);
+
+ return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,
+ ProjectBuildsPage.paramsOf(getProject(), query, 0)) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getBuilds().isEmpty());
+ }
+
+ };
+ }
+
+ };
+ }
+
+ };
+ link.add(new BuildStatusIcon("icon", statusModel) {
+
+ @Override
+ protected String getTooltip(Status status) {
+ String title;
+ if (status != null) {
+ if (status != Status.SUCCESSFUL)
+ title = "Some builds are ";
+ else
+ title = "Builds are ";
+ title += status.getDisplayName().toLowerCase() + ", click for details";
+ } else {
+ title = "No builds";
+ }
+ return title;
+ }
+
+ @Override
+ protected Collection<String> getWebSocketObservables() {
+ return Lists.newArrayList("job-status:" + getProject().getId() + ":" + commitId.name() + ":" + jobName);
+ }
+
+ });
+ add(link);
+ }
+
+ private Project getProject() {
+ return projectModel.getObject();
+ }
+
+ @Override
+ protected void onDetach() {
+ projectModel.detach();
+ statusModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
new file mode 100644
index 0000000000..1d81bae913
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -0,0 +1,117 @@
+package io.onedev.server.web.component.job;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.model.IModel;
+import org.eclipse.jgit.lib.ObjectId;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.job.Job;
+import io.onedev.server.ci.job.JobManager;
+import io.onedev.server.ci.job.param.JobParam;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.inputspec.InputContext;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
+import io.onedev.server.web.model.EntityModel;
+import io.onedev.server.web.page.project.builds.detail.BuildLogPage;
+
+@SuppressWarnings("serial")
+public class RunJobLink extends AjaxLink<Void> {
+
+ private final IModel<Project> projectModel;
+
+ private final ObjectId commitId;
+
+ private final String jobName;
+
+ public RunJobLink(String componentId, Project project, ObjectId commitId, String jobName) {
+ super(componentId);
+
+ this.projectModel = new EntityModel<Project>(project);
+ this.commitId = commitId;
+ this.jobName = jobName;
+ }
+
+ private Project getProject() {
+ return projectModel.getObject();
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ CISpec ciSpec = Preconditions.checkNotNull(getProject().getCISpec(commitId));
+ Job job = Preconditions.checkNotNull(ciSpec.getJobMap().get(jobName));
+ if (!job.getParamSpecs().isEmpty()) {
+ Serializable paramBean;
+ try {
+ paramBean = JobParam.defineBeanClass(job.getParamSpecs()).newInstance();
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+
+ new ParamEditModalPanel(target, paramBean) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Serializable bean) {
+ Map<String, List<String>> paramMap = JobParam.getParamMap(
+ job, bean, job.getParamSpecMap().keySet());
+ Build build = OneDev.getInstance(JobManager.class).submit(getProject(),
+ commitId, job.getName(), paramMap);
+ setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build, null));
+ }
+
+ @Override
+ public List<String> getInputNames() {
+ return new ArrayList<>(job.getParamSpecMap().keySet());
+ }
+
+ @Override
+ public InputSpec getInputSpec(String inputName) {
+ return Preconditions.checkNotNull(job.getParamSpecMap().get(inputName));
+ }
+
+ @Override
+ public void validateName(String inputName) {
+ throw new UnsupportedOperationException();
+ }
+
+ };
+ } else {
+ Build build = OneDev.getInstance(JobManager.class).submit(getProject(), commitId,
+ job.getName(), new HashMap<>());
+ setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build, null));
+ }
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canWriteCode(getProject().getFacade()));
+ }
+
+ @Override
+ protected void onDetach() {
+ projectModel.detach();
+ super.onDetach();
+ }
+
+ private abstract class ParamEditModalPanel extends BeanEditModalPanel implements InputContext {
+
+ public ParamEditModalPanel(AjaxRequestTarget target, Serializable bean) {
+ super(target, bean);
+ }
+
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsPanel.html b/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsPanel.html
deleted file mode 100644
index 232ef8317d..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsPanel.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<wicket:panel>
- <div class="commit-jobs">
- <div wicket:id="jobs" class="job">
- <div class="head clearfix">
- <a wicket:id="name" class="name pull-left"><span wicket:id="label"></span></a>
- <span class="actions pull-right">
- <a wicket:id="list" class="list" title="Show builds in list"><i class="fa fa-list-ul"></i></a>
- <a wicket:id="run" class="run" title="Run this job"><i class="fa fa-play-circle"></i></a>
- </span>
- </div>
- <div class="body">
- <wicket:container wicket:id="builds">
- <a wicket:id="build" class="build"><span wicket:id="status"></span></a>
- </wicket:container>
- <div wicket:id="noBuilds" class="no-builds">No builds</div>
- </div>
- </div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsPanel.java b/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsPanel.java
deleted file mode 100644
index 951280511a..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsPanel.java
+++ /dev/null
@@ -1,293 +0,0 @@
-package io.onedev.server.web.component.job.commit;
-
-import static io.onedev.server.search.entity.EntityQuery.quote;
-import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
-import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
-import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;
-import static io.onedev.server.util.BuildConstants.FIELD_JOB;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
-import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.server.OneDev;
-import io.onedev.server.ci.CISpec;
-import io.onedev.server.ci.job.Job;
-import io.onedev.server.ci.job.JobManager;
-import io.onedev.server.ci.job.param.JobParam;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Build.Status;
-import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.inputspec.InputContext;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
-import io.onedev.server.web.component.build.status.BuildStatusIcon;
-import io.onedev.server.web.component.job.JobLink;
-import io.onedev.server.web.model.EntityModel;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
-import io.onedev.server.web.page.project.builds.detail.BuildLogPage;
-import io.onedev.server.web.util.QueryPosition;
-import io.onedev.server.web.websocket.WebSocketManager;
-
-@SuppressWarnings("serial")
-public class CommitJobsPanel extends Panel {
-
- private final IModel<Project> projectModel;
-
- private final ObjectId commitId;
-
- private final IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {
-
- @Override
- protected List<Build> load() {
- List<Build> builds = new ArrayList<>(OneDev.getInstance(BuildManager.class).query(getProject(), commitId));
- Collections.sort(builds);
- return builds;
- }
-
- };
-
- public CommitJobsPanel(String id, Project project, ObjectId commitId) {
- super(id);
- projectModel = new EntityModel<Project>(project);
- this.commitId = commitId;
- }
-
- private Project getProject() {
- return projectModel.getObject();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- RepeatingView jobsView = new RepeatingView("jobs");
- CISpec ciSpec = getProject().getCISpec(commitId);
- if (ciSpec != null) {
- for (Job job: ciSpec.getSortedJobs()) {
- String query = ""
- + quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + quote(commitId.name())
- + " " + getRuleName(And) + " "
- + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(job.getName());
-
- WebMarkupContainer jobContainer = new WebMarkupContainer(jobsView.newChildId());
- jobsView.add(jobContainer);
-
- Link<Void> jobLink = new JobLink("name", getProject(), commitId, job.getName());
- jobLink.add(new Label("label", job.getName()));
- jobContainer.add(jobLink);
-
- jobContainer.add(new BookmarkablePageLink<Void>("list", ProjectBuildsPage.class,
- ProjectBuildsPage.paramsOf(getProject(), query, 0)));
-
- jobContainer.add(new AjaxLink<Void>("run") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- if (!job.getParamSpecs().isEmpty()) {
- Serializable paramBean;
- try {
- paramBean = JobParam.defineBeanClass(job.getParamSpecs()).newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
-
- new ParamEditModalPanel(target, paramBean) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, Serializable bean) {
- Map<String, List<String>> paramMap = JobParam.getParamMap(
- job, bean, job.getParamSpecMap().keySet());
- Build build = OneDev.getInstance(JobManager.class).submit(getProject(),
- commitId, job.getName(), paramMap);
- setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build, null));
- }
-
- @Override
- public List<String> getInputNames() {
- return new ArrayList<>(job.getParamSpecMap().keySet());
- }
-
- @Override
- public InputSpec getInputSpec(String inputName) {
- return Preconditions.checkNotNull(job.getParamSpecMap().get(inputName));
- }
-
- @Override
- public void validateName(String inputName) {
- throw new UnsupportedOperationException();
- }
-
- };
- } else {
- Build build = OneDev.getInstance(JobManager.class).submit(getProject(), commitId,
- job.getName(), new HashMap<>());
- setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build, null));
- }
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canWriteCode(getProject().getFacade()));
- }
-
- });
-
- IModel<List<Build>> jobBuildsModel = new LoadableDetachableModel<List<Build>>() {
-
- @Override
- protected List<Build> load() {
- return buildsModel.getObject()
- .stream()
- .filter(it->it.getJobName().equals(job.getName()))
- .collect(Collectors.toList());
- }
-
- };
-
- jobContainer.add(new ListView<Build>("builds", jobBuildsModel) {
-
- @Override
- protected void populateItem(ListItem<Build> item) {
- QueryPosition position = new QueryPosition(query, getList().size(), item.getIndex());
- Link<Void> link = new BookmarkablePageLink<Void>("build", BuildLogPage.class,
- BuildLogPage.paramsOf(item.getModelObject(), position));
- link.add(new BuildStatusIcon("status", item.getModelObject(), false) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("title", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- Build build = getBuild();
- StringBuilder title = new StringBuilder("Build #" + build.getNumber());
- if (build.getVersion() != null)
- title.append(" (").append(build.getVersion()).append(")");
- title.append(" is ");
- if (build.getStatus() == Status.WAITING)
- title.append("waiting for completion of dependency builds");
- else if (build.getStatus() == Status.QUEUEING)
- title.append("queued due to limited capacity");
- else
- title.append(build.getStatus().getDisplayName().toLowerCase());
-
- return title.append(", click for details").toString();
- }
-
- }));
- }
-
- });
-
- item.add(link);
- }
-
- });
-
- jobContainer.add(new WebMarkupContainer("noBuilds") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(jobBuildsModel.getObject().isEmpty());
- }
-
- });
- }
- }
- add(jobsView);
-
- add(new WebSocketObserver() {
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler, String observable) {
- handler.add(component);
- }
-
- @Override
- public void onConnectionOpened(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
- return Sets.newHashSet("commit-builds:" + getProject().getId() + ":" + commitId.name());
- }
-
- });
-
- setOutputMarkupId(true);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new CommitJobsResourceReference()));
- String script = String.format("onedev.server.commitJobs.onDomReady('%s');", getMarkupId());
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- CISpec ciSpec = getProject().getCISpec(commitId);
- setVisible(ciSpec != null && !ciSpec.getJobs().isEmpty());
- }
-
- @Override
- protected void onAfterRender() {
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange((BasePage) getPage());
- super.onAfterRender();
- }
-
- @Override
- protected void onDetach() {
- projectModel.detach();
- buildsModel.detach();
- super.onDetach();
- }
-
- private abstract class ParamEditModalPanel extends BeanEditModalPanel implements InputContext {
-
- public ParamEditModalPanel(AjaxRequestTarget target, Serializable bean) {
- super(target, bean);
- }
-
- }
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsResourceReference.java b/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsResourceReference.java
deleted file mode 100644
index 858b8b6f39..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/job/commit/CommitJobsResourceReference.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.onedev.server.web.component.job.commit;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-
-import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class CommitJobsResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public CommitJobsResourceReference() {
- super(CommitJobsResourceReference.class, "commit-jobs.js");
- }
-
- @Override
- public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- CommitJobsResourceReference.class, "commit-jobs.css")));
- return dependencies;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/job/commit/commit-jobs.css b/core/src/main/java/io/onedev/server/web/component/job/commit/commit-jobs.css
deleted file mode 100644
index c66c514e85..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/job/commit/commit-jobs.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.commit-jobs {
- white-space: nowrap;
-}
-.commit-jobs>.job {
- display: inline-block;
- margin-right: 20px;
- border: 1px solid #D8D8D8;
- border-radius: 4px;
- width: 211px;
-}
-.commit-jobs>.job:last-child {
- margin-right: 0;
-}
-.commit-jobs>.job>.head {
- padding: 4px 8px;
- vertical-align: middle;
- font-size: 16px;
- border-radius: 4px 4px 0 0;
- border-bottom: 1px dotted #CCC;
- font-weight: bold;
-}
-.commit-jobs>.job>.head>.actions a {
- color: #666;
- margin: 0 0 0 8px;
-}
-.commit-jobs>.job>.head>.actions a.run {
- line-height: 16px;
- font-size: 18px;
-}
-.commit-jobs>.job>.body {
- height: 75px;
- padding: 8px 8px 0 8px;
- white-space: normal;
-}
-.commit-jobs>.job>.body .build-status {
- margin-bottom: 8px;
- font-size: 18px;
-}
-.commit-jobs>.job>.body .build-status-running {
- font-size: 16px;
-}
-.commit-jobs>.job>.body>.no-builds {
- font-size: 16px;
- font-style: italic;
- margin-bottom: 8px;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/job/commit/commit-jobs.js b/core/src/main/java/io/onedev/server/web/component/job/commit/commit-jobs.js
deleted file mode 100644
index bd028cb6a4..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/job/commit/commit-jobs.js
+++ /dev/null
@@ -1,11 +0,0 @@
-onedev.server.commitJobs = {
- onDomReady: function(containerId) {
- $("#" + containerId + ">.commit-jobs>.job>.body").each(function() {
- var ps = new PerfectScrollbar(this);
- $(window).resize(function() {
- ps.update();
- });
- });
-
- }
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java
index 2164b23274..403c020771 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java
@@ -15,7 +15,7 @@ import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;
import io.onedev.server.web.asset.hover.HoverResourceReference;
import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;
-import io.onedev.server.web.component.build.status.BuildStatusCssResourceReference;
+import io.onedev.server.web.component.commit.status.CommitStatusCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -38,7 +38,7 @@ public class MarkdownResourceReference extends BaseDependentResourceReference {
dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));
- dependencies.add(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new BaseDependentCssResourceReference(MarkdownResourceReference.class, "markdown.css")));
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
index 4704830912..14379a7331 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
@@ -191,6 +191,7 @@ abstract class JobExecutorEditPanel extends Panel {
@Override
protected void onSave(AjaxRequestTarget target, Serializable bean) {
+ close();
target.add(editor);
target.focusComponent(null);
testBehavior.requestTest(target);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index cf85802adb..8a4f3c7d1f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -75,7 +75,7 @@ import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;
import io.onedev.server.web.component.branch.choice.BranchSingleChoice;
-import io.onedev.server.web.component.build.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index da8510f4bd..a7ccf01887 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -40,6 +40,7 @@ import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
@@ -152,7 +153,21 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContex
}));
- summary.add(new BuildStatusIcon("statusIcon", getBuild(), true));
+ summary.add(new BuildStatusIcon("statusIcon", new AbstractReadOnlyModel<Status>() {
+
+ @Override
+ public Status getObject() {
+ return getBuild().getStatus();
+ }
+
+ }) {
+
+ @Override
+ protected Collection<String> getWebSocketObservables() {
+ return Sets.newHashSet(Build.getWebSocketObservable(getBuild().getId()));
+ }
+
+ });
summary.add(new Label("statusLabel", new AbstractReadOnlyModel<String>() {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
index 468441ef3d..5b157717fd 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
@@ -25,7 +25,15 @@
<div wicket:id="parents" class="parents pull-left"></div>
</div>
</div>
- <div wicket:id="jobs"></div>
+ <wicket:enclosure child="jobs">
+ <div class="jobs">
+ <div wicket:id="jobs" class="job">
+ <span wicket:id="status" class="status"></span>
+ <a wicket:id="name" class="name"><span wicket:id="label"></span></a>
+ <a wicket:id="run" class="run" title="Run this job"><i class="fa fa-play"></i></a>
+ </div>
+ </div>
+ </wicket:enclosure>
<div wicket:id="revisionDiff"></div>
</div>
<wicket:fragment wicket:id="refsFrag">
@@ -47,5 +55,5 @@
<span>1 parent</span>
<a wicket:id="parent" class="parent hash"><span wicket:id="label"></span></a>
</div>
- </wicket:fragment>
+ </wicket:fragment>
</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index e8163a1b1b..d880f03e7a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -39,6 +39,8 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.cache.CommitInfoManager;
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.job.Job;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
@@ -57,7 +59,9 @@ import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.createtag.CreateTagLink;
import io.onedev.server.web.component.diff.revision.CommentSupport;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
-import io.onedev.server.web.component.job.commit.CommitJobsPanel;
+import io.onedev.server.web.component.job.JobDefLink;
+import io.onedev.server.web.component.job.JobStatusPanel;
+import io.onedev.server.web.component.job.RunJobLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.page.project.ProjectPage;
@@ -223,7 +227,37 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
newParentsContainer(null);
- add(new CommitJobsPanel("jobs", getProject(), getCommit().copy()));
+ add(new ListView<Job>("jobs", new LoadableDetachableModel<List<Job>>() {
+
+ @Override
+ protected List<Job> load() {
+ CISpec ciSpec = getProject().getCISpec(getCommit().copy());
+ if (ciSpec != null)
+ return ciSpec.getSortedJobs();
+ else
+ return new ArrayList<>();
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<Job> item) {
+ ObjectId commitId = getCommit().copy();
+ Job job = item.getModelObject();
+ Link<Void> jobLink = new JobDefLink("name", getProject(), commitId, job.getName());
+ jobLink.add(new Label("label", job.getName()));
+ item.add(jobLink);
+ item.add(new JobStatusPanel("status", getProject(), commitId, job.getName()));
+ item.add(new RunJobLink("run", getProject(), commitId, job.getName()));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getModelObject().isEmpty());
+ }
+
+ });
newRevisionDiff(null);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css b/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
index 7512dedf79..9ff3edb474 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
@@ -84,3 +84,18 @@
#commit-detail>.info>.contribution-and-parents .parents .fa {
font-size: 12px;
}
+
+#commit-detail>.jobs>.job {
+ border: 2px solid #DDD;
+ padding: 4px 8px;
+ margin-right: 20px;
+ background: #F9F9F9;
+ border-radius: 4px;
+ font-size: 16px;
+ font-weight: bold;
+ display: inline-block;
+}
+#commit-detail>.jobs>.job>.run {
+ margin-left: 20px;
+ color: #666;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.java
index eb50b760e3..df1742603c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailCssResourceReference.java
@@ -1,5 +1,11 @@
package io.onedev.server.web.page.project.pullrequests.detail;
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+
+import io.onedev.server.web.component.commit.status.CommitStatusCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
public class PullRequestDetailCssResourceReference extends BaseDependentCssResourceReference {
@@ -10,4 +16,11 @@ public class PullRequestDetailCssResourceReference extends BaseDependentCssResou
super(PullRequestDetailCssResourceReference.class, "pull-request-detail.css");
}
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new CommitStatusCssResourceReference()));
+ return dependencies;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 118d9903f8..4af7a86881 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -101,11 +101,14 @@
<div wicket:id="reviews" class="body"></div>
</div>
</wicket:enclosure>
- <wicket:enclosure child="builds">
- <div class="builds">
+ <wicket:enclosure child="jobs">
+ <div class="jobs">
<div class="head">Builds</div>
<div class="body">
- <div wicket:id="builds"></div>
+ <div wicket:id="jobs" class="job clearfix">
+ <a wicket:id="status" class="status pull-left"><span wicket:id="icon"></span></a>
+ <a wicket:id="name" class="name pull-left"><span wicket:id="label"></span></a>
+ </div>
</div>
</div>
</wicket:enclosure>
@@ -124,5 +127,5 @@
repository, you may synchronize them manually here</p>
<a wicket:id="delete" class="delete btn btn-danger">Delete</a>
</div>
- </wicket:fragment>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 7adea6f334..16d57433fc 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -47,6 +48,8 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
@@ -60,20 +63,24 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
+import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.cache.UserInfoManager;
+import io.onedev.server.ci.CISpec;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
@@ -90,10 +97,12 @@ import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.component.branch.BranchLink;
-import io.onedev.server.web.component.build.status.StatusListPanel;
+import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
+import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
@@ -412,7 +421,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {
}
}
-
+
};
fragment.add(new EntityNavPanel<PullRequest>("requestNav") {
@@ -454,19 +463,104 @@ public abstract class PullRequestDetailPage extends ProjectPage {
fragment.add(newMergeStrategyContainer());
fragment.add(new ReviewListPanel("reviews", requestModel));
- fragment.add(new StatusListPanel("builds", new LoadableDetachableModel<Collection<Build>>() {
+ fragment.add(new ListView<String>("jobs", new LoadableDetachableModel<List<String>>() {
@Override
- protected Collection<Build> load() {
- return getPullRequest().getPullRequestBuilds().stream().map(it->it.getBuild()).collect(Collectors.toList());
+ protected List<String> load() {
+ PullRequest request = getPullRequest();
+ MergePreview preview = request.getMergePreview();
+ if (preview != null && preview.getMerged() != null) {
+ CISpec ciSpec = request.getTargetProject().getCISpec(ObjectId.fromString(preview.getMerged()));
+ if (ciSpec != null) {
+ Set<String> pullRequestJobNames = request.getPullRequestBuilds()
+ .stream()
+ .map(it->it.getBuild().getJobName())
+ .collect(Collectors.toSet());
+ return ciSpec.getSortedJobs()
+ .stream()
+ .map(it->it.getName())
+ .filter(it->pullRequestJobNames.contains(it))
+ .collect(Collectors.toList());
+ }
+ }
+ return new ArrayList<>();
}
}) {
+ @Override
+ protected void populateItem(ListItem<String> item) {
+ PullRequest request = getPullRequest();
+ MergePreview preview = request.getMergePreview();
+ Preconditions.checkState(preview != null && preview.getMerged() != null);
+ ObjectId commitId = ObjectId.fromString(preview.getMerged());
+ Project project = request.getTargetProject();
+ String jobName = item.getModelObject();
+
+ WebMarkupContainer link = new DropdownLink("status") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new SimpleBuildListPanel(id, new LoadableDetachableModel<List<Build>>() {
+
+ @Override
+ protected List<Build> load() {
+ List<Build> builds = getPullRequest().getPullRequestBuilds()
+ .stream()
+ .map(it->it.getBuild())
+ .filter(it->it.getJobName().equals(jobName))
+ .collect(Collectors.toList());
+ Collections.sort(builds);
+ return builds;
+ }
+
+ }) {
+
+ @Override
+ protected Component newListLink(String componentId) {
+ return new WebMarkupContainer(componentId);
+ }
+
+ };
+ }
+
+ };
+
+ Status status = Status.getOverallStatus(request.getPullRequestBuilds()
+ .stream()
+ .filter(it->it.getBuild().getJobName().equals(jobName))
+ .map(it->it.getBuild().getStatus())
+ .collect(Collectors.toSet()));
+
+ link.add(new BuildStatusIcon("icon", Model.of(status)) {
+
+ @Override
+ protected String getTooltip(Status status) {
+ String title;
+ if (status != null) {
+ if (status != Status.SUCCESSFUL)
+ title = "Some builds are ";
+ else
+ title = "Builds are ";
+ title += status.getDisplayName().toLowerCase() + ", click for details";
+ } else {
+ title = "No builds";
+ }
+ return title;
+ }
+
+ });
+ item.add(link);
+
+ link = new JobDefLink("name", project, commitId, jobName);
+ link.add(new Label("label", jobName));
+ item.add(link);
+ }
+
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getPullRequest().getPullRequestBuilds().isEmpty());
+ setVisible(!getModelObject().isEmpty());
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 287a4b826a..9d48cbd841 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -1,8 +1,11 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.stream.Collectors;
import javax.servlet.http.Cookie;
@@ -23,16 +26,21 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
import org.joda.time.DateTime;
import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestCommentManager;
@@ -58,6 +66,7 @@ import io.onedev.server.web.page.security.LoginPage;
import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
import io.onedev.server.web.websocket.PageDataChanged;
+import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
public class PullRequestActivitiesPage extends PullRequestDetailPage {
@@ -211,6 +220,8 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
partialPageRequestHandler.add(sinceChangesRow);
prevActivityRow = sinceChangesRow;
}
+
+ Collection<ObjectId> commitIds = new HashSet<>();
for (PullRequestActivity activity: newActivities) {
Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
@@ -224,11 +235,66 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
if (activity instanceof PullRequestUpdatedActivity) {
partialPageRequestHandler.appendJavaScript("$('tr.since-changes').addClass('visible');");
+ PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;
+ commitIds.addAll(updatedActivity.getUpdate().getCommits()
+ .stream().map(it->it.copy()).collect(Collectors.toSet()));
}
prevActivityRow = newActivityRow;
}
+
+ PullRequest request = getPullRequest();
+ Project project = request.getTargetProject();
+ project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));
+
+ if (!commitIds.isEmpty()) {
+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {
+
+ @Override
+ public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {
+ }
+
+ @Override
+ public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {
+ }
+
+ @Override
+ public IRequestHandler onException(RequestCycle cycle, Exception ex) {
+ return null;
+ }
+
+ @Override
+ public void onEndRequest(RequestCycle cycle) {
+ notifyWebSocketObserverChange();
+ }
+
+ @Override
+ public void onDetach(RequestCycle cycle) {
+ }
+
+ @Override
+ public void onBeginRequest(RequestCycle cycle) {
+ }
+
+ });
+ }
}
}
+
+ private void notifyWebSocketObserverChange() {
+ OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ }
private Component newSinceChangesRow(String id, Date sinceDate) {
WebMarkupContainer row = new WebMarkupContainer(id);
@@ -244,6 +310,10 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
return row;
}
+
+ private BuildManager getBuildManager() {
+ return OneDev.getInstance(BuildManager.class);
+ }
@Override
protected void onInitialize() {
@@ -256,8 +326,20 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
addOrReplace(activitiesView = new RepeatingView("activities"));
List<PullRequestActivity> activities = getActivities();
-
+
+ Collection<ObjectId> commitIds = new HashSet<>();
+ for (PullRequestActivity activity: activities) {
+ if (activity instanceof PullRequestUpdatedActivity) {
+ PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;
+ commitIds.addAll(updatedActivity.getUpdate().getCommits()
+ .stream().map(it->it.copy()).collect(Collectors.toSet()));
+ }
+ }
+
PullRequest request = getPullRequest();
+ Project project = request.getTargetProject();
+ project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));
+
List<PullRequestActivity> oldActivities = new ArrayList<>();
List<PullRequestActivity> newActivities = new ArrayList<>();
for (PullRequestActivity activity: activities) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
index d652a54bb1..d5b777fc65 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
@@ -12,16 +12,14 @@
<div wicket:id="message"></div>
</td>
<td class="hash-and-status clearfix">
- <div class="pull-right">
+ <span class="btn-group pull-right browse">
<a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>
- </div>
- <div class="pull-right">
- <span wicket:id="buildStatus" class="build-status"></span>
- <span class="btn-group">
- <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>
- <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>
- </span>
- </div>
+ </span>
+ <span class="btn-group pull-right hash">
+ <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>
+ <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>
+ </span>
+ <span wicket:id="buildStatus" class="build-status pull-right"></span>
</td>
</tr>
</table>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
index 2f176bb5f6..5513697035 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
@@ -1,8 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-import java.util.Collection;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -16,11 +14,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
@@ -29,8 +24,8 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.build.status.CommitStatusPanel;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
+import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
@@ -72,15 +67,6 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
}) {
- @Override
- protected void onBeforeRender() {
- Collection<ObjectId> commitIds = getModelObject().stream().map(it->it.copy()).collect(Collectors.toSet());
- BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- Project project = PullRequestUpdatedPanel.this.getModelObject().getRequest().getTargetProject();
- project.cacheCommitStatus(buildManager.queryStatus(project, commitIds));
- super.onBeforeRender();
- }
-
@Override
protected void populateItem(final ListItem<RevCommit> item) {
RevCommit commit = item.getModelObject();
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index 5eaccf1aa0..f6154f1240 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -47,9 +47,12 @@
#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status {
width: 160px;
}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status>div {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status>span {
margin-left: 8px;
}
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status>span.hash {
+ margin-left: 4px;
+}
#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content a.commit {
color: #444;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
index c73a55b5ff..a0e9fe0a80 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
@@ -29,7 +29,7 @@ import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.search.code.CommitIndexed;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.build.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 518c63eaa7..fcd32ecc8d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -133,6 +133,15 @@ ul>li>a.code-comments.new .fa-circle {
border-top: none;
padding-top: 0;
}
+#request-detail>.side-info>.content>.jobs>.body>.job {
+ margin-bottom: 4px;
+}
+#request-detail>.side-info>.content>.jobs>.body>.job:last-child {
+ margin-bottom: 0;
+}
+#request-detail>.side-info>.content>.jobs>.body>.job>.name {
+ margin: -3px 0 0 4px;
+}
.floating>.content>.instruction {
padding: 12px 12px 12px 24px;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index 4402993d3a..438f1b0beb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -52,7 +52,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.ajaxlistener.ConfirmListener;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.build.status.CommitStatusPanel;
+import io.onedev.server.web.component.commit.status.CommitStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.link.ArchiveMenuLink;
diff --git a/core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
index c1cecb4fb3..de9f725702 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
@@ -5,8 +5,8 @@ import javax.inject.Singleton;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.build.BuildEvent;
-import io.onedev.server.event.build.BuildSubmitted;
import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
import io.onedev.server.web.util.WicketUtils;
@Singleton
@@ -22,13 +22,17 @@ public class BuildEventBroadcaster {
@Listen
public void on(BuildEvent event) {
PageKey pageKey = WicketUtils.getPageKey();
- webSocketManager.notifyObservableChange(Build.getWebSocketObservable(event.getBuild().getId()), pageKey);
- String observable = "commit-status:" + event.getProject().getId() + ":" + event.getBuild().getCommitHash();
+
+ Project project = event.getProject();
+ Build build = event.getBuild();
+
+ webSocketManager.notifyObservableChange(Build.getWebSocketObservable(build.getId()), pageKey);
+
+ String observable = "commit-status:" + project.getId() + ":" + build.getCommitHash();
+ webSocketManager.notifyObservableChange(observable, pageKey);
+
+ observable = "job-status:" + project.getId() + ":" + build.getCommitHash() + ":" + build.getJobName();
webSocketManager.notifyObservableChange(observable, pageKey);
- if (event instanceof BuildSubmitted) {
- observable = "commit-builds:" + event.getProject().getId() + ":" + event.getBuild().getCommitHash();
- webSocketManager.notifyObservableChange(observable, pageKey);
- }
}
}
\ No newline at end of file