Skip to content

The Unified and Autonomous Development Platform

Add file changes and fixed in builds tab to issue page

Robin Shen8340b903c7ff
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index d42ee2f900..ace83b4faa 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -99,6 +99,7 @@ import io.onedev.server.manager.TeamManager;
import io.onedev.server.manager.IssueActionManager;
import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.manager.IssueFieldUnaryManager;
+import io.onedev.server.manager.IssueInfoManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.IssueQuerySettingManager;
import io.onedev.server.manager.IssueVoteManager;
@@ -141,6 +142,7 @@ import io.onedev.server.manager.impl.DefaultTeamManager;
import io.onedev.server.manager.impl.DefaultIssueActionManager;
import io.onedev.server.manager.impl.DefaultIssueCommentManager;
import io.onedev.server.manager.impl.DefaultIssueFieldUnaryManager;
+import io.onedev.server.manager.impl.DefaultIssueInfoManager;
import io.onedev.server.manager.impl.DefaultIssueManager;
import io.onedev.server.manager.impl.DefaultIssueNotificationManager;
import io.onedev.server.manager.impl.DefaultIssueQuerySettingManager;
@@ -311,6 +313,7 @@ public class CoreModule extends AbstractPluginModule {
bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
bind(AttachmentManager.class).to(DefaultAttachmentManager.class);
bind(CodeCommentRelationInfoManager.class).to(DefaultCodeCommentRelationInfoManager.class);
+ bind(IssueInfoManager.class).to(DefaultIssueInfoManager.class);
bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);
bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
bind(DefaultPullRequestNotificationManager.class);
diff --git a/core/src/main/java/io/onedev/server/manager/BuildManager.java b/core/src/main/java/io/onedev/server/manager/BuildManager.java
index 0bb15d329e..9a36e2f1a1 100644
--- a/core/src/main/java/io/onedev/server/manager/BuildManager.java
+++ b/core/src/main/java/io/onedev/server/manager/BuildManager.java
@@ -23,5 +23,10 @@ public interface BuildManager extends EntityManager<Build> {
@Nullable
Build findPrevious(Build build);
+
+ @Nullable
+ Build find(String uuid);
+
+ List<Build> findAllAfter(Project project, @Nullable String commentUUID, int count);
}
diff --git a/core/src/main/java/io/onedev/server/manager/IssueInfoManager.java b/core/src/main/java/io/onedev/server/manager/IssueInfoManager.java
new file mode 100644
index 0000000000..57277db94a
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/IssueInfoManager.java
@@ -0,0 +1,11 @@
+package io.onedev.server.manager;
+
+import java.util.Set;
+
+import io.onedev.server.model.Project;
+
+public interface IssueInfoManager {
+
+ public Set<String> getFixedInBuildUUIDs(Project project, String issueUUID);
+
+}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
index 846d7c8671..1e4929c175 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
@@ -136,5 +136,27 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
}
return builds;
}
+
+ @Sessional
+ @Override
+ public Build find(String uuid) {
+ EntityCriteria<Build> criteria = newCriteria();
+ criteria.add(Restrictions.eq("uuid", uuid));
+ return find(criteria);
+ }
+
+ @Override
+ public List<Build> findAllAfter(Project project, String buildUUID, int count) {
+ EntityCriteria<Build> criteria = newCriteria();
+ criteria.createCriteria("configuration").add(Restrictions.eq("project", project));
+ criteria.addOrder(Order.asc("id"));
+ if (buildUUID != null) {
+ Build build = find(buildUUID);
+ if (build != null) {
+ criteria.add(Restrictions.gt("id", build.getId()));
+ }
+ }
+ return findRange(criteria, 0, count);
+ }
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueInfoManager.java
new file mode 100644
index 0000000000..5a8ac27d53
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueInfoManager.java
@@ -0,0 +1,221 @@
+package io.onedev.server.manager.impl;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.SerializationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.launcher.loader.Listen;
+import io.onedev.server.event.lifecycle.SystemStarted;
+import io.onedev.server.manager.BatchWorkManager;
+import io.onedev.server.manager.BuildManager;
+import io.onedev.server.manager.IssueInfoManager;
+import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.manager.StorageManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.UnitOfWork;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityPersisted;
+import io.onedev.server.persistence.dao.EntityRemoved;
+import io.onedev.server.util.BatchWorker;
+import io.onedev.utils.FileUtils;
+import io.onedev.utils.concurrent.Prioritized;
+import jetbrains.exodus.ArrayByteIterable;
+import jetbrains.exodus.ByteIterable;
+import jetbrains.exodus.env.Environment;
+import jetbrains.exodus.env.Store;
+import jetbrains.exodus.env.Transaction;
+import jetbrains.exodus.env.TransactionalComputable;
+import jetbrains.exodus.env.TransactionalExecutable;
+
+@Singleton
+public class DefaultIssueInfoManager extends AbstractEnvironmentManager implements IssueInfoManager {
+
+ private static final int INFO_VERSION = 6;
+
+ private static final int BATCH_SIZE = 5000;
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultIssueInfoManager.class);
+
+ private static final String INFO_DIR = "issue";
+
+ private static final String DEFAULT_STORE = "default";
+
+ private static final String ISSUE_STORE = "issue";
+
+ private static final ByteIterable LAST_BUILD_KEY = new StringByteIterable("lastBuild");
+
+ private static final int PRIORITY = 100;
+
+ private final StorageManager storageManager;
+
+ private final BatchWorkManager batchWorkManager;
+
+ private final ProjectManager projectManager;
+
+ private final BuildManager buildManager;
+
+ private final UnitOfWork unitOfWork;
+
+ private final Dao dao;
+
+ @Inject
+ public DefaultIssueInfoManager(Dao dao, ProjectManager projectManager, StorageManager storageManager,
+ BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, BuildManager buildManager) {
+ this.projectManager = projectManager;
+ this.storageManager = storageManager;
+ this.batchWorkManager = batchWorkManager;
+ this.unitOfWork = unitOfWork;
+ this.buildManager = buildManager;
+ this.dao = dao;
+ }
+
+ private BatchWorker getBatchWorker(Long projectId) {
+ return new BatchWorker("project-" + projectId + "-collectIssueInfo") {
+
+ @Override
+ public void doWorks(Collection<Prioritized> works) {
+ boolean hasMore;
+ do {
+ // do the work batch by batch to avoid consuming too much memory
+ hasMore = unitOfWork.call(new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() throws Exception {
+ return collect(projectManager.load(projectId));
+ }
+
+ });
+ } while (hasMore);
+ }
+
+ };
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof Project) {
+ Long projectId = event.getEntity().getId();
+ removeEnv(projectId.toString());
+ }
+ }
+
+ private boolean collect(Project project) {
+ logger.debug("Collecting issue info in project '{}'...", project);
+
+ Environment env = getEnv(project.getId().toString());
+ Store defaultStore = getStore(env, DEFAULT_STORE);
+ Store issueStore = getStore(env, ISSUE_STORE);
+
+ String lastBuildUUID = env.computeInTransaction(new TransactionalComputable<String>() {
+
+ @Override
+ public String compute(Transaction txn) {
+ byte[] value = readBytes(defaultStore, txn, LAST_BUILD_KEY);
+ return value!=null?new String(value):null;
+ }
+
+ });
+
+ List<Build> unprocessedBuilds = buildManager.findAllAfter(project, lastBuildUUID, BATCH_SIZE);
+ for (Build build: unprocessedBuilds) {
+ env.executeInTransaction(new TransactionalExecutable() {
+
+ @Override
+ public void execute(Transaction txn) {
+ for (Issue issue: build.getFixedIssues()) {
+ ByteIterable issueKey = new StringByteIterable(issue.getUUID());
+ Set<String> fixedInBuildUUIDs = getFixedInBuildUUIDs(issueStore, txn, issueKey);
+ fixedInBuildUUIDs.add(build.getUUID());
+ issueStore.put(txn, issueKey,
+ new ArrayByteIterable(SerializationUtils.serialize((Serializable) fixedInBuildUUIDs)));
+ }
+ defaultStore.put(txn, LAST_BUILD_KEY, new StringByteIterable(build.getUUID()));
+ }
+
+ });
+ }
+
+ return unprocessedBuilds.size() == BATCH_SIZE;
+ }
+
+ @SuppressWarnings("unchecked")
+ private Set<String> getFixedInBuildUUIDs(Store store, Transaction txn, ByteIterable issueKey) {
+ byte[] valueBytes = readBytes(store, txn, issueKey);
+ if (valueBytes != null) {
+ return (Set<String>) SerializationUtils.deserialize(valueBytes);
+ } else {
+ return new HashSet<>();
+ }
+ }
+
+ @Override
+ public Set<String> getFixedInBuildUUIDs(Project project, String issueUUID) {
+ Environment env = getEnv(project.getId().toString());
+ Store store = getStore(env, ISSUE_STORE);
+
+ return env.computeInTransaction(new TransactionalComputable<Set<String>>() {
+
+ @Override
+ public Set<String> compute(Transaction txn) {
+ return getFixedInBuildUUIDs(store, txn, new StringByteIterable(issueUUID));
+ }
+
+ });
+
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.isNew() && event.getEntity() instanceof Build) {
+ Long projectId = ((Build) event.getEntity()).getConfiguration().getProject().getId();
+ dao.doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));
+ }
+
+ });
+ }
+ }
+
+ @Sessional
+ @Listen
+ public void on(SystemStarted event) {
+ for (Project project: projectManager.findAll()) {
+ checkVersion(project.getId().toString());
+ batchWorkManager.submit(getBatchWorker(project.getId()), new Prioritized(PRIORITY));
+ }
+ }
+
+ @Override
+ protected File getEnvDir(String envKey) {
+ File infoDir = new File(storageManager.getProjectInfoDir(Long.valueOf(envKey)), INFO_DIR);
+ if (!infoDir.exists())
+ FileUtils.createDir(infoDir);
+ return infoDir;
+ }
+
+ @Override
+ protected int getEnvVersion() {
+ return INFO_VERSION;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.java
index 6a75d8ee6c..e6dfa3ee57 100644
--- a/core/src/main/java/io/onedev/server/model/Build.java
+++ b/core/src/main/java/io/onedev/server/model/Build.java
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.UUID;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -27,7 +28,7 @@ import io.onedev.server.util.IssueUtils;
@Entity
@Table(
- indexes={@Index(columnList="g_configuration_id"), @Index(columnList="commit")},
+ indexes={@Index(columnList="g_configuration_id"), @Index(columnList="commit"), @Index(columnList="uuid")},
uniqueConstraints={@UniqueConstraint(columnNames={"g_configuration_id", "commit"})}
)
public class Build extends AbstractEntity {
@@ -84,6 +85,9 @@ public class Build extends AbstractEntity {
@Column(nullable=false)
private String url;
+
+ @Column(nullable=false)
+ private String uuid = UUID.randomUUID().toString();
private transient Collection<Issue> fixedIssues;
@@ -153,6 +157,14 @@ public class Build extends AbstractEntity {
this.url = url;
}
+ public String getUUID() {
+ return uuid;
+ }
+
+ public void setUUID(String uuid) {
+ this.uuid = uuid;
+ }
+
public Collection<Issue> getFixedIssues() {
if (fixedIssues == null) {
fixedIssues = new HashSet<>();
@@ -164,26 +176,28 @@ public class Build extends AbstractEntity {
else if (getConfiguration().getBaseCommit() != null)
prevCommit = ObjectId.fromString(getConfiguration().getBaseCommit());
else
- return fixedIssues;
-
- Project project = getConfiguration().getProject();
+ prevCommit = null;
- IssueManager issueManager = OneDev.getInstance(IssueManager.class);
- Repository repository = project.getRepository();
- try (RevWalk revWalk = new RevWalk(repository)) {
- revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getCommit())));
- revWalk.markUninteresting(revWalk.parseCommit(prevCommit));
-
- RevCommit commit;
- while ((commit = revWalk.next()) != null) {
- for (Long issueNumber: IssueUtils.parseFixedIssues(commit.getFullMessage())) {
- Issue issue = issueManager.find(project, issueNumber);
- if (issue != null)
- fixedIssues.add(issue);
+ if (prevCommit != null) {
+ Project project = getConfiguration().getProject();
+
+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);
+ Repository repository = project.getRepository();
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getCommit())));
+ revWalk.markUninteresting(revWalk.parseCommit(prevCommit));
+
+ RevCommit commit;
+ while ((commit = revWalk.next()) != null) {
+ for (Long issueNumber: IssueUtils.parseFixedIssues(commit.getFullMessage())) {
+ Issue issue = issueManager.find(project, issueNumber);
+ if (issue != null)
+ fixedIssues.add(issue);
+ }
}
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
- } catch (IOException e) {
- throw new RuntimeException(e);
}
}
return fixedIssues;
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 590aff868a..870c34f6a2 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -59,7 +59,8 @@ import io.onedev.server.web.editable.annotation.Editable;
@Index(columnList="number"), @Index(columnList="numberStr"),
@Index(columnList="submitDate"), @Index(columnList="g_submitter_id"),
@Index(columnList="voteCount"), @Index(columnList="commentCount"),
- @Index(columnList="g_milestone_id"), @Index(columnList="LAST_ACT_DATE")})
+ @Index(columnList="g_milestone_id"), @Index(columnList="LAST_ACT_DATE"),
+ @Index(columnList="uuid")})
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
public class Issue extends AbstractEntity implements Referenceable {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java
index 4a07370329..e34e78733a 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java
@@ -32,7 +32,7 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {
this.configuration = configuration;
}
- @Editable(order=200, description="Optionally specify an issue field of \"build choice\" type to store the build information")
+ @Editable(order=200, description="Optionally specify a field of \"build choice\" type to store the build information")
@ChoiceProvider("getBuildFieldChoices")
public String getBuildField() {
return buildField;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java
index 20d0299ce5..da41ab3bc3 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java
@@ -31,7 +31,7 @@ public abstract class PullRequestTrigger implements TransitionTrigger {
this.branch = branch;
}
- @Editable(order=200, description="Optionally specify an issue field of \"pull request choice\" type to store the pull request information")
+ @Editable(order=200, description="Optionally specify a field of \"pull request choice\" type to store the pull request information")
@ChoiceProvider("getPullRequestFieldChoices")
public String getPullRequestField() {
return pullRequestField;
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 18ad2ca3c9..c1d48a7995 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -31,6 +31,8 @@ import io.onedev.server.web.page.project.issues.issueboards.BoardEditPage;
import io.onedev.server.web.page.project.issues.issueboards.IssueBoardsPage;
import io.onedev.server.web.page.project.issues.issueboards.NewBoardPage;
import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.issuedetail.changedfiles.FileChangesPage;
+import io.onedev.server.web.page.project.issues.issuedetail.changedfiles.FixedInBuildsPage;
import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
@@ -196,6 +198,8 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/issue-boards/new", NewBoardPage.class));
add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));
add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));
+ add(new OnePageMapper("projects/${project}/issues/${issue}/file-changes", FileChangesPage.class));
+ add(new OnePageMapper("projects/${project}/issues/${issue}/fixed-in-builds", FixedInBuildsPage.class));
add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));
add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));
add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/component/build/BuildDetailPanel.html b/core/src/main/java/io/onedev/server/web/component/build/BuildDetailPanel.html
index e0a0517b31..ecf9cfed94 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/BuildDetailPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/build/BuildDetailPanel.html
@@ -2,19 +2,16 @@
<div class="build-detail">
<table>
<tr wicket:id="builds">
- <td class="result">
- <span wicket:id="result" class="build-status"></span>
+ <td class="status">
+ <span wicket:id="status" class="build-status"></span>
</td>
<td class="configuration">
<span wicket:id="configuration"></span>
</td>
<td class="description">
- <span wicket:id="content"></span>
+ <a wicket:id="description"><span wicket:id="label"></span></a>
</td>
</tr>
</table>
</div>
- <wicket:fragment wicket:id="linkFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/build/BuildDetailPanel.java b/core/src/main/java/io/onedev/server/web/component/build/BuildDetailPanel.java
index a0c8368a6f..357513be60 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/BuildDetailPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/BuildDetailPanel.java
@@ -2,20 +2,16 @@ package io.onedev.server.web.component.build;
import java.util.List;
-import org.apache.wicket.behavior.AttributeAppender;
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.ExternalLink;
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.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import io.onedev.server.model.Build;
-import io.onedev.server.model.Build.Status;
@SuppressWarnings("serial")
public class BuildDetailPanel extends GenericPanel<List<Build>> {
@@ -27,36 +23,14 @@ public class BuildDetailPanel extends GenericPanel<List<Build>> {
@Override
protected void populateItem(ListItem<Build> item) {
- Build build = item.getModelObject();
+ item.add(new BuildStatusPanel("status", item.getModel()));
- WebMarkupContainer result = new WebMarkupContainer("result");
- item.add(result);
-
- if (build.getStatus() == Status.SUCCESS) {
- result.add(AttributeAppender.append("class", "success fa fa-check"));
- result.add(AttributeAppender.append("title", "Build is successful"));
- } else if (build.getStatus() == Status.ERROR) {
- result.add(AttributeAppender.append("class", "error fa fa-warning"));
- result.add(AttributeAppender.append("title", "Build is in error"));
- } else if (build.getStatus() == Status.FAILURE) {
- result.add(AttributeAppender.append("class", "failure fa fa-times"));
- result.add(AttributeAppender.append("title", "Build is failed"));
- } else {
- result.add(AttributeAppender.append("class", "running fa fa-circle"));
- result.add(AttributeAppender.append("title", "Build is running"));
- }
-
+ Build build = item.getModelObject();
item.add(new Label("configuration", build.getConfiguration().getName()));
- if (build.getUrl() != null) {
- Fragment fragment = new Fragment("content", "linkFrag", BuildDetailPanel.this);
- ExternalLink link = new ExternalLink("link", build.getUrl());
- link.add(new Label("label", build.getDescription()));
- fragment.add(link);
- item.add(fragment);
- } else {
- item.add(new Label("content", build.getDescription()));
- }
+ ExternalLink link = new ExternalLink("description", build.getUrl());
+ link.add(new Label("label", build.getDescription()));
+ item.add(link);
}
});
diff --git a/core/src/main/java/io/onedev/server/web/component/build/BuildStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/build/BuildStatusPanel.html
index 72a5f893d2..6a704f152f 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/BuildStatusPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/build/BuildStatusPanel.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <a wicket:id="status" class="build-status"><span></span></a>
+ <span wicket:id="status" class="build-status"></span>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/build/BuildStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/build/BuildStatusPanel.java
index 993e6f3428..47d26a9918 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/BuildStatusPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/BuildStatusPanel.java
@@ -1,75 +1,45 @@
package io.onedev.server.web.component.build;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.event.IEvent;
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.GenericPanel;
import org.apache.wicket.model.IModel;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.websocket.PageDataChanged;
@SuppressWarnings("serial")
-public class BuildStatusPanel extends GenericPanel<List<Build>> {
+public class BuildStatusPanel extends GenericPanel<Build> {
- public BuildStatusPanel(String id, IModel<List<Build>> model) {
+ public BuildStatusPanel(String id, IModel<Build> model) {
super(id, model);
}
- private boolean hasStatus(Collection<Build> builds, Build.Status status) {
- for (Build build: builds) {
- if (build.getStatus() == status)
- return true;
- }
- return false;
- }
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
-
- if (event.getPayload() instanceof PageDataChanged) {
- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
- pageDataChanged.getHandler().add(this);
- }
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
- add(new DropdownLink("status") {
-
- @Override
- protected Component newContent(String id, FloatingPanel floating) {
- return new BuildDetailPanel(id, BuildStatusPanel.this.getModel());
- }
+ add(new WebMarkupContainer("status") {
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- Collection<Build> builds = BuildStatusPanel.this.getModelObject();
- if (hasStatus(builds, Status.ERROR)) {
+ Build build = getModelObject();
+ if (build.getStatus() == Status.ERROR) {
tag.put("class", "build-status error fa fa-warning");
- tag.put("title", "Some builds are in error, click for details");
- } else if (hasStatus(builds, Status.FAILURE)) {
+ tag.put("title", "Build is in error");
+ } else if (build.getStatus() == Status.FAILURE) {
tag.put("class", "build-status failure fa fa-times");
- tag.put("title", "Some builds are failed, click for details");
- } else if (hasStatus(builds, Status.RUNNING)) {
+ tag.put("title", "Build is failed");
+ } else if (build.getStatus() == Status.RUNNING) {
tag.put("class", "build-status running fa fa-circle");
- tag.put("title", "Some builds are running, click for details");
- } else if (hasStatus(builds, Status.SUCCESS)) {
+ tag.put("title", "Build is running");
+ } else if (build.getStatus() == Status.SUCCESS) {
tag.put("class", "build-status success fa fa-check");
- tag.put("title", "Builds are successful, click for details");
+ tag.put("title", "Build is successful");
}
}
@@ -78,12 +48,6 @@ public class BuildStatusPanel extends GenericPanel<List<Build>> {
setOutputMarkupPlaceholderTag(true);
}
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!getModelObject().isEmpty());
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/core/src/main/java/io/onedev/server/web/component/build/BuildsStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/build/BuildsStatusPanel.html
new file mode 100644
index 0000000000..ff238fd098
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/build/BuildsStatusPanel.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <a wicket:id="status"><span></span></a>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/build/BuildsStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/build/BuildsStatusPanel.java
new file mode 100644
index 0000000000..74e4d93c4d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/build/BuildsStatusPanel.java
@@ -0,0 +1,93 @@
+package io.onedev.server.web.component.build;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.event.IEvent;
+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.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.websocket.PageDataChanged;
+
+@SuppressWarnings("serial")
+public class BuildsStatusPanel extends GenericPanel<List<Build>> {
+
+ public BuildsStatusPanel(String id, IModel<List<Build>> model) {
+ super(id, model);
+ }
+
+ private boolean hasStatus(Collection<Build> builds, Build.Status status) {
+ for (Build build: builds) {
+ if (build.getStatus() == status)
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PageDataChanged) {
+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
+ pageDataChanged.getHandler().add(this);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new DropdownLink("status") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel floating) {
+ return new BuildDetailPanel(id, BuildsStatusPanel.this.getModel());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ Collection<Build> builds = BuildsStatusPanel.this.getModelObject();
+ if (hasStatus(builds, Status.ERROR)) {
+ tag.put("class", "build-status error fa fa-warning");
+ tag.put("title", "Some builds are in error, click for details");
+ } else if (hasStatus(builds, Status.FAILURE)) {
+ tag.put("class", "build-status failure fa fa-times");
+ tag.put("title", "Some builds are failed, click for details");
+ } else if (hasStatus(builds, Status.RUNNING)) {
+ tag.put("class", "build-status running fa fa-circle");
+ tag.put("title", "Some builds are running, click for details");
+ } else if (hasStatus(builds, Status.SUCCESS)) {
+ tag.put("class", "build-status success fa fa-check");
+ tag.put("title", "Builds are successful, click for details");
+ }
+ }
+
+ });
+
+ setOutputMarkupPlaceholderTag(true);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getModelObject().isEmpty());
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new BuildCssResourceReference()));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/build/PullRequestBuildsPanel.html b/core/src/main/java/io/onedev/server/web/component/build/PullRequestBuildsPanel.html
index dbeed16b10..a9121f1fb5 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/PullRequestBuildsPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/build/PullRequestBuildsPanel.html
@@ -1,18 +1,15 @@
<wicket:panel>
<table class="pullrequest-builds">
<tr wicket:id="builds">
- <td class="result">
- <span wicket:id="result" class="build-status"></span>
+ <td class="status">
+ <span wicket:id="status" class="build-status"></span>
</td>
<td class="configuration">
<span wicket:id="configuration"></span>
</td>
<td class="description">
- <span wicket:id="content"></span>
+ <a wicket:id="description"><span wicket:id="label"></span></a>
</td>
</tr>
</table>
- <wicket:fragment wicket:id="linkFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/build/PullRequestBuildsPanel.java b/core/src/main/java/io/onedev/server/web/component/build/PullRequestBuildsPanel.java
index d380af3d8e..bd1bac73ec 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/PullRequestBuildsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/PullRequestBuildsPanel.java
@@ -5,7 +5,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -15,15 +14,14 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
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.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import io.onedev.server.model.Build.Status;
+import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestBuild;
-import io.onedev.server.web.behavior.dropdown.DropdownHover;
import io.onedev.server.web.websocket.PageDataChanged;
@SuppressWarnings("serial")
@@ -74,47 +72,28 @@ public class PullRequestBuildsPanel extends GenericPanel<PullRequest> {
PullRequestBuild build = item.getModelObject();
item.add(new Label("configuration", build.getConfiguration().getName()));
- WebMarkupContainer result = new WebMarkupContainer("result");
- String tooltip;
if (build.getBuild() != null) {
- if (build.getBuild().getUrl() != null) {
- Fragment fragment = new Fragment("content", "linkFrag", PullRequestBuildsPanel.this);
- ExternalLink link = new ExternalLink("link", build.getBuild().getUrl());
- link.add(new Label("label", build.getBuild().getDescription()));
- fragment.add(link);
- item.add(fragment);
- } else {
- item.add(new Label("content", build.getBuild().getDescription()));
- }
- if (build.getBuild().getStatus() == Status.SUCCESS) {
- result.add(AttributeAppender.append("class", "success fa fa-check"));
- tooltip = "Build is successful";
- } else if (build.getBuild().getStatus() == Status.ERROR) {
- result.add(AttributeAppender.append("class", "error fa fa-warning"));
- tooltip = "Build is in error";
- } else if (build.getBuild().getStatus() == Status.FAILURE) {
- result.add(AttributeAppender.append("class", "failure fa fa-times"));
- tooltip = "Build is failed";
- } else {
- result.add(AttributeAppender.append("class", "running fa fa-circle"));
- tooltip = "Build is running";
- }
+ item.add(new BuildStatusPanel("status", new AbstractReadOnlyModel<Build>() {
+
+ @Override
+ public Build getObject() {
+ return item.getModelObject().getBuild();
+ }
+
+ }));
+
+ ExternalLink link = new ExternalLink("description", build.getBuild().getUrl());
+ link.add(new Label("label", build.getBuild().getDescription()));
+ item.add(link);
} else {
- item.add(new Label("content").setVisible(false));
- result.add(AttributeAppender.append("class", "awaiting fa fa-clock-o"));
- tooltip = "Waiting for build";
+ WebMarkupContainer status = new WebMarkupContainer("status");
+ status.add(AttributeAppender.append("class", "awaiting fa fa-clock-o"));
+ status.add(AttributeAppender.append("title", "Waiting for build"));
+ item.add(status);
+ WebMarkupContainer description = new WebMarkupContainer("description");
+ description.add(new WebMarkupContainer("label"));
+ item.add(description.setVisible(false));
}
-
- result.add(new DropdownHover() {
-
- @Override
- protected Component newContent(String id) {
- return new Label(id, tooltip).add(AttributeAppender.append("class", "build-result"));
- }
-
- });
-
- item.add(result);
}
});
diff --git a/core/src/main/java/io/onedev/server/web/component/build/build.css b/core/src/main/java/io/onedev/server/web/component/build/build.css
index b867809bd7..bdd46b4282 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/build.css
+++ b/core/src/main/java/io/onedev/server/web/component/build/build.css
@@ -9,7 +9,7 @@ a.build {
.build-detail table td {
padding: 4px 12px;
}
-.build-detail table td.result {
+.build-detail table td.status {
padding-right: 4px;
}
.build-detail table td.configuration {
@@ -30,27 +30,20 @@ a.build {
vertical-align: text-top;
}
-.pullrequest-builds td.result {
- width: 12px;
-}
-
.pullrequest-builds tr td {
padding: 2px 12px;
}
-.pullrequest-builds td.result {
+.pullrequest-builds td.status {
padding-left: 0;
padding-right: 8px;
font-size: 16px;
+ width: 12px;
}
.pullrequest-builds td.configuration {
padding-left: 0;
}
-.floating .build-result {
- padding: 8px;
- font-weight: bold;
-}
span.build-status {
cursor: default;
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java
index 996ab36668..83503d17e2 100644
--- a/core/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java
@@ -36,7 +36,7 @@ import io.onedev.server.util.Constants;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.avatar.ContributorAvatars;
-import io.onedev.server.web.component.build.BuildStatusPanel;
+import io.onedev.server.web.component.build.BuildsStatusPanel;
import io.onedev.server.web.component.commitgraph.CommitGraphResourceReference;
import io.onedev.server.web.component.commitgraph.CommitGraphUtils;
import io.onedev.server.web.component.commitmessage.ExpandableCommitMessagePanel;
@@ -149,7 +149,7 @@ public class CommitListPanel extends Panel {
commit.getAuthorIdent(), commit.getCommitterIdent(), true));
String commitHash = commit.name();
- fragment.add(new BuildStatusPanel("buildStatus",
+ fragment.add(new BuildsStatusPanel("buildStatus",
new LoadableDetachableModel<List<Build>>() {
@Override
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 57aaebf076..89ce578fcd 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
@@ -70,7 +70,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.branchchoice.BranchChoiceProvider;
import io.onedev.server.web.component.branchchoice.BranchSingleChoice;
-import io.onedev.server.web.component.build.BuildStatusPanel;
+import io.onedev.server.web.component.build.BuildsStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -446,7 +446,7 @@ public class ProjectBranchesPage extends ProjectPage {
RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId());
String lastCommitHash = lastCommit.name();
- item.add(new BuildStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
@Override
protected List<Build> load() {
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 44a4654b48..7512c007df 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
@@ -54,7 +54,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.avatar.ContributorAvatars;
-import io.onedev.server.web.component.build.BuildStatusPanel;
+import io.onedev.server.web.component.build.BuildsStatusPanel;
import io.onedev.server.web.component.commitmessage.CommitMessageLabel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.createbranch.CreateBranchLink;
@@ -218,7 +218,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));
add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent(), true));
- add(new BuildStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
@Override
protected List<Build> load() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index ff770b2f87..d0779f3132 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -67,7 +67,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Constants;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.avatar.ContributorAvatars;
-import io.onedev.server.web.component.build.BuildStatusPanel;
+import io.onedev.server.web.component.build.BuildsStatusPanel;
import io.onedev.server.web.component.commitgraph.CommitGraphResourceReference;
import io.onedev.server.web.component.commitgraph.CommitGraphUtils;
import io.onedev.server.web.component.commitmessage.ExpandableCommitMessagePanel;
@@ -612,7 +612,7 @@ public class ProjectCommitsPage extends ProjectPage {
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
- item.add(new BuildStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
@Override
protected List<Build> load() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
index 631db1caba..34cc77be79 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
@@ -50,6 +50,7 @@ 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.manager.IssueActionManager;
+import io.onedev.server.manager.IssueInfoManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.IssueVoteManager;
import io.onedev.server.manager.IssueWatchManager;
@@ -96,6 +97,8 @@ import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.issuedetail.changedfiles.FileChangesPage;
+import io.onedev.server.web.page.project.issues.issuedetail.changedfiles.FixedInBuildsPage;
import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
@@ -362,6 +365,10 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
List<Tab> tabs = new ArrayList<>();
tabs.add(new IssueTab("Activities", IssueActivitiesPage.class));
+ if (getIssue().getCommit() != null)
+ tabs.add(new IssueTab("File Changes", FileChangesPage.class));
+ if (!OneDev.getInstance(IssueInfoManager.class).getFixedInBuildUUIDs(getProject(), getIssue().getUUID()).isEmpty())
+ tabs.add(new IssueTab("Fixed In Builds", FixedInBuildsPage.class));
add(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.html
new file mode 100644
index 0000000000..4bb7632eaf
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="fileChanges" class="file-changes"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.java
new file mode 100644
index 0000000000..4d328f751f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.java
@@ -0,0 +1,186 @@
+package io.onedev.server.web.page.project.issues.issuedetail.changedfiles;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+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.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.CodeCommentManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.MarkPos;
+import io.onedev.server.model.support.ProjectAndBranch;
+import io.onedev.server.util.diff.WhitespaceOption;
+import io.onedev.server.web.component.diff.revision.CommentSupport;
+import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
+import io.onedev.server.web.page.project.compare.RevisionComparePage;
+import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;
+
+@SuppressWarnings("serial")
+public class FileChangesPage extends IssueDetailPage implements CommentSupport {
+
+ private Long commentId;
+
+ private MarkPos mark;
+
+ private String blameFile;
+
+ private String pathFilter;
+
+ private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;
+
+ private IModel<RevCommit> commitModel = new LoadableDetachableModel<RevCommit>() {
+
+ @Override
+ protected RevCommit load() {
+ return getProject().getRevCommit(ObjectId.fromString(getIssue().getCommit()));
+ }
+
+ };
+
+ public FileChangesPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onDetach() {
+ commitModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ IModel<String> blameModel = new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return blameFile;
+ }
+
+ @Override
+ public void setObject(String object) {
+ blameFile = object;
+ }
+
+ };
+ IModel<String> pathFilterModel = new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return pathFilter;
+ }
+
+ @Override
+ public void setObject(String object) {
+ pathFilter = object;
+ }
+
+ };
+ IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public WhitespaceOption getObject() {
+ return whitespaceOption;
+ }
+
+ @Override
+ public void setObject(WhitespaceOption object) {
+ whitespaceOption = object;
+ }
+
+ };
+
+ if (getCommit().getParentCount() != 0) {
+ add(new RevisionDiffPanel("fileChanges", projectModel,
+ new Model<PullRequest>(null), getCommit().getParent(0).name(),
+ getCommit().name(), pathFilterModel, whitespaceOptionModel, blameModel, this));
+ } else {
+ add(new Label("fileChanges", "<i>No file changes</i>").setEscapeModelStrings(false));
+ }
+ }
+
+ private RevCommit getCommit() {
+ return commitModel.getObject();
+ }
+
+ @Override
+ public MarkPos getMark() {
+ return mark;
+ }
+
+ @Override
+ public String getMarkUrl(MarkPos mark) {
+ RevisionComparePage.State state = new RevisionComparePage.State();
+ state.mark = mark;
+ state.leftSide = new ProjectAndBranch(getProject(), getCommit().getParent(0).name());
+ state.rightSide = new ProjectAndBranch(getProject(), getCommit().name());
+ state.pathFilter = pathFilter;
+ state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
+ state.whitespaceOption = whitespaceOption;
+ state.compareWithMergeBase = false;
+ return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(getProject(), state)).toString();
+ }
+
+ @Override
+ public void onMark(AjaxRequestTarget target, MarkPos mark) {
+ this.mark = mark;
+ }
+
+ @Override
+ public CodeComment getOpenComment() {
+ if (commentId != null)
+ return OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ else
+ return null;
+ }
+
+ @Override
+ public void onAddComment(AjaxRequestTarget target, MarkPos mark) {
+ this.commentId = null;
+ this.mark = mark;
+ }
+
+ @Override
+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {
+ if (comment != null) {
+ commentId = comment.getId();
+ mark = comment.getMarkPos();
+ } else {
+ commentId = null;
+ }
+ }
+
+ @Override
+ public String getCommentUrl(CodeComment comment) {
+ RevisionComparePage.State state = new RevisionComparePage.State();
+ mark = comment.getMarkPos();
+ state.commentId = comment.getId();
+ state.leftSide = new ProjectAndBranch(getProject(), getCommit().getParent(0).name());
+ state.rightSide = new ProjectAndBranch(getProject(), getCommit().name());
+ state.pathFilter = pathFilter;
+ state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
+ state.whitespaceOption = whitespaceOption;
+ state.compareWithMergeBase = false;
+ return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(getProject(), state)).toString();
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.html
new file mode 100644
index 0000000000..cea048554f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.html
@@ -0,0 +1,6 @@
+<wicket:extend>
+ <table wicket:id="builds" class="table"></table>
+ <wicket:fragment wicket:id="descriptionFrag">
+ <span wicket:id="status"></span> <a wicket:id="description"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.java
new file mode 100644
index 0000000000..d7dccb3f7d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.java
@@ -0,0 +1,149 @@
+package io.onedev.server.web.page.project.issues.issuedetail.changedfiles;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.BuildManager;
+import io.onedev.server.manager.IssueInfoManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Configuration;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.build.BuildStatusPanel;
+import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;
+
+@SuppressWarnings("serial")
+public class FixedInBuildsPage extends IssueDetailPage {
+
+ private final IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {
+
+ @Override
+ protected List<Build> load() {
+ Map<Configuration, Build> buildMap = new HashMap<>();
+ for (String buildUUID: OneDev.getInstance(IssueInfoManager.class).getFixedInBuildUUIDs(getProject(), getIssue().getUUID())) {
+ Build build = OneDev.getInstance(BuildManager.class).find(buildUUID);
+ Build existingBuild = buildMap.get(build.getConfiguration());
+ if (existingBuild == null || existingBuild.getDate().before(build.getDate()))
+ buildMap.put(build.getConfiguration(), build);
+ }
+ List<Build> buildList = new ArrayList<>(buildMap.values());
+ Collections.sort(buildList);
+ return buildList;
+ }
+
+ };
+
+ public FixedInBuildsPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onDetach() {
+ buildsModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<Build, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<Build, Void>(Model.of("Configuration")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,
+ IModel<Build> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getConfiguration().getName()));
+ }
+ });
+
+ columns.add(new AbstractColumn<Build, Void>(Model.of("Build")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,
+ IModel<Build> rowModel) {
+ cellItem.add(new Label(componentId, "#" + rowModel.getObject().getNumber()));
+ }
+ });
+
+ columns.add(new AbstractColumn<Build, Void>(Model.of("Description")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,
+ IModel<Build> rowModel) {
+ Fragment fragment = new Fragment(componentId, "descriptionFrag", FixedInBuildsPage.this);
+
+ fragment.add(new BuildStatusPanel("status", rowModel));
+ ExternalLink link = new ExternalLink("description", rowModel.getObject().getUrl());
+ link.add(new Label("label", rowModel.getObject().getDescription()));
+ fragment.add(link);
+
+ cellItem.add(fragment);
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Build, Void>(Model.of("Date")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,
+ IModel<Build> rowModel) {
+ cellItem.add(new Label(componentId, DateUtils.formatDateTime(rowModel.getObject().getDate())));
+ }
+
+ });
+
+ SortableDataProvider<Build, Void> dataProvider = new SortableDataProvider<Build, Void>() {
+
+ @Override
+ public Iterator<? extends Build> iterator(long first, long count) {
+ return buildsModel.getObject().iterator();
+ }
+
+ @Override
+ public long size() {
+ return buildsModel.getObject().size();
+ }
+
+ @Override
+ public IModel<Build> model(Build object) {
+ Long id = object.getId();
+ return new LoadableDetachableModel<Build>() {
+
+ @Override
+ protected Build load() {
+ return OneDev.getInstance(BuildManager.class).load(id);
+ }
+
+ };
+ }
+ };
+
+ DataTable<Build, Void> buildsTable = new DataTable<Build, Void>("builds", columns, dataProvider, Integer.MAX_VALUE);
+ buildsTable.addTopToolbar(new AjaxFallbackHeadersToolbar<Void>(buildsTable, dataProvider));
+ buildsTable.addBottomToolbar(new NoRecordsToolbar(buildsTable));
+ add(buildsTable);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/UpdatedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/UpdatedPanel.java
index b255ceeb23..81ac9e643c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/UpdatedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/UpdatedPanel.java
@@ -28,7 +28,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.avatar.AvatarLink;
-import io.onedev.server.web.component.build.BuildStatusPanel;
+import io.onedev.server.web.component.build.BuildsStatusPanel;
import io.onedev.server.web.component.commitmessage.ExpandableCommitMessagePanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -86,7 +86,7 @@ class UpdatedPanel extends GenericPanel<PullRequestUpdate> {
item.add(new ExpandableCommitMessagePanel("message", projectModel, item.getModel()));
String commitHash = commit.name();
- item.add(new BuildStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
@Override
protected List<Build> load() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java
index 2fea11e930..51b0af9028 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java
@@ -32,7 +32,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.BuildStatusPanel;
+import io.onedev.server.web.component.build.BuildsStatusPanel;
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;
@@ -115,7 +115,7 @@ public class MergePreviewPage extends RequestDetailPage {
fragment.add(hashLink);
hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getMerged())));
fragment.add(new WebMarkupContainer("copyMergedCommit").add(new CopyClipboardBehavior(Model.of(preview.getMerged()))));
- fragment.add(new BuildStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ fragment.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
@Override
protected List<Build> load() {
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 498da02c01..aeb7f27946 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
@@ -43,7 +43,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.TagProtection;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.build.BuildStatusPanel;
+import io.onedev.server.web.component.build.BuildsStatusPanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.link.ArchiveMenuLink;
@@ -266,7 +266,7 @@ public class ProjectTagsPage extends ProjectPage {
item.add(link);
String commitHash = ref.getPeeledObj().name();
- item.add(new BuildStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
+ item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {
@Override
protected List<Build> load() {