The Unified and Autonomous Development Platform
Fix issue #492 - Show code/pull request/issue/build summary in project list page
Robin Shen71046598c6fb
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 768ba21506..0af71d8f80 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -15,6 +15,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.StatusInfo;import io.onedev.server.util.criteria.Criteria;@@ -81,4 +82,6 @@ public interface BuildManager extends EntityManager<Build> {Collection<Build> query(Agent agent, @Nullable Build.Status status);+ List<ProjectBuildStats> queryStats(Collection<Project> projects);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex 8e27a808fe..2f29631534 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -11,7 +11,8 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.MilestoneAndState;+import io.onedev.server.util.MilestoneAndIssueState;+import io.onedev.server.util.ProjectIssueStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;@@ -74,7 +75,9 @@ public interface IssueManager extends EntityManager<Issue> {void delete(Collection<Issue> issues);- Collection<MilestoneAndState> queryMilestoneAndStates(Project project, Collection<Milestone> milestones);+ Collection<MilestoneAndIssueState> queryMilestoneAndIssueStates(Project project, Collection<Milestone> milestones);++ List<ProjectIssueStats> queryStats(Collection<Project> projects);Collection<Milestone> queryUsedMilestones(Project project);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex 16d365a67a..f2a8c3a2a0 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -12,6 +12,7 @@ import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.util.ProjectPullRequestStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.criteria.Criteria;@@ -75,4 +76,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void saveDescription(PullRequest request, @Nullable String description);+ List<ProjectPullRequestStats> queryStats(Collection<Project> projects);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex ebb1e99c1e..49b4ded240 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -85,6 +85,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.StatusInfo;import io.onedev.server.util.criteria.Criteria;@@ -1015,5 +1016,27 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuiagentCriteria.add(Restrictions.eq(Build.PROP_STATUS, status));return query(criteria);}++ @Sessional+ @Override+ public List<ProjectBuildStats> queryStats(Collection<Project> projects) {+ if (projects.isEmpty()) {+ return new ArrayList<>();+ } else {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<ProjectBuildStats> criteriaQuery = builder.createQuery(ProjectBuildStats.class);+ Root<Build> root = criteriaQuery.from(Build.class);+ criteriaQuery.multiselect(+ root.get(Build.PROP_PROJECT).get(Project.PROP_ID),+ root.get(Build.PROP_STATUS),+ builder.count(root));+ criteriaQuery.groupBy(root.get(Build.PROP_PROJECT), root.get(Build.PROP_STATUS));++ criteriaQuery.where(root.get(Build.PROP_PROJECT).in(projects));+ criteriaQuery.orderBy(builder.asc(root.get(Build.PROP_STATUS)));++ return getSession().createQuery(criteriaQuery).getResultList();+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex 2aa38290ad..3e4f52147f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -467,8 +467,10 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>PullRequest.push(request);try {for (Issue issue: issueManager.query(project, false, query, 0, Integer.MAX_VALUE, true)) {+ String statusName = request.getStatus().toString().toLowerCase();changeState(issue, transition.getToState(), new HashMap<>(),- transition.getRemoveFields(), "State changed as pull request #" + request.getNumber() + " is " + request.getStatusName().toLowerCase());+ transition.getRemoveFields(),+ "State changed as pull request #" + request.getNumber() + " is " + statusName);}} finally {PullRequest.pop();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 8c047bc78e..74c3ee961f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -83,8 +83,9 @@ import io.onedev.server.search.entity.issue.IssueQueryUpdater;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.storage.AttachmentStorageManager;-import io.onedev.server.util.MilestoneAndState;+import io.onedev.server.util.MilestoneAndIssueState;import io.onedev.server.util.Pair;+import io.onedev.server.util.ProjectIssueStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.IssueFacade;@@ -863,9 +864,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss@Sessional@Override- public Collection<MilestoneAndState> queryMilestoneAndStates(Project project, Collection<Milestone> milestones) {+ public Collection<MilestoneAndIssueState> queryMilestoneAndIssueStates(Project project, Collection<Milestone> milestones) {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<MilestoneAndState> criteriaQuery = builder.createQuery(MilestoneAndState.class);+ CriteriaQuery<MilestoneAndIssueState> criteriaQuery = builder.createQuery(MilestoneAndIssueState.class);Root<IssueSchedule> root = criteriaQuery.from(IssueSchedule.class);Join<Issue, Issue> issueJoin = root.join(IssueSchedule.PROP_ISSUE, JoinType.INNER);criteriaQuery.multiselect(@@ -1011,4 +1012,26 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issreturn query(criteria, 0, count);}+ @Sessional+ @Override+ public List<ProjectIssueStats> queryStats(Collection<Project> projects) {+ if (projects.isEmpty()) {+ return new ArrayList<>();+ } else {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<ProjectIssueStats> criteriaQuery = builder.createQuery(ProjectIssueStats.class);+ Root<Issue> root = criteriaQuery.from(Issue.class);+ criteriaQuery.multiselect(+ root.get(Issue.PROP_PROJECT).get(Project.PROP_ID),+ root.get(Issue.PROP_STATE_ORDINAL),+ builder.count(root));+ criteriaQuery.groupBy(root.get(Issue.PROP_PROJECT), root.get(Issue.PROP_STATE_ORDINAL));++ criteriaQuery.where(root.get(Issue.PROP_PROJECT).in(projects));+ criteriaQuery.orderBy(builder.asc(root.get(Issue.PROP_STATE_ORDINAL)));++ return getSession().createQuery(criteriaQuery).getResultList();+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 0c0652f92e..f0790c30d5 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -93,6 +93,7 @@ import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;+import io.onedev.server.model.PullRequest.Status;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.FileProtection;@@ -126,6 +127,7 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.util.ProjectPullRequestStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.concurrent.BatchWorkManager;import io.onedev.server.util.concurrent.BatchWorker;@@ -276,18 +278,17 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im@Transactional@Overridepublic void discard(PullRequest request, String note) {+ request.setStatus(Status.DISCARDED);+User user = SecurityUtils.getUser();- Date date = new Date();CloseInfo closeInfo = new CloseInfo();- closeInfo.setDate(date);closeInfo.setUser(user);- closeInfo.setStatus(CloseInfo.Status.DISCARDED);request.setCloseInfo(closeInfo);PullRequestChange change = new PullRequestChange();- change.setDate(date);change.setData(new PullRequestDiscardData(note));+ change.setDate(closeInfo.getDate());change.setRequest(request);change.setUser(user);pullRequestChangeManager.save(change);@@ -432,14 +433,14 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im}private void closeAsMerged(PullRequest request, boolean dueToMerged) {+ request.setStatus(Status.MERGED);+Date date = new DateTime().plusMillis(1).toDate();if (dueToMerged)request.setLastMergePreview(null);CloseInfo closeInfo = new CloseInfo();- closeInfo.setDate(date);- closeInfo.setStatus(CloseInfo.Status.MERGED);request.setCloseInfo(closeInfo);String reason;@@ -576,7 +577,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> impublic PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);Criterion merged = Restrictions.and(- Restrictions.eq(PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS, CloseInfo.Status.MERGED),+ Restrictions.eq(PullRequest.PROP_STATUS, Status.MERGED),Restrictions.eq(PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH, source.getObjectName()));criteria.add(ofTarget(target)).add(ofSource(source)).add(Restrictions.or(ofOpen(), merged));@@ -591,7 +592,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imCollection<Criterion> criterions = new ArrayList<>();for (ProjectAndBranch source: sources) {Criterion merged = Restrictions.and(- Restrictions.eq(PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS, CloseInfo.Status.MERGED),+ Restrictions.eq(PullRequest.PROP_STATUS, Status.MERGED),Restrictions.eq(PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH, source.getObjectName()));criterions.add(Restrictions.and(ofTarget(target), ofSource(source), Restrictions.or(ofOpen(), merged)));}@@ -1067,5 +1068,25 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> imsave(request);}}++ @Sessional+ @Override+ public List<ProjectPullRequestStats> queryStats(Collection<Project> projects) {+ if (projects.isEmpty()) {+ return new ArrayList<>();+ } else {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<ProjectPullRequestStats> criteriaQuery = builder.createQuery(ProjectPullRequestStats.class);+ Root<PullRequest> root = criteriaQuery.from(PullRequest.class);+ criteriaQuery.multiselect(+ root.get(PullRequest.PROP_TARGET_PROJECT).get(Project.PROP_ID),+ root.get(PullRequest.PROP_STATUS), builder.count(root));+ criteriaQuery.groupBy(root.get(PullRequest.PROP_TARGET_PROJECT), root.get(PullRequest.PROP_STATUS));++ criteriaQuery.where(root.get(PullRequest.PROP_TARGET_PROJECT).in(projects));+ criteriaQuery.orderBy(builder.asc(root.get(PullRequest.PROP_STATUS)));+ return getSession().createQuery(criteriaQuery).getResultList();+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.javaindex 7ee701637c..d5b0762fd0 100644--- a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java@@ -34,7 +34,7 @@ public class BuildEvent extends ProjectEvent implements CommitAware {@Overridepublic String getActivity() {- return build.getStatus().getDisplayName();+ return build.getStatus().toString();}}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.javaindex b4a63c16d4..7c61e5506f 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java@@ -24,7 +24,7 @@ public class PullRequestBuildEvent extends PullRequestEvent {activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")";elseactivity = "build #" + build.getNumber();- activity += " is " + build.getStatus().getDisplayName();+ activity += " is " + build.getStatus();return activity;}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.javaindex 2887c0bf48..5d46fccf86 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java@@ -279,4 +279,9 @@ public class DefaultIssueInfoManager extends AbstractSingleEnvironmentManager});}+ @Override+ public Map<String, Integer> getStateStats(Long projectId) {+ return null;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/IssueInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/IssueInfoManager.javaindex be75dd3833..1028d7c494 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/IssueInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/IssueInfoManager.java@@ -6,4 +6,6 @@ public interface IssueInfoManager {Map<Integer, String> getDailyStates(Long issueId, Integer fromDay, Integer toDay);+ Map<String, Integer> getStateStats(Long projectId);+}diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 8a280136df..d0790fd50d 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -31,15 +31,14 @@ import org.dom4j.Node;import com.google.common.base.Preconditions;-import io.onedev.commons.utils.FileUtils;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.User;import io.onedev.server.util.Pair;import oshi.SystemInfo;import oshi.hardware.HardwareAbstractionLayer;-import oshi.hardware.common.AbstractHardwareAbstractionLayer;@Singleton@SuppressWarnings("unused")@@ -3431,4 +3430,22 @@ public class DataMigrator {}}+ private void migrate73(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("PullRequests.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element closeInfoElement = element.element("closeInfo");+ if (closeInfoElement != null) {+ Element statusElement = closeInfoElement.element("status");+ statusElement.detach();+ element.add(statusElement);+ } else {+ element.addElement("status").setText("OPEN");+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 67131c153c..84e8a97fad 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -57,7 +57,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;-import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;@@ -198,8 +198,9 @@ public class Build extends AbstractEntity implements Referenceable {NAME_LOG, BuildMetric.NAME_REPORT);public static final List<String> QUERY_FIELDS = Lists.newArrayList(- NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION, NAME_PULL_REQUEST,- NAME_COMMIT, NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE);+ NAME_PROJECT, NAME_JOB, NAME_STATUS, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION,+ NAME_PULL_REQUEST, NAME_COMMIT, NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE,+ NAME_FINISH_DATE);public static final List<String> METRIC_QUERY_FIELDS = Lists.newArrayList(NAME_JOB, NAME_BRANCH, NAME_PULL_REQUEST, BuildMetric.NAME_REPORT);@@ -230,8 +231,9 @@ public class Build extends AbstractEntity implements Referenceable {// Most significant status comes first, refer to getOverallStatusWAITING, PENDING, RUNNING, FAILED, CANCELLED, TIMED_OUT, SUCCESSFUL;- public String getDisplayName() {- return StringUtils.capitalize(name().replace('_', ' ').toLowerCase());+ @Override+ public String toString() {+ return WordUtils.toWords(name());}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 686cbdf61b..5074b1a29a 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -2,6 +2,7 @@ package io.onedev.server.model;import static io.onedev.server.model.PullRequest.PROP_NO_SPACE_TITLE;import static io.onedev.server.model.PullRequest.PROP_NUMBER;+import static io.onedev.server.model.PullRequest.PROP_STATUS;import static io.onedev.server.model.PullRequest.PROP_SUBMIT_DATE;import static io.onedev.server.model.PullRequest.PROP_TITLE;import static io.onedev.server.model.PullRequest.PROP_UUID;@@ -53,6 +54,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;+import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.UserManager;@@ -84,7 +86,7 @@ import io.onedev.server.web.util.WicketUtils;@Index(columnList="o_targetProject_id"), @Index(columnList=PROP_SUBMIT_DATE),@Index(columnList=LastUpdate.COLUMN_DATE), @Index(columnList="o_sourceProject_id"),@Index(columnList="o_submitter_id"), @Index(columnList=MergePreview.COLUMN_HEAD_COMMIT_HASH),- @Index(columnList=CloseInfo.COLUMN_DATE), @Index(columnList=CloseInfo.COLUMN_STATUS),+ @Index(columnList=CloseInfo.COLUMN_DATE), @Index(columnList=PROP_STATUS),@Index(columnList=CloseInfo.COLUMN_USER),@Index(columnList="o_numberScope_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})@@ -156,6 +158,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic static final String PROP_MERGE_STRATEGY = "mergeStrategy";+ public static final String PROP_STATUS = "status";+public static final String PROP_CLOSE_INFO = "closeInfo";public static final String PROP_LAST_MERGE_PREVIEW = "lastMergePreview";@@ -172,8 +176,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic static final String PROP_NO_SPACE_TITLE = "noSpaceTitle";- public static final String STATE_OPEN = "Open";-public static final String REFS_PREFIX = "refs/pull/";public static final int MAX_CODE_COMMENTS = 1000;@@ -181,7 +183,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate static final int MAX_CHECK_ERROR_LEN = 1024;public static final List<String> QUERY_FIELDS = Lists.newArrayList(- NAME_NUMBER, NAME_TITLE, NAME_TARGET_PROJECT, NAME_TARGET_BRANCH,+ NAME_NUMBER, NAME_STATUS, NAME_TITLE, NAME_TARGET_PROJECT, NAME_TARGET_BRANCH,NAME_SOURCE_PROJECT, NAME_SOURCE_BRANCH, NAME_DESCRIPTION,NAME_COMMENT, NAME_SUBMIT_DATE, NAME_UPDATE_DATE,NAME_CLOSE_DATE, NAME_MERGE_STRATEGY, NAME_COMMENT_COUNT);@@ -191,7 +193,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, AttachNAME_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE,NAME_CLOSE_DATE, PROP_CLOSE_INFO + "." + CloseInfo.PROP_DATE,NAME_NUMBER, PROP_NUMBER,- NAME_STATUS, PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS,+ NAME_STATUS, PROP_STATUS,NAME_TARGET_PROJECT, PROP_TARGET_PROJECT,NAME_TARGET_BRANCH, PROP_TARGET_BRANCH,NAME_SOURCE_PROJECT, PROP_SOURCE_PROJECT,@@ -207,6 +209,19 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach};+ public enum Status {+ OPEN, MERGED, DISCARDED;++ @Override+ public String toString() {+ return WordUtils.toWords(name());+ }++ }++ @Column(nullable=false)+ private Status status = Status.OPEN;+@Embeddedprivate CloseInfo closeInfo;@@ -506,6 +521,14 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachthis.codeComments = codeComments;}+ public Status getStatus() {+ return status;+ }++ public void setStatus(Status status) {+ this.status = status;+ }+@Nullablepublic CloseInfo getCloseInfo() {return closeInfo;@@ -516,7 +539,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}public boolean isOpen() {- return closeInfo == null;+ return status == Status.OPEN;}/**@@ -787,11 +810,11 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}public boolean isMerged() {- return closeInfo != null && closeInfo.getStatus() == CloseInfo.Status.MERGED;+ return status == Status.MERGED;}public boolean isDiscarded() {- return closeInfo != null && closeInfo.getStatus() == CloseInfo.Status.DISCARDED;+ return status == Status.DISCARDED;}public boolean isMergedIntoTarget() {@@ -1147,13 +1170,4 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn null;}- public String getStatusName() {- if (isMerged())- return "Merged";- else if (isDiscarded())- return "Discarded";- else- return "Open";- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.javaindex 6951d0f4c0..0a6a81d175 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java@@ -28,7 +28,7 @@ public class PullRequestChange extends AbstractEntity {private User user;@Column(nullable=false)- private Date date;+ private Date date = new Date();@Lob@Column(length=65535)diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.javaindex 730b34f8a0..33d972d7dd 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java@@ -9,7 +9,6 @@ import javax.persistence.FetchType;import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;-import io.onedev.commons.utils.WordUtils;import io.onedev.server.model.User;@Embeddable@@ -23,24 +22,10 @@ public class CloseInfo implements Serializable {public static final String COLUMN_DATE = "CLOSE_DATE";- public static final String COLUMN_STATUS = "CLOSE_STATUS";-public static final String PROP_USER = "user";- public static final String PROP_STATUS = "status";-public static final String PROP_DATE = "date";- public enum Status {- MERGED, DISCARDED;-- @Override- public String toString() {- return WordUtils.toWords(name());- }-- };-@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(name=COLUMN_USER)private User user;@@ -49,11 +34,8 @@ public class CloseInfo implements Serializable {private String userName;@Column(name=COLUMN_DATE)- private Date date;+ private Date date = new Date();- @Column(name=COLUMN_STATUS)- private Status status;-public User getUser() {return user;}@@ -77,13 +59,5 @@ public class CloseInfo implements Serializable {public void setDate(Date date) {this.date = date;}-- public Status getStatus() {- return status;- }-- public void setStatus(Status status) {- this.status = status;- }}diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex 9d7e0ece47..4eb38ad131 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -66,7 +66,7 @@ public class BuildNotificationManager extends AbstractNotificationManager {Build build = event.getBuild();String subject = String.format("[Build %s] %s", build.getFQN(), build.getJobName());- String summary = build.getStatus().getDisplayName();+ String summary = build.getStatus().toString();if (build.getVersion() != null)summary = build.getVersion() + " " + summary;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 1f89dadffd..1576ad8e35 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -1,6 +1,7 @@package io.onedev.server.search.entity.build;import static io.onedev.server.model.Build.NAME_BRANCH;+import static io.onedev.server.model.Build.NAME_STATUS;import static io.onedev.server.model.Build.NAME_COMMIT;import static io.onedev.server.model.Build.NAME_FINISH_DATE;import static io.onedev.server.model.Build.NAME_JOB;@@ -202,6 +203,12 @@ public class BuildQuery extends EntityQuery<Build> {switch (fieldName) {case NAME_PROJECT:return new ProjectCriteria(value);+ case NAME_STATUS:+ try {+ return new StatusCriteria(Build.Status.valueOf(value.toUpperCase()));+ } catch (IllegalArgumentException e) {+ throw new ExplicitException("Invalid status: " + value);+ }case NAME_COMMIT:ProjectScopedCommit commitId = getCommitId(project, value);return new CommitCriteria(commitId.getProject(), commitId.getCommitId());@@ -293,7 +300,7 @@ public class BuildQuery extends EntityQuery<Build> {&& !fieldName.equals(NAME_JOB) && !fieldName.equals(NAME_NUMBER)&& !fieldName.equals(NAME_PULL_REQUEST) && !fieldName.equals(NAME_VERSION)&& !fieldName.equals(NAME_BRANCH) && !fieldName.equals(NAME_TAG)- && !paramNames.contains(fieldName)) {+ && !fieldName.equals(NAME_STATUS) && !paramNames.contains(fieldName)) {throw newOperatorException(fieldName, operator);}break;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.javanew file mode 100644index 0000000000..a555bc62c8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java@@ -0,0 +1,42 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;++public class StatusCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private final Build.Status status;++ public StatusCriteria(Build.Status status) {+ this.status = status;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {+ Path<?> attribute = from.get(Build.PROP_STATUS);+ return builder.equal(attribute, status);+ }++ @Override+ public boolean matches(Build build) {+ return build.getStatus() == status;+ }++ @Override+ public String toStringWithoutParens() {+ return quote(Build.NAME_STATUS)+ + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is)+ + " "+ + quote(status.toString());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.javaindex 394f00ec1a..f19afdfb98 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.PullRequest.Status;import io.onedev.server.util.criteria.Criteria;public class DiscardedCriteria extends Criteria<PullRequest> {@@ -14,7 +14,7 @@ public class DiscardedCriteria extends Criteria<PullRequest> {private static final long serialVersionUID = 1L;private Criteria<PullRequest> getCriteria() {- return new StatusCriteria(CloseInfo.Status.DISCARDED.toString());+ return new StatusCriteria(Status.DISCARDED);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.javaindex 51cfcab56f..fd63da5eb0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.PullRequest.Status;import io.onedev.server.util.criteria.Criteria;public class MergedCriteria extends Criteria<PullRequest> {@@ -14,7 +14,7 @@ public class MergedCriteria extends Criteria<PullRequest> {private static final long serialVersionUID = 1L;private Criteria<PullRequest> getCriteria() {- return new StatusCriteria(CloseInfo.Status.MERGED.toString());+ return new StatusCriteria(Status.MERGED);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.javaindex 37e43854f1..07bd4613ec 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequest.Status;import io.onedev.server.util.criteria.Criteria;public class OpenCriteria extends Criteria<PullRequest> {@@ -13,7 +14,7 @@ public class OpenCriteria extends Criteria<PullRequest> {private static final long serialVersionUID = 1L;private Criteria<PullRequest> getCriteria() {- return new StatusCriteria(PullRequest.STATE_OPEN);+ return new StatusCriteria(Status.OPEN);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex 3fa5044564..993e22071b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -182,6 +182,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {switch (fieldName) {case PullRequest.NAME_NUMBER:return new NumberCriteria(project, value, operator);+ case PullRequest.NAME_STATUS:+ try {+ return new StatusCriteria(PullRequest.Status.valueOf(value.toUpperCase()));+ } catch (IllegalArgumentException e) {+ throw new ExplicitException("Invalid status: " + value);+ }case PullRequest.NAME_MERGE_STRATEGY:return new MergeStrategyCriteria(MergeStrategy.fromString(value));case PullRequest.NAME_SOURCE_BRANCH:@@ -280,6 +286,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {break;case PullRequestQueryLexer.Is:if (!fieldName.equals(PullRequest.NAME_NUMBER)+ && !fieldName.equals(PullRequest.NAME_STATUS)&& !fieldName.equals(PullRequest.NAME_MERGE_STRATEGY)&& !fieldName.equals(PullRequest.NAME_TARGET_PROJECT)&& !fieldName.equals(PullRequest.NAME_TARGET_BRANCH)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.javaindex 2663195b2e..73a067e8c6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java@@ -3,45 +3,37 @@ package io.onedev.server.search.entity.pullrequest;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.PullRequest.Status;import io.onedev.server.util.criteria.Criteria;public class StatusCriteria extends Criteria<PullRequest> {private static final long serialVersionUID = 1L;- private String value;+ private Status status;- public StatusCriteria(String value) {- this.value = value;+ public StatusCriteria(Status status) {+ this.status = status;}@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {- Path<?> attribute = PullRequestQuery.getPath(from, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS);- if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))- return builder.isNull(attribute);- else- return builder.equal(attribute, CloseInfo.Status.valueOf(value.toUpperCase()));+ return builder.equal(PullRequestQuery.getPath(from, PullRequest.PROP_STATUS), status);}@Overridepublic boolean matches(PullRequest request) {- if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))- return request.getCloseInfo() == null;- else- return request.getCloseInfo() != null && request.getCloseInfo().getStatus().name().equalsIgnoreCase(value);+ return request.getStatus() == status;}@Overridepublic String toStringWithoutParens() {return quote(PullRequest.NAME_STATUS) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "- + quote(value);+ + quote(status.toString());}}diff --git a/server-core/src/main/java/io/onedev/server/util/MilestoneAndState.java b/server-core/src/main/java/io/onedev/server/util/MilestoneAndIssueState.javasimilarity index 58%rename from server-core/src/main/java/io/onedev/server/util/MilestoneAndState.javarename to server-core/src/main/java/io/onedev/server/util/MilestoneAndIssueState.javaindex 3eaa48aeb9..767d885f8a 100644--- a/server-core/src/main/java/io/onedev/server/util/MilestoneAndState.java+++ b/server-core/src/main/java/io/onedev/server/util/MilestoneAndIssueState.java@@ -1,14 +1,16 @@package io.onedev.server.util;-import io.onedev.server.model.Milestone;+import java.io.Serializable;-public class MilestoneAndState extends Pair<Milestone, String> {+public class MilestoneAndIssueState implements Serializable {++ private static final long serialVersionUID = 1L;private final Long milestoneId;private final String issueState;- public MilestoneAndState(Long milestoneId, String issueState) {+ public MilestoneAndIssueState(Long milestoneId, String issueState) {this.milestoneId = milestoneId;this.issueState = issueState;}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectBuildStats.java b/server-core/src/main/java/io/onedev/server/util/ProjectBuildStats.javanew file mode 100644index 0000000000..546967726d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ProjectBuildStats.java@@ -0,0 +1,35 @@+package io.onedev.server.util;++import java.io.Serializable;++import io.onedev.server.model.Build;++public class ProjectBuildStats implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Long projectId;++ private final Build.Status buildStatus;++ private final long statusCount;++ public ProjectBuildStats(Long projectId, Build.Status buildStatus, long statusCount) {+ this.projectId = projectId;+ this.buildStatus = buildStatus;+ this.statusCount = statusCount;+ }++ public Long getProjectId() {+ return projectId;+ }++ public Build.Status getBuildStatus() {+ return buildStatus;+ }++ public long getStatusCount() {+ return statusCount;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectIssueStats.java b/server-core/src/main/java/io/onedev/server/util/ProjectIssueStats.javanew file mode 100644index 0000000000..5590f270c0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ProjectIssueStats.java@@ -0,0 +1,33 @@+package io.onedev.server.util;++import java.io.Serializable;++public class ProjectIssueStats implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Long projectId;++ private final int stateOrdinal;++ private final long stateCount;++ public ProjectIssueStats(Long projectId, int stateOrdinal, long stateCount) {+ this.projectId = projectId;+ this.stateOrdinal = stateOrdinal;+ this.stateCount = stateCount;+ }++ public Long getProjectId() {+ return projectId;+ }++ public int getStateOrdinal() {+ return stateOrdinal;+ }++ public long getStateCount() {+ return stateCount;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStats.java b/server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStats.javanew file mode 100644index 0000000000..91416e406b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/ProjectPullRequestStats.java@@ -0,0 +1,35 @@+package io.onedev.server.util;++import java.io.Serializable;++import io.onedev.server.model.PullRequest.Status;++public class ProjectPullRequestStats implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Long projectId;++ private final Status pullRequestStatus;++ private final long statusCount;++ public ProjectPullRequestStats(Long projectId, Status pullRequestStatus, long statusCount) {+ this.projectId = projectId;+ this.pullRequestStatus = pullRequestStatus;+ this.statusCount = statusCount;+ }++ public Long getProjectId() {+ return projectId;+ }++ public Status getPullRequestStatus() {+ return pullRequestStatus;+ }++ public long getStatusCount() {+ return statusCount;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex fd98166fb1..bd6501a584 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -124,6 +124,11 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestJobs(project, matchWith);elsereturn null;+ } else if (fieldName.equals(Build.NAME_STATUS)) {+ List<String> candidates = new ArrayList<>();+ for (Build.Status status: Build.Status.values())+ candidates.add(status.toString());+ return SuggestionUtils.suggest(candidates, matchWith);} else if (fieldName.equals(Build.NAME_NUMBER)) {return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else if (fieldName.equals(Build.NAME_VERSION)) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 94523b0013..6572711c43 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -21,13 +21,13 @@ import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;import io.onedev.server.util.DateUtils;-import io.onedev.server.model.PullRequest;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -94,6 +94,11 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {|| fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);return !suggestions.isEmpty()? suggestions: null;+ } else if (fieldName.equals(PullRequest.NAME_STATUS)) {+ List<String> candidates = new ArrayList<>();+ for (PullRequest.Status status: PullRequest.Status.values())+ candidates.add(status.toString());+ return SuggestionUtils.suggest(candidates, matchWith);} else if (fieldName.equals(PullRequest.NAME_TARGET_PROJECT)|| fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)) {if (!matchWith.contains("*"))diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 21cf92680a..8b52605481 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -1016,7 +1016,7 @@ public abstract class BuildListPanel extends Panel {@Overridepublic String getObject() {- return rowModel.getObject().getStatus().getDisplayName();+ return rowModel.getObject().getStatus().toString();}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex eebac8861f..4422a16759 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -124,7 +124,7 @@ public abstract class CommitStatusPanel extends Panel {title = "Some builds are ";elsetitle = "Builds are ";- title += status.getDisplayName().toLowerCase() + ", click for details";+ title += status.toString().toLowerCase() + ", click for details";} else {title = "No builds";}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 687f6095f8..7043d3ad92 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -36,7 +36,6 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ColorUtils;import io.onedev.server.util.DateUtils;@@ -181,18 +180,17 @@ public class MarkdownViewer extends GenericPanel<String> {PullRequest request = OneDev.getInstance(PullRequestManager.class).findByFQN(referenceId);// check permission here as target project may not be the same as current projectif (request != null && SecurityUtils.canReadCode(request.getTargetProject())) {+ String status = request.getStatus().toString();String statusCss;- String status;- CloseInfo closeInfo = request.getCloseInfo();- if (closeInfo == null) {- status = PullRequest.STATE_OPEN;+ switch (request.getStatus()) {+ case OPEN:statusCss = "badge-warning";- } else {- status = closeInfo.getStatus().toString();- if (closeInfo.getStatus() == CloseInfo.Status.DISCARDED)- statusCss = "badge-danger";- else- statusCss = "badge-success";+ break;+ case MERGED:+ statusCss = "badge-success";+ break;+ default:+ statusCss = "badge-danger";}String script = String.format("onedev.server.markdown.renderPullRequestTooltip('%s', '%s', '%s')",diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex 2d6de1a001..d18b76ba90 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -36,6 +36,44 @@</div></div><wicket:fragment wicket:id="projectFrag">- <a wicket:id="link"><img wicket:id="avatar"> <span wicket:id="path" class="path"></span></a>+ <div class="d-flex flex-wrap font-size-h5">+ <a wicket:id="path" class="mr-auto text-nowrap"><img wicket:id="avatar"> <span wicket:id="label" class="mr-3"></span></a>+ <span wicket:id="lastUpdate" class="text-muted font-size-sm"></span>+ </div>+ <div class="d-flex flex-wrap">+ <div wicket:id="codeInfo" class="code-info mt-2 d-flex align-items-center flex-wrap mr-3"></div>+ <div wicket:id="pullRequestInfo" class="pull-request-info mt-2 d-flex align-items-center flex-wrap"></div>+ </div>+ <div class="d-flex flex-wrap">+ <div wicket:id="issueInfo" class="issue-info mt-2 d-flex align-items-center flex-wrap mr-3"></div>+ <div wicket:id="buildInfo" class="issue-info mt-2 d-flex align-items-center flex-wrap"></div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="codeInfoFrag">+ <wicket:svg href="files" class="icon mr-2"></wicket:svg>+ <a wicket:id="commits" class="mr-2"><span wicket:id="label"></span></a>+ <a wicket:id="branches" class="mr-2"><span wicket:id="label"></span></a>+ <a wicket:id="tags" class="mr-2"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="issueInfoFrag">+ <wicket:svg href="bug" class="icon mr-2"></wicket:svg>+ <a wicket:id="issues" class="mr-2"><span wicket:id="label"></span></a>+ <wicket:container wicket:id="states">+ <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>+ </wicket:container>+ </wicket:fragment>+ <wicket:fragment wicket:id="buildInfoFrag">+ <wicket:svg href="play-circle" class="icon mr-2"></wicket:svg>+ <a wicket:id="builds" class="mr-2"><span wicket:id="label"></span></a>+ <wicket:container wicket:id="statuses">+ <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>+ </wicket:container>+ </wicket:fragment>+ <wicket:fragment wicket:id="pullRequestInfoFrag">+ <wicket:svg href="pull-request" class="icon mr-2"></wicket:svg>+ <a wicket:id="pullRequests" class="mr-2"><span wicket:id="label"></span></a>+ <wicket:container wicket:id="statuses">+ <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>+ </wicket:container></wicket:fragment></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 8567b976fb..8f3ec6dff7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.project.list;+import java.io.IOException;import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;@@ -34,29 +35,55 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;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.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.Constants;++import com.google.common.collect.Lists;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.imports.ProjectImporter;import io.onedev.server.imports.ProjectImporterContribution;+import io.onedev.server.infomanager.CommitInfoManager;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.search.entity.EntitySort;+import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.search.entity.build.StatusCriteria;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryLexer;+import io.onedev.server.search.entity.issue.ProjectCriteria;+import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.search.entity.project.ChildrenOfCriteria;import io.onedev.server.search.entity.project.NameCriteria;import io.onedev.server.search.entity.project.PathCriteria;import io.onedev.server.search.entity.project.ProjectQuery;+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.CreateChildren;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.ProjectBuildStats;+import io.onedev.server.util.ProjectIssueStats;+import io.onedev.server.util.ProjectPullRequestStats;+import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ProjectQueryBehavior;@@ -73,9 +100,16 @@ import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;+import io.onedev.server.web.page.issues.IssueListPage;import io.onedev.server.web.page.project.NewProjectPage;+import io.onedev.server.web.page.project.branches.ProjectBranchesPage;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.imports.ProjectImportPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;+import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;+import io.onedev.server.web.page.project.tags.ProjectTagsPage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -101,6 +135,45 @@ public class ProjectListPanel extends Panel {};+ private final IModel<List<ProjectIssueStats>> issueStatsModel =+ new LoadableDetachableModel<List<ProjectIssueStats>>() {++ @Override+ protected List<ProjectIssueStats> load() {+ List<Project> projects = new ArrayList<>();+ for (Component row: (WebMarkupContainer)projectsTable.get("body").get("rows"))+ projects.add((Project) row.getDefaultModelObject());+ return OneDev.getInstance(IssueManager.class).queryStats(projects);+ }++ };++ private final IModel<List<ProjectBuildStats>> buildStatsModel =+ new LoadableDetachableModel<List<ProjectBuildStats>>() {++ @Override+ protected List<ProjectBuildStats> load() {+ List<Project> projects = new ArrayList<>();+ for (Component row: (WebMarkupContainer)projectsTable.get("body").get("rows"))+ projects.add((Project) row.getDefaultModelObject());+ return OneDev.getInstance(BuildManager.class).queryStats(projects);+ }++ };++ private final IModel<List<ProjectPullRequestStats>> pullRequestStatsModel =+ new LoadableDetachableModel<List<ProjectPullRequestStats>>() {++ @Override+ protected List<ProjectPullRequestStats> load() {+ List<Project> projects = new ArrayList<>();+ for (Component row: (WebMarkupContainer)projectsTable.get("body").get("rows"))+ projects.add((Project) row.getDefaultModelObject());+ return OneDev.getInstance(PullRequestManager.class).queryStats(projects);+ }++ };+private DataTable<Project, Void> projectsTable;private SelectionColumn<Project, Void> selectionColumn;@@ -127,6 +200,9 @@ public class ProjectListPanel extends Panel {@Overrideprotected void onDetach() {+ pullRequestStatsModel.detach();+ buildStatsModel.detach();+ issueStatsModel.detach();queryStringModel.detach();queryModel.detach();super.onDetach();@@ -950,19 +1026,14 @@ public class ProjectListPanel extends Panel {if (SecurityUtils.getUser() != null)columns.add(selectionColumn = new SelectionColumn<Project, Void>());- columns.add(new AbstractColumn<Project, Void>(Model.of("Project")) {-- @Override- public String getCssClass() {- return "project";- }+ columns.add(new AbstractColumn<Project, Void>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId, IModel<Project> rowModel) {Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPanel.this);Project project = rowModel.getObject();- ActionablePageLink<Void> link = new ActionablePageLink<Void>("link",+ ActionablePageLink<Void> pathLink = new ActionablePageLink<Void>("path",ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project)) {@Override@@ -974,30 +1045,294 @@ public class ProjectListPanel extends Panel {};- link.add(new ProjectAvatar("avatar", project));+ pathLink.add(new ProjectAvatar("avatar", project));if (getParentProject() != null)- link.add(new Label("path", project.getPath().substring(getParentProject().getPath().length()+1)));+ pathLink.add(new Label("label", project.getPath().substring(getParentProject().getPath().length()+1)));else- link.add(new Label("path", project.getPath()));- fragment.add(link);- cellItem.add(fragment);- }-- });-- columns.add(new AbstractColumn<Project, Void>(Model.of("Last Update")) {+ pathLink.add(new Label("label", project.getPath()));+ fragment.add(pathLink);++ fragment.add(new Label("lastUpdate", "Updated " + DateUtils.formatAge(project.getUpdateDate())));++ if (project.isCodeManagementEnabled() && SecurityUtils.canReadCode(project)) {+ Fragment commitInfoFrag = new Fragment("codeInfo", "codeInfoFrag", ProjectListPanel.this);+ PageParameters params = ProjectCommitsPage.paramsOf(project, null);+ Link<Void> commitsLink = new BookmarkablePageLink<Void>("commits", ProjectCommitsPage.class, params);+ commitsLink.add(new Label("label", OneDev.getInstance(CommitInfoManager.class).getCommitCount(project) + " commits"));+ commitInfoFrag.add(commitsLink);++ params = ProjectBranchesPage.paramsOf(project);+ Link<Void> branchesLink = new BookmarkablePageLink<Void>("branches", ProjectBranchesPage.class, params);+ try {+ int branchCount = project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS).size();+ branchesLink.add(new Label("label", branchCount + " branches"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ commitInfoFrag.add(branchesLink);++ params = ProjectTagsPage.paramsOf(project);+ Link<Void> tagsLink = new BookmarkablePageLink<Void>("tags", ProjectTagsPage.class, params);+ try {+ int tagCount = project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_TAGS).size();+ tagsLink.add(new Label("label", tagCount + " tags"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ commitInfoFrag.add(tagsLink);++ fragment.add(commitInfoFrag);++ IModel<Integer> totalCountModel = new LoadableDetachableModel<Integer>() {- @Override- public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,- IModel<Project> rowModel) {- Project project = rowModel.getObject();- cellItem.add(new Label(componentId, DateUtils.formatAge(project.getUpdateDate()))- .add(new AttributeAppender("title", DateUtils.formatDateTime(project.getUpdateDate()))));- }+ @Override+ protected Integer load() {+ int totalCount = 0;+ for (ProjectPullRequestStats stats: pullRequestStatsModel.getObject()) {+ if (stats.getProjectId().equals(rowModel.getObject().getId()))+ totalCount += stats.getStatusCount();+ }+ return totalCount;+ }++ };+ Fragment pullRequestInfoFrag = new Fragment("pullRequestInfo", "pullRequestInfoFrag", ProjectListPanel.this) {- @Override- public String getCssClass() {- return "d-none d-sm-table-cell";+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(totalCountModel.getObject() != 0);+ }++ };+ pullRequestInfoFrag.setDefaultModel(totalCountModel);++ params = ProjectPullRequestsPage.paramsOf(project);+ Link<Void> pullRequestsLink = new BookmarkablePageLink<Void>("pullRequests", ProjectPullRequestsPage.class, params);+ pullRequestsLink.add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return totalCountModel.getObject() + " pull requests";+ }++ }));+ pullRequestInfoFrag.add(pullRequestsLink);++ pullRequestInfoFrag.add(new ListView<ProjectPullRequestStats>("statuses",+ new LoadableDetachableModel<List<ProjectPullRequestStats>>() {++ @Override+ protected List<ProjectPullRequestStats> load() {+ List<ProjectPullRequestStats> listOfPullRequestStats = new ArrayList<>();+ for (ProjectPullRequestStats stats: pullRequestStatsModel.getObject()) {+ if (stats.getProjectId().equals(rowModel.getObject().getId()))+ listOfPullRequestStats.add(stats);+ }+ return listOfPullRequestStats;+ }++ }) {++ @Override+ protected void populateItem(ListItem<ProjectPullRequestStats> item) {+ ProjectPullRequestStats stats = item.getModelObject();+ PullRequestQuery query = new PullRequestQuery(+ new io.onedev.server.search.entity.pullrequest.StatusCriteria(stats.getPullRequestStatus()));+ PageParameters params = ProjectPullRequestsPage.paramsOf(rowModel.getObject(), query.toString(), 0);+ Link<Void> statusLink = new BookmarkablePageLink<Void>("link", ProjectPullRequestsPage.class, params);+ String statusName = stats.getPullRequestStatus().toString();+ statusLink.add(new Label("label", stats.getStatusCount() + " " + statusName));++ String cssClass;+ switch (stats.getPullRequestStatus()) {+ case OPEN:+ cssClass = "link-warning";+ break;+ case MERGED:+ cssClass = "link-success";+ break;+ default:+ cssClass = "link-danger";+ break;+ }+ statusLink.add(AttributeAppender.append("class", cssClass));+ item.add(statusLink);+ }++ });++ fragment.add(pullRequestInfoFrag);+ } else {+ fragment.add(new WebMarkupContainer("codeInfo").setVisible(false));+ fragment.add(new WebMarkupContainer("pullRequestInfo").setVisible(false));+ }++ if (project.isIssueManagementEnabled()) {+ IModel<Integer> totalCountModel = new LoadableDetachableModel<Integer>() {++ @Override+ protected Integer load() {+ int totalCount = 0;+ for (ProjectIssueStats stats: issueStatsModel.getObject()) {+ if (stats.getProjectId().equals(rowModel.getObject().getId()))+ totalCount += stats.getStateCount();+ }+ return totalCount;+ }++ };+ Fragment issueInfoFrag = new Fragment("issueInfo", "issueInfoFrag", ProjectListPanel.this) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(totalCountModel.getObject() != 0);+ }++ };+ issueInfoFrag.setDefaultModel(totalCountModel);++ IssueQuery query = new IssueQuery(new ProjectCriteria(project.getPath()));+ PageParameters params = ProjectIssueListPage.paramsOf(project, query.toString(), 0);+ Link<Void> issuesLink = new BookmarkablePageLink<Void>("issues", IssueListPage.class, params);+ issuesLink.add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return totalCountModel.getObject() + " issues";+ }++ }));+ issueInfoFrag.add(issuesLink);++ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();++ issueInfoFrag.add(new ListView<ProjectIssueStats>("states", new LoadableDetachableModel<List<ProjectIssueStats>>() {++ @Override+ protected List<ProjectIssueStats> load() {+ List<ProjectIssueStats> listOfIssueStats = new ArrayList<>();+ for (ProjectIssueStats stats: issueStatsModel.getObject()) {+ if (stats.getProjectId().equals(rowModel.getObject().getId())+ && stats.getStateOrdinal() < issueSetting.getStateSpecs().size()) {+ listOfIssueStats.add(stats);+ }+ }+ return listOfIssueStats;+ }++ }) {++ @Override+ protected void populateItem(ListItem<ProjectIssueStats> item) {+ Project project = rowModel.getObject();+ ProjectIssueStats stats = item.getModelObject();+ StateSpec stateSpec = issueSetting.getStateSpecs().get(stats.getStateOrdinal());+ AndCriteria<Issue> criteria = new AndCriteria<>(Lists.newArrayList(+ new ProjectCriteria(project.getPath()),+ new StateCriteria(stateSpec.getName(), IssueQueryLexer.Is)));+ IssueQuery query = new IssueQuery(criteria);+ PageParameters params = ProjectIssueListPage.paramsOf(project, query.toString(), 0);+ Link<Void> stateLink = new BookmarkablePageLink<Void>("link", IssueListPage.class, params);+ stateLink.add(new Label("label", stats.getStateCount() + " " + stateSpec.getName()));+ stateLink.add(AttributeAppender.append("style", "color:" + stateSpec.getColor()));+ item.add(stateLink);+ }++ });++ fragment.add(issueInfoFrag);+ } else {+ fragment.add(new WebMarkupContainer("issueInfo").setVisible(false));+ }++ if (project.isCodeManagementEnabled()) {+ IModel<Integer> totalCountModel = new LoadableDetachableModel<Integer>() {++ @Override+ protected Integer load() {+ int totalCount = 0;+ for (ProjectBuildStats stats: buildStatsModel.getObject()) {+ if (stats.getProjectId().equals(rowModel.getObject().getId()))+ totalCount += stats.getStatusCount();+ }+ return totalCount;+ }++ };+ Fragment buildInfoFrag = new Fragment("buildInfo", "buildInfoFrag", ProjectListPanel.this) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(totalCountModel.getObject() != 0);+ }++ };+ buildInfoFrag.setDefaultModel(totalCountModel);++ PageParameters params = ProjectBuildsPage.paramsOf(project);+ Link<Void> buildsLink = new BookmarkablePageLink<Void>("builds", ProjectBuildsPage.class, params);+ buildsLink.add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return totalCountModel.getObject() + " builds";+ }++ }));+ buildInfoFrag.add(buildsLink);++ buildInfoFrag.add(new ListView<ProjectBuildStats>("statuses",+ new LoadableDetachableModel<List<ProjectBuildStats>>() {++ @Override+ protected List<ProjectBuildStats> load() {+ List<ProjectBuildStats> listOfBuildStats = new ArrayList<>();+ for (ProjectBuildStats stats: buildStatsModel.getObject()) {+ if (stats.getProjectId().equals(rowModel.getObject().getId()))+ listOfBuildStats.add(stats);+ }+ return listOfBuildStats;+ }++ }) {++ @Override+ protected void populateItem(ListItem<ProjectBuildStats> item) {+ ProjectBuildStats stats = item.getModelObject();+ BuildQuery query = new BuildQuery(new StatusCriteria(stats.getBuildStatus()));+ PageParameters params = ProjectBuildsPage.paramsOf(rowModel.getObject(), query.toString(), 0);+ Link<Void> statusLink = new BookmarkablePageLink<Void>("link", ProjectBuildsPage.class, params);+ String statusName = stats.getBuildStatus().toString();+ statusLink.add(new Label("label", stats.getStatusCount() + " " + statusName));++ String cssClass;+ switch (stats.getBuildStatus()) {+ case SUCCESSFUL:+ cssClass = "link-success";+ break;+ case FAILED:+ case TIMED_OUT:+ case CANCELLED:+ cssClass = "link-danger";+ break;+ default:+ cssClass = "link-warning";+ }+ statusLink.add(AttributeAppender.append("class", cssClass));+ item.add(statusLink);+ }++ });++ fragment.add(buildInfoFrag);+ } else {+ fragment.add(new WebMarkupContainer("buildInfo").setVisible(false));+ }++ cellItem.add(fragment);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.cssindex ae76bcc4e0..cccc6135fb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css@@ -1,6 +1,4 @@-@media(max-width: 575px) {- .project-list table>thead {- display: none;- }+.project-list table>thead {+ display: none;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.javaindex ddf0aa9388..c5fd24c861 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusBadge.java@@ -7,7 +7,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.pullrequest.CloseInfo;@SuppressWarnings("serial")public class RequestStatusBadge extends Label {@@ -19,12 +18,7 @@ public class RequestStatusBadge extends Label {@Overrideprotected String load() {- PullRequest request = requestModel.getObject();- CloseInfo closeInfo = request.getCloseInfo();- if (closeInfo == null)- return PullRequest.STATE_OPEN;- else- return closeInfo.getStatus().toString();+ return requestModel.getObject().getStatus().toString();}});@@ -40,13 +34,14 @@ public class RequestStatusBadge extends Label {@Overridepublic String getObject() {PullRequest request = getPullRequest();- CloseInfo closeInfo = request.getCloseInfo();- if (closeInfo == null)+ switch (request.getStatus()) {+ case OPEN:return "badge badge-warning request-status";- else if (closeInfo.getStatus() == CloseInfo.Status.MERGED)+ case MERGED:return "badge badge-success request-status";- else+ default:return "badge badge-danger request-status";+ }}}));diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.javaindex 1da086aed0..f34daf62bb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java@@ -145,7 +145,7 @@ public abstract class PullRequestJobsPanel extends Panel {title = "Some builds are ";elsetitle = "Builds are ";- title += status.getDisplayName().toLowerCase() + ", click for details";+ title += status.toString().toLowerCase() + ", click for details";} else {title = "No builds";}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 76c742f639..09990bd784 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -217,7 +217,7 @@ public abstract class BuildDetailPage extends ProjectPage@Overridepublic String getObject() {- return buildModel.getObject().getStatus().getDisplayName();+ return buildModel.getObject().getStatus().toString();}}));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 28ec97a461..de58f6db57 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -374,7 +374,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annotatitle = "Some builds are ";elsetitle = "Builds are ";- title += status.getDisplayName().toLowerCase() + ", click for details";+ title += status.toString().toLowerCase() + ", click for details";} else {title = "No builds";cssClasses += " no-builds";diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javaindex 4d08676f55..fdee3be7f3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -41,7 +41,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.MilestoneAndState;+import io.onedev.server.util.MilestoneAndIssueState;import io.onedev.server.util.MilestoneSort;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;@@ -70,17 +70,17 @@ public class MilestoneListPage extends ProjectPage {private final MilestoneSort sort;- private final IModel<Collection<MilestoneAndState>> milestoneAndStatesModel =- new LoadableDetachableModel<Collection<MilestoneAndState>>() {+ private final IModel<Collection<MilestoneAndIssueState>> milestoneAndStatesModel =+ new LoadableDetachableModel<Collection<MilestoneAndIssueState>>() {@Override- protected Collection<MilestoneAndState> load() {+ protected Collection<MilestoneAndIssueState> load() {List<Milestone> milestones = new ArrayList<>();for (Component row: (WebMarkupContainer)milestonesTable.get("body").get("rows")) {Milestone milestone = (Milestone) row.getDefaultModelObject();milestones.add(milestone);}- return OneDev.getInstance(IssueManager.class).queryMilestoneAndStates(getProject(), milestones);+ return OneDev.getInstance(IssueManager.class).queryMilestoneAndIssueStates(getProject(), milestones);}};@@ -255,7 +255,7 @@ public class MilestoneListPage extends ProjectPage {@Overrideprotected Map<String, Integer> load() {Map<String, Integer> stateStats = new HashMap<>();- for (MilestoneAndState milestoneAndState: milestoneAndStatesModel.getObject()) {+ for (MilestoneAndIssueState milestoneAndState: milestoneAndStatesModel.getObject()) {if (milestoneAndState.getMilestoneId().equals(rowModel.getObject().getId())) {Integer count = stateStats.get(milestoneAndState.getIssueState());if (count != null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 19aaeb4c09..ce0c32a43a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -4,7 +4,6 @@ import java.util.ArrayList;import java.util.Arrays;import java.util.Collection;import java.util.Comparator;-import java.util.Date;import java.util.HashMap;import java.util.HashSet;import java.util.List;@@ -64,6 +63,7 @@ import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;+import io.onedev.server.model.PullRequest.Status;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.model.support.pullrequest.CloseInfo;@@ -227,10 +227,8 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Annorequest.setBaseCommitHash(baseCommitId.name());if (request.getBaseCommitHash().equals(source.getObjectName())) {- CloseInfo closeInfo = new CloseInfo();- closeInfo.setDate(new Date());- closeInfo.setStatus(CloseInfo.Status.MERGED);- request.setCloseInfo(closeInfo);+ request.setStatus(Status.MERGED);+ request.setCloseInfo(new CloseInfo());}PullRequestUpdate update = new PullRequestUpdate();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 13ff096ab2..f729cae7be 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -970,11 +970,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overridepublic String getObject() {- PullRequest request = getPullRequest();- if (request.isOpen())- return "OPEN";- else- return request.getCloseInfo().getStatus().toString();+ return getPullRequest().getStatus().toString();}}) {