Skip to content

The Unified and Autonomous Development Platform

fix issue #37: Improve milestone issue stats bar

Robin Shen35ff0c12d708
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.java
index 0b80163320..6724860e30 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
@@ -12,6 +12,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.util.MilestoneAndState;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
@@ -38,8 +39,6 @@ public interface IssueManager extends EntityManager<Issue> {
List<Issue> query(Project project, String term, int count);
- int count(Milestone milestone, @Nullable Boolean done);
-
Collection<String> getUndefinedStates();
void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions);
@@ -58,4 +57,5 @@ public interface IssueManager extends EntityManager<Issue> {
Collection<Long> getIssueNumbers(Long projectId);
+ Collection<MilestoneAndState> queryMilestoneAndStates(Project project, Collection<Milestone> milestones);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java
index 5dc5dbf8dd..05512ad93c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java
@@ -11,9 +11,7 @@ public interface MilestoneManager extends EntityManager<Milestone> {
@Nullable
Milestone find(Project project, String name);
- void delete(Milestone milestone, @Nullable Milestone moveIssuesToMilestone);
-
- void close(Milestone milestone, @Nullable Milestone moveOpenIssuesToMilestone);
+ void delete(Milestone milestone);
Milestone find(String milestoneFQN);
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.java
index f51853906a..d45bef7d56 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
@@ -61,11 +61,10 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
-import io.onedev.server.search.entity.issue.AndIssueCriteria;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.search.entity.issue.MilestoneCriteria;
import io.onedev.server.security.permission.AccessProject;
+import io.onedev.server.util.MilestoneAndState;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.ValueSetEdit;
@@ -273,24 +272,6 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
}
- @Override
- public int count(Milestone milestone, @Nullable Boolean done) {
- if (done != null) {
- IssueCriteria criteria = getIssueSetting().getDoneCriteria(done);
- if (criteria != null) {
- List<IssueCriteria> criterias = new ArrayList<>();
- criterias.add(new MilestoneCriteria(milestone.getName()));
- criterias.add(criteria);
- return count(milestone.getProject(), new AndIssueCriteria(criterias));
- } else {
- return 0;
- }
- } else {
- IssueCriteria criteria = new MilestoneCriteria(milestone.getName());
- return count(milestone.getProject(), criteria);
- }
- }
-
@SuppressWarnings("unchecked")
@Sessional
@Override
@@ -640,4 +621,25 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
}
+ @Sessional
+ @Override
+ public Collection<MilestoneAndState> queryMilestoneAndStates(Project project, Collection<Milestone> milestones) {
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<MilestoneAndState> criteriaQuery = builder.createQuery(MilestoneAndState.class);
+ Root<Issue> root = criteriaQuery.from(Issue.class);
+ criteriaQuery.multiselect(
+ root.get(IssueQueryConstants.ATTR_MILESTONE).get(Milestone.ATTR_ID),
+ root.get(IssueQueryConstants.ATTR_STATE));
+
+ List<Predicate> milestonePredicates = new ArrayList<>();
+ for (Milestone milestone: milestones)
+ milestonePredicates.add(builder.equal(root.get(IssueQueryConstants.ATTR_MILESTONE), milestone));
+
+ criteriaQuery.where(builder.and(
+ builder.equal(root.get(IssueQueryConstants.ATTR_PROJECT), project),
+ builder.or(milestonePredicates.toArray(new Predicate[0]))));
+
+ return getSession().createQuery(criteriaQuery).getResultList();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
index 5d662b5987..5de7265073 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
@@ -1,33 +1,18 @@
package io.onedev.server.entitymanager.impl;
-import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.issue.IssueChangeEvent;
-import io.onedev.server.event.issue.IssueOpened;
-import io.onedev.server.issue.StateSpec;
-import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
-import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;
-import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -37,21 +22,14 @@ import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> implements MilestoneManager {
- private final SettingManager settingManager;
-
private final ProjectManager projectManager;
@Inject
- public DefaultMilestoneManager(Dao dao, SettingManager settingManager, ProjectManager projectManager) {
+ public DefaultMilestoneManager(Dao dao, ProjectManager projectManager) {
super(dao);
- this.settingManager = settingManager;
this.projectManager = projectManager;
}
- private GlobalIssueSetting getIssueSetting() {
- return settingManager.getIssueSetting();
- }
-
@Sessional
@Override
public Milestone find(String milestoneFQN) {
@@ -65,20 +43,10 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
@Transactional
@Override
- public void delete(Milestone milestone, @Nullable Milestone moveIssuesToMilestone) {
- if (moveIssuesToMilestone != null) {
- Query<?> query = getSession().createQuery("update Issue set milestone=:newMilestone where milestone=:milestone");
- query.setParameter("milestone", milestone);
- query.setParameter("newMilestone", moveIssuesToMilestone);
- query.executeUpdate();
- moveIssuesToMilestone.setNumOfIssuesDone(milestone.getNumOfIssuesDone()+moveIssuesToMilestone.getNumOfIssuesDone());
- moveIssuesToMilestone.setNumOfIssuesTodo(milestone.getNumOfIssuesTodo()+moveIssuesToMilestone.getNumOfIssuesTodo());
- save(moveIssuesToMilestone);
- } else {
- Query<?> query = getSession().createQuery("update Issue set milestone=null where milestone=:milestone");
- query.setParameter("milestone", milestone);
- query.executeUpdate();
- }
+ public void delete(Milestone milestone) {
+ Query<?> query = getSession().createQuery("update Issue set milestone=null where milestone=:milestone");
+ query.setParameter("milestone", milestone);
+ query.executeUpdate();
super.delete(milestone);
}
@@ -92,128 +60,6 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
return find(criteria);
}
- @Transactional
- @Override
- public void close(Milestone milestone, @Nullable Milestone moveOpenIssuesToMilestone) {
- List<String> criterias = new ArrayList<>();
- for (StateSpec state: getIssueSetting().getStateSpecs()) {
- if (!state.isDone())
- criterias.add("state='" + state.getName() + "'");
- }
- if (!criterias.isEmpty()) {
- String stateClause = "(" + StringUtils.join(criterias, " or ") + ")";
- if (moveOpenIssuesToMilestone != null) {
- Query<?> query = getSession().createQuery("update Issue set milestone=:newMilestone where milestone=:milestone and " + stateClause);
- query.setParameter("milestone", milestone);
- query.setParameter("newMilestone", moveOpenIssuesToMilestone);
- query.executeUpdate();
- moveOpenIssuesToMilestone.setNumOfIssuesTodo(moveOpenIssuesToMilestone.getNumOfIssuesTodo()+milestone.getNumOfIssuesTodo());
- milestone.setNumOfIssuesTodo(0);
- save(moveOpenIssuesToMilestone);
- } else {
- Query<?> query = getSession().createQuery("update Issue set milestone=null where milestone=:milestone and " + stateClause);
- query.setParameter("milestone", milestone);
- query.executeUpdate();
- milestone.setNumOfIssuesTodo(0);
- }
- }
- milestone.setClosed(true);
- save(milestone);
- }
-
- @Transactional
- @Listen
- public void on(IssueOpened event) {
- Issue issue = event.getIssue();
- Milestone milestone = issue.getMilestone();
- if (milestone != null) {
- StateSpec state = getIssueSetting().getStateSpec(issue.getState());
- Preconditions.checkNotNull(state);
- if (state.isDone())
- milestone.setNumOfIssuesDone(milestone.getNumOfIssuesDone()+1);
- else
- milestone.setNumOfIssuesTodo(milestone.getNumOfIssuesTodo()+1);
- save(milestone);
- }
- }
-
- @Transactional
- @Listen
- public void on(EntityRemoved event) {
- if (event.getEntity() instanceof Issue) {
- Issue issue = (Issue) event.getEntity();
- Milestone milestone = issue.getMilestone();
- if (milestone != null) {
- StateSpec state = getIssueSetting().getStateSpec(issue.getState());
- Preconditions.checkNotNull(state);
- if (state.isDone())
- milestone.setNumOfIssuesDone(milestone.getNumOfIssuesDone()-1);
- else
- milestone.setNumOfIssuesTodo(milestone.getNumOfIssuesTodo()-1);
- save(milestone);
- }
- }
- }
-
- private void onStateChange(Project project, @Nullable String milestoneName, String oldState, String newState) {
- Milestone milestone = project.getMilestone(milestoneName);
- if (milestone != null) {
- StateSpec oldStateSpec = getIssueSetting().getStateSpec(oldState);
- Preconditions.checkNotNull(oldStateSpec);
- StateSpec newStateSpec = getIssueSetting().getStateSpec(newState);
- Preconditions.checkNotNull(oldStateSpec);
- if (oldStateSpec.isDone() != newStateSpec.isDone()) {
- if (oldStateSpec.isDone()) {
- milestone.setNumOfIssuesDone(milestone.getNumOfIssuesDone()-1);
- milestone.setNumOfIssuesTodo(milestone.getNumOfIssuesTodo()+1);
- } else {
- milestone.setNumOfIssuesDone(milestone.getNumOfIssuesDone()+1);
- milestone.setNumOfIssuesTodo(milestone.getNumOfIssuesTodo()-1);
- }
- save(milestone);
- }
- }
- }
-
- private void onMilestoneChange(Project project, String state, @Nullable String oldMilestoneName, @Nullable String newMilestoneName) {
- Milestone oldMilestone = project.getMilestone(oldMilestoneName);
- Milestone newMilestone = project.getMilestone(newMilestoneName);
- StateSpec stateSpec = getIssueSetting().getStateSpec(state);
- Preconditions.checkNotNull(stateSpec);
- if (stateSpec.isDone()) {
- if (oldMilestone != null)
- oldMilestone.setNumOfIssuesDone(oldMilestone.getNumOfIssuesDone()-1);
- if (newMilestone != null)
- newMilestone.setNumOfIssuesDone(newMilestone.getNumOfIssuesDone()+1);
- } else {
- if (oldMilestone != null)
- oldMilestone.setNumOfIssuesTodo(oldMilestone.getNumOfIssuesTodo()-1);
- if (newMilestone != null)
- newMilestone.setNumOfIssuesTodo(newMilestone.getNumOfIssuesTodo()+1);
- }
- if (oldMilestone != null)
- save(oldMilestone);
- if (newMilestone != null)
- save(newMilestone);
- }
-
- @Transactional
- @Listen
- public void on(IssueChangeEvent event) {
- Project project = event.getIssue().getProject();
- if (event.getChange().getData() instanceof IssueBatchUpdateData) {
- IssueBatchUpdateData data = (IssueBatchUpdateData) event.getChange().getData();
- onStateChange(project, data.getOldMilestone(), data.getOldState(), data.getNewState());
- onMilestoneChange(project, data.getNewState(), data.getOldMilestone(), data.getNewMilestone());
- } else if (event.getChange().getData() instanceof IssueStateChangeData) {
- IssueStateChangeData data = (IssueStateChangeData) event.getChange().getData();
- onStateChange(project, event.getIssue().getMilestoneName(), data.getOldState(), data.getNewState());
- } else if (event.getChange().getData() instanceof IssueMilestoneChangeData) {
- IssueMilestoneChangeData data = (IssueMilestoneChangeData) event.getChange().getData();
- onMilestoneChange(project, event.getIssue().getState(), data.getOldMilestone(), data.getNewMilestone());
- }
- }
-
@Override
public List<Milestone> query() {
return query(true);
diff --git a/server-core/src/main/java/io/onedev/server/issue/StateSpec.java b/server-core/src/main/java/io/onedev/server/issue/StateSpec.java
index cfb8a1c211..ea73adf303 100644
--- a/server-core/src/main/java/io/onedev/server/issue/StateSpec.java
+++ b/server-core/src/main/java/io/onedev/server/issue/StateSpec.java
@@ -15,8 +15,6 @@ public class StateSpec implements Serializable {
private String name;
- private boolean done;
-
private String description;
private String color = "#0d87e9";
@@ -31,15 +29,6 @@ public class StateSpec implements Serializable {
this.name = name;
}
- @Editable(order=150, description="Check to indicate that issue in this state is considered done")
- public boolean isDone() {
- return done;
- }
-
- public void setDone(boolean done) {
- this.done = done;
- }
-
@Editable(order=200)
@NameOfEmptyValue("No description")
public String getDescription() {
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.java
index 6d69d03f42..9b8e922460 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
@@ -1427,4 +1427,30 @@ public class DataMigrator {
}
}
+ private void migrate35(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.elementTextTrim("key").equals("ISSUE")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ for (Element stateElement: valueElement.element("stateSpecs").elements()) {
+ stateElement.element("done").detach();
+ }
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Milestones.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ element.element("numOfIssuesTodo").detach();
+ element.element("numOfIssuesDone").detach();
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Milestone.java b/server-core/src/main/java/io/onedev/server/model/Milestone.java
index 81bb8e73e9..938f00f11e 100644
--- a/server-core/src/main/java/io/onedev/server/model/Milestone.java
+++ b/server-core/src/main/java/io/onedev/server/model/Milestone.java
@@ -3,6 +3,8 @@ package io.onedev.server.model;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -32,6 +34,8 @@ public class Milestone extends AbstractEntity {
private static final long serialVersionUID = 1L;
+ public static final String ATTR_ID = "id";
+
public static final String ATTR_NAME = "name";
public static final String ATTR_DUE_DATE = "dueDate";
@@ -48,10 +52,6 @@ public class Milestone extends AbstractEntity {
@Column(nullable=false)
private Date dueDate;
- private int numOfIssuesTodo;
-
- private int numOfIssuesDone;
-
private boolean closed;
@OneToMany(mappedBy="milestone")
@@ -107,22 +107,6 @@ public class Milestone extends AbstractEntity {
return closed?"Closed":"Open";
}
- public int getNumOfIssuesTodo() {
- return numOfIssuesTodo;
- }
-
- public void setNumOfIssuesTodo(int numOfIssuesTodo) {
- this.numOfIssuesTodo = numOfIssuesTodo;
- }
-
- public int getNumOfIssuesDone() {
- return numOfIssuesDone;
- }
-
- public void setNumOfIssuesDone(int numOfIssuesDone) {
- this.numOfIssuesDone = numOfIssuesDone;
- }
-
public Collection<Issue> getIssues() {
return issues;
}
@@ -131,4 +115,17 @@ public class Milestone extends AbstractEntity {
this.issues = issues;
}
+ public Map<String, Integer> getStateStats() {
+ Map<String, Integer> stateStats = new HashMap<>();
+ for (Issue issue: getIssues()) {
+ Integer count = stateStats.get(issue.getState());
+ if (count != null)
+ count++;
+ else
+ count = 1;
+ stateStats.put(issue.getState(), count);
+ }
+ return stateStats;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 58157bfc6e..a36434fc15 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -31,10 +31,7 @@ import io.onedev.server.issue.transitiontrigger.BuildSuccessfulTrigger;
import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.NamedIssueQuery;
-import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.search.entity.issue.OrIssueCriteria;
-import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.util.Usage;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;
@@ -204,7 +201,6 @@ public class GlobalIssueSetting implements Serializable {
StateSpec closed = new StateSpec();
closed.setColor("#5cb85c");
closed.setName("Closed");
- closed.setDone(true);
stateSpecs.add(closed);
@@ -536,15 +532,6 @@ public class GlobalIssueSetting implements Serializable {
throw new OneException("No any issue state is defined");
}
- public IssueCriteria getDoneCriteria(boolean done) {
- List<IssueCriteria> criterias = new ArrayList<>();
- for (StateSpec state: getStateSpecs()) {
- if (state.isDone() == done)
- criterias.add(new StateCriteria(state.getName()));
- }
- return new OrIssueCriteria(criterias);
- }
-
public List<BoardSpec> getDefaultBoardSpecs() {
return defaultBoardSpecs;
}
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.java
index 188293d206..0643469966 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
@@ -65,8 +65,12 @@ public class BuildQuery extends EntityQuery<Build> {
this.sorts = sorts;
}
+ public BuildQuery(@Nullable EntityCriteria<Build> criteria) {
+ this(criteria, new ArrayList<>());
+ }
+
public BuildQuery() {
- this(null, new ArrayList<>());
+ this(null);
}
public static BuildQuery parse(@Nullable Project project, @Nullable String queryString,
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index 0216c12e72..5591202475 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -59,8 +59,12 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
this.sorts = sorts;
}
+ public CodeCommentQuery(@Nullable EntityCriteria<CodeComment> criteria) {
+ this(criteria, new ArrayList<>());
+ }
+
public CodeCommentQuery() {
- this(null, new ArrayList<>());
+ this(null);
}
public static CodeCommentQuery parse(Project project, @Nullable String queryString) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 360e69eb94..77b8d152b5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -72,8 +72,12 @@ public class IssueQuery extends EntityQuery<Issue> {
this.sorts = sorts;
}
+ public IssueQuery(@Nullable IssueCriteria criteria) {
+ this(criteria, new ArrayList<>());
+ }
+
public IssueQuery() {
- this(null, new ArrayList<>());
+ this(null);
}
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index 4af6bee1c3..b389037b1b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -48,8 +48,12 @@ public class ProjectQuery extends EntityQuery<Project> {
this.sorts = sorts;
}
+ public ProjectQuery(@Nullable EntityCriteria<Project> criteria) {
+ this(criteria, new ArrayList<>());
+ }
+
public ProjectQuery() {
- this(null, new ArrayList<>());
+ this(null);
}
@Nullable
diff --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.java
index 0ff8a7bb8a..b300bd69e3 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
@@ -50,8 +50,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
this.sorts = sorts;
}
+ public PullRequestQuery(@Nullable EntityCriteria<PullRequest> criteria) {
+ this(criteria, new ArrayList<>());
+ }
+
public PullRequestQuery() {
- this(null, new ArrayList<>());
+ this(null);
}
public static PullRequestQuery parse(@Nullable Project project, @Nullable String queryString) {
diff --git a/server-core/src/main/java/io/onedev/server/util/MilestoneAndState.java b/server-core/src/main/java/io/onedev/server/util/MilestoneAndState.java
new file mode 100644
index 0000000000..3eaa48aeb9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/MilestoneAndState.java
@@ -0,0 +1,24 @@
+package io.onedev.server.util;
+
+import io.onedev.server.model.Milestone;
+
+public class MilestoneAndState extends Pair<Milestone, String> {
+
+ private final Long milestoneId;
+
+ private final String issueState;
+
+ public MilestoneAndState(Long milestoneId, String issueState) {
+ this.milestoneId = milestoneId;
+ this.issueState = issueState;
+ }
+
+ public Long getMilestoneId() {
+ return milestoneId;
+ }
+
+ public String getIssueState() {
+ return issueState;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 7af25758e1..1e3593ba93 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -35,6 +35,7 @@ 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.mapper.parameter.PageParameters;
import com.google.common.collect.Lists;
@@ -55,6 +56,7 @@ import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.SecurityUtils;
@@ -63,9 +65,10 @@ import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
+import io.onedev.server.web.component.issue.statestats.StateStatsBar;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.milestone.MilestoneStatusLabel;
import io.onedev.server.web.component.milestone.choice.MilestoneSingleChoice;
-import io.onedev.server.web.component.milestone.progress.MilestoneProgressBar;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.list.SimpleUserListLink;
@@ -305,14 +308,23 @@ public abstract class IssueSidePanel extends Panel {
Link<Void> link = new BookmarkablePageLink<Void>("link", MilestoneDetailPage.class,
MilestoneDetailPage.paramsOf(getIssue().getMilestone(), null));
link.add(new Label("label", getIssue().getMilestone().getName()));
- fragment.add(new MilestoneProgressBar("progress", new AbstractReadOnlyModel<Milestone>() {
+ fragment.add(new StateStatsBar("progress", new AbstractReadOnlyModel<Map<String, Integer>>() {
@Override
- public Milestone getObject() {
- return getIssue().getMilestone();
+ public Map<String, Integer> getObject() {
+ return getIssue().getMilestone().getStateStats();
}
- }));
+ }) {
+
+ @Override
+ protected Link<Void> newStateLink(String componentId, String state) {
+ String query = new IssueQuery(new StateCriteria(state)).toString();
+ PageParameters params = MilestoneDetailPage.paramsOf(getIssue().getMilestone(), query);
+ return new ViewStateAwarePageLink<Void>(componentId, MilestoneDetailPage.class, params);
+ }
+
+ });
fragment.add(link);
fragment.add(new MilestoneStatusLabel("status", new AbstractReadOnlyModel<Milestone>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.html b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.html
new file mode 100644
index 0000000000..8566cb6f27
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <div class="state-stats resize-aware"><a wicket:id="states">&nbsp;</a></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java
new file mode 100644
index 0000000000..8e48acb20f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsBar.java
@@ -0,0 +1,72 @@
+package io.onedev.server.web.component.issue.statestats;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.issue.StateSpec;
+
+@SuppressWarnings("serial")
+public abstract class StateStatsBar extends GenericPanel<Map<String, Integer>> {
+
+ public StateStatsBar(String id, IModel<Map<String, Integer>> model) {
+ super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ int totalCount = getModelObject().values().stream().collect(Collectors.summingInt(it->it));
+ if (totalCount != 0) {
+ RepeatingView statesView = new RepeatingView("states");
+ for (StateSpec state: OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpecs()) {
+ Integer count = getModelObject().get(state.getName());
+ if (count != null) {
+ Link<Void> link = newStateLink(statesView.newChildId(), state.getName());
+ link.add(AttributeAppender.append("title", count + " " + state.getName().toLowerCase() + " issues"));
+ link.add(AttributeAppender.append("data-percent", count*1.0/totalCount));
+ link.add(AttributeAppender.append("style", "background-color: " + state.getColor()));
+ statesView.add(link);
+ }
+ }
+ add(statesView);
+ } else {
+ add(new Label("states", "&nbsp;") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ }.setEscapeModelStrings(false));
+ add(AttributeAppender.append("title", "No issues in milestone"));
+ }
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract Link<Void> newStateLink(String componentId, String state);
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new StateStatsResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript(
+ String.format("onedev.server.stateStats.onDomReady('%s');", getMarkupId())));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsResourceReference.java
new file mode 100644
index 0000000000..ce76911fde
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/StateStatsResourceReference.java
@@ -0,0 +1,27 @@
+package io.onedev.server.web.component.issue.statestats;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class StateStatsResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public StateStatsResourceReference() {
+ super(StateStatsResourceReference.class, "state-stats.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ StateStatsResourceReference.class, "state-stats.css")));
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.css b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.css
new file mode 100644
index 0000000000..440efe695a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.css
@@ -0,0 +1,22 @@
+.state-stats {
+ white-space: nowrap;
+ min-width: 100px;
+}
+.state-stats>span {
+ display: inline-block;
+ border: 1px solid #BBB;
+ border-radius: 3px;
+}
+.state-stats>a {
+ display: inline-block;
+ text-decoration: none;
+}
+.state-stats>a:first-child {
+ border-radius: 3px 0 0 3px;
+}
+.state-stats>a:last-child {
+ border-radius: 0 3px 3px 0;
+}
+.state-stats>a:first-child:last-child {
+ border-radius: 3px;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.js b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.js
new file mode 100644
index 0000000000..cac1bf6671
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statestats/state-stats.js
@@ -0,0 +1,18 @@
+onedev.server.stateStats = {
+ onDomReady: function(containerId) {
+ var $stateStats = $("#" + containerId + ">.state-stats");
+ function calcWidth() {
+ $stateStats.children("a").width("auto").each(function() {
+ var totalWidth = $(this).parent().width();
+ var percent = $(this).data("percent");
+ var width = totalWidth*percent;
+ if (width < 4)
+ width = 4;
+ $(this).width(width);
+ });
+ $stateStats.children("span").outerWidth("100%");
+ }
+ $stateStats.on("resized", calcWidth);
+ calcWidth();
+ }
+};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.html
deleted file mode 100644
index d10b7dd46e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<wicket:panel>
- <form wicket:id="form" class="confirm-close-milestone no-autofocus">
- <div class="modal-header">
- <button wicket:id="close" type="button" class="close">&times;</button>
- <h4 wicket:id="title" id="modal-title" class="modal-title">
- Confirm Close Milestone
- </h4>
- </div>
- <div class="modal-body">
- <div wicket:id="editor"></div>
- </div>
- <div class="modal-footer clearfix">
- <input wicket:id="ok" type="submit" class="dirty-aware btn btn-primary" value="Ok"></input>
- <a wicket:id="cancel" class="btn btn-default">Cancel</a>
- </div>
- </form>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.java
deleted file mode 100644
index e618df4053..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithTodoIssuesPanel.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package io.onedev.server.web.component.milestone.closelink;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.MilestoneManager;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.project.issues.milestones.MilestoneCloseOption;
-
-@SuppressWarnings("serial")
-abstract class ConfirmCloseWithTodoIssuesPanel extends Panel {
-
- public ConfirmCloseWithTodoIssuesPanel(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
-
- form.add(new Label("title", "Confirm Closing Milestone '" + getMilestone().getName() + "'"));
-
- MilestoneCloseOption option = new MilestoneCloseOption();
- option.setMilestoneToClose(getMilestone().getName());
- form.add(BeanContext.edit("editor", option, Sets.newHashSet("milestoneToClose"), true));
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
- form.add(new AjaxButton("ok") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);
- if (option.isMoveTodoIssuesToAnotherMilestone()) {
- Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());
- Preconditions.checkNotNull(newMilestone);
- milestoneManager.close(getMilestone(), newMilestone);
- } else {
- milestoneManager.close(getMilestone(), null);
- }
- onMilestoneClosed(target);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- add(form);
- }
-
- protected abstract Milestone getMilestone();
-
- protected abstract void onClose(AjaxRequestTarget target);
-
- protected abstract void onMilestoneClosed(AjaxRequestTarget target);
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.html
deleted file mode 100644
index edabadfd6a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<wicket:panel>
- <div class="confirm-box">
- <div class="content">
- Do you really want to close milestone &quot;<span wicket:id="milestone"></span>&quot;?
- </div>
- <div class="actions">
- <a wicket:id="ok" class="btn btn-primary">Ok</a>
- <a wicket:id="cancel" class="btn btn-default">Cancel</a>
- </div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.java
deleted file mode 100644
index c77db7214b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutTodoIssuesPanel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.onedev.server.web.component.milestone.closelink;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.MilestoneManager;
-import io.onedev.server.model.Milestone;
-
-@SuppressWarnings("serial")
-abstract class ConfirmCloseWithoutTodoIssuesPanel extends Panel {
-
- public ConfirmCloseWithoutTodoIssuesPanel(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new Label("milestone", getMilestone().getName()));
- add(new AjaxLink<Void>("ok") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- OneDev.getInstance(MilestoneManager.class).close(getMilestone(), null);
- onMilestoneClosed(target);
- }
-
- });
- add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
-
- }
-
- protected abstract Milestone getMilestone();
-
- protected abstract void onClose(AjaxRequestTarget target);
-
- protected abstract void onMilestoneClosed(AjaxRequestTarget target);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java
deleted file mode 100644
index c48691133a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package io.onedev.server.web.component.milestone.closelink;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-
-@SuppressWarnings("serial")
-public abstract class MilestoneCloseLink extends ModalLink {
-
- public MilestoneCloseLink(String id) {
- super(id);
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- if (OneDev.getInstance(IssueManager.class).count(getMilestone(), false) != 0) {
- return new ConfirmCloseWithTodoIssuesPanel(id) {
-
- @Override
- protected Milestone getMilestone() {
- return MilestoneCloseLink.this.getMilestone();
- }
-
- @Override
- protected void onClose(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected void onMilestoneClosed(AjaxRequestTarget target) {
- modal.close();
- MilestoneCloseLink.this.onMilestoneClosed(target);
- }
-
- };
- } else {
- return new ConfirmCloseWithoutTodoIssuesPanel(id) {
-
- @Override
- protected Milestone getMilestone() {
- return MilestoneCloseLink.this.getMilestone();
- }
-
- @Override
- protected void onClose(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected void onMilestoneClosed(AjaxRequestTarget target) {
- modal.close();
- MilestoneCloseLink.this.onMilestoneClosed(target);
- }
-
- };
- }
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MilestoneCloseLinkCssResourceReference()));
- }
-
- protected abstract Milestone getMilestone();
-
- protected abstract void onMilestoneClosed(AjaxRequestTarget target);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLinkCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLinkCssResourceReference.java
deleted file mode 100644
index b93a60896b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLinkCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.milestone.closelink;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class MilestoneCloseLinkCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public MilestoneCloseLinkCssResourceReference() {
- super(MilestoneCloseLinkCssResourceReference.class, "milestone-close-link.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/milestone-close-link.css b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/milestone-close-link.css
deleted file mode 100644
index 1b8df18871..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/milestone-close-link.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.confirm-close-milestone .control-label {
- font-weight: normal;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.html
deleted file mode 100644
index 7d532aa701..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<wicket:panel>
- <form wicket:id="form" class="confirm-delete-milestone no-autofocus">
- <div class="modal-header">
- <button wicket:id="close" type="button" class="close">&times;</button>
- <h4 wicket:id="title" id="modal-title" class="modal-title">
- Confirm Delete Milestone
- </h4>
- </div>
- <div class="modal-body">
- <div wicket:id="editor"></div>
- </div>
- <div class="modal-footer clearfix">
- <input wicket:id="ok" type="submit" class="dirty-aware btn btn-primary" value="Ok"></input>
- <a wicket:id="cancel" class="btn btn-default">Cancel</a>
- </div>
- </form>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.java
deleted file mode 100644
index b1ad6a4df9..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package io.onedev.server.web.component.milestone.deletelink;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.MilestoneManager;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.project.issues.milestones.MilestoneDeleteOption;
-
-@SuppressWarnings("serial")
-abstract class ConfirmDeleteWithIssuesPanel extends Panel {
-
- public ConfirmDeleteWithIssuesPanel(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
-
- form.add(new Label("title", "Confirm Deleting Milestone '" + getMilestone().getName() + "'"));
-
- MilestoneDeleteOption option = new MilestoneDeleteOption();
- option.setMilestoneToDelete(getMilestone().getName());
- form.add(BeanContext.edit("editor", option, Sets.newHashSet("milestoneToDelete"), true));
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
- form.add(new AjaxButton("ok") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);
- if (option.isMoveIssuesToAnotherMilestone()) {
- Milestone newMilestone = milestoneManager.find(getMilestone().getProject(), option.getNewMilestone());
- Preconditions.checkNotNull(newMilestone);
- milestoneManager.delete(getMilestone(), newMilestone);
- } else {
- milestoneManager.delete(getMilestone(), null);
- }
- onMilestoneDeleted(target);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- add(form);
- }
-
- protected abstract Milestone getMilestone();
-
- protected abstract void onClose(AjaxRequestTarget target);
-
- protected abstract void onMilestoneDeleted(AjaxRequestTarget target);
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.html
deleted file mode 100644
index 921669b06a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<wicket:panel>
- <div class="confirm-box">
- <div class="content">
- Do you really want to delete milestone &quot;<span wicket:id="milestone"></span>&quot;?
- </div>
- <div class="actions">
- <a wicket:id="ok" class="btn btn-primary">Ok</a>
- <a wicket:id="cancel" class="btn btn-default">Cancel</a>
- </div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.java
deleted file mode 100644
index b89a0740e5..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.onedev.server.web.component.milestone.deletelink;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.MilestoneManager;
-import io.onedev.server.model.Milestone;
-
-@SuppressWarnings("serial")
-abstract class ConfirmDeleteWithoutIssuesPanel extends Panel {
-
- public ConfirmDeleteWithoutIssuesPanel(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new Label("milestone", getMilestone().getName()));
- add(new AjaxLink<Void>("ok") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- OneDev.getInstance(MilestoneManager.class).delete(getMilestone(), null);
- onMilestoneDeleted(target);
- }
-
- });
- add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
-
- }
-
- protected abstract Milestone getMilestone();
-
- protected abstract void onClose(AjaxRequestTarget target);
-
- protected abstract void onMilestoneDeleted(AjaxRequestTarget target);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java
deleted file mode 100644
index a876f53ff4..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package io.onedev.server.web.component.milestone.deletelink;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.web.component.milestone.closelink.MilestoneCloseLinkCssResourceReference;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-
-@SuppressWarnings("serial")
-public abstract class MilestoneDeleteLink extends ModalLink {
-
- public MilestoneDeleteLink(String id) {
- super(id);
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- if (OneDev.getInstance(IssueManager.class).count(getMilestone(), null) != 0) {
- return new ConfirmDeleteWithIssuesPanel(id) {
-
- @Override
- protected Milestone getMilestone() {
- return MilestoneDeleteLink.this.getMilestone();
- }
-
- @Override
- protected void onClose(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected void onMilestoneDeleted(AjaxRequestTarget target) {
- modal.close();
- MilestoneDeleteLink.this.onMilestoneDeleted(target);
- }
-
- };
- } else {
- return new ConfirmDeleteWithoutIssuesPanel(id) {
-
- @Override
- protected Milestone getMilestone() {
- return MilestoneDeleteLink.this.getMilestone();
- }
-
- @Override
- protected void onClose(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected void onMilestoneDeleted(AjaxRequestTarget target) {
- modal.close();
- MilestoneDeleteLink.this.onMilestoneDeleted(target);
- }
-
- };
- }
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MilestoneCloseLinkCssResourceReference()));
- }
-
- protected abstract Milestone getMilestone();
-
- protected abstract void onMilestoneDeleted(AjaxRequestTarget target);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLinkCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLinkCssResourceReference.java
deleted file mode 100644
index 7a241ee911..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLinkCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.milestone.deletelink;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class MilestoneDeleteLinkCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public MilestoneDeleteLinkCssResourceReference() {
- super(MilestoneDeleteLinkCssResourceReference.class, "milestone-delete-link.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/milestone-delete-link.css b/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/milestone-delete-link.css
deleted file mode 100644
index cceedafc07..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/deletelink/milestone-delete-link.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.confirm-delete-milestone .control-label {
- font-weight: normal;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressBar.html b/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressBar.html
deleted file mode 100644
index 1ff04bbf05..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressBar.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:panel>
- <div wicket:id="outer" class="progress milestone-progress">
- <div wicket:id="inner" class="progress-bar"></div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressBar.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressBar.java
deleted file mode 100644
index 1380d1533b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressBar.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.onedev.server.web.component.milestone.progress;
-
-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.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.model.Milestone;
-
-@SuppressWarnings("serial")
-public class MilestoneProgressBar extends GenericPanel<Milestone> {
-
- public MilestoneProgressBar(String id, IModel<Milestone> model) {
- super(id, model);
- }
-
- private Milestone getMilestone() {
- return getModelObject();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- int progress;
- int totalIssues = getMilestone().getNumOfIssuesTodo()+getMilestone().getNumOfIssuesDone();
- if (totalIssues != 0)
- progress = 100 * getMilestone().getNumOfIssuesDone() / totalIssues;
- else
- progress = 0;
- if (progress > 100)
- progress = 100;
-
- WebMarkupContainer outer = new WebMarkupContainer("outer");
- outer.add(AttributeAppender.append("title", progress + "% completed"));
- add(outer);
-
- outer.add(new WebMarkupContainer("inner")
- .add(AttributeAppender.append("style", "width: " + progress + "%;")));
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MilestoneProgressResourceReference()));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressResourceReference.java
deleted file mode 100644
index 7d30a707d1..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/MilestoneProgressResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.milestone.progress;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class MilestoneProgressResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public MilestoneProgressResourceReference() {
- super(MilestoneProgressResourceReference.class, "milestone-progress.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/milestone-progress.css b/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/milestone-progress.css
deleted file mode 100644
index 274c406a91..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/progress/milestone-progress.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.milestone-progress {
- border: 1px solid #5cb85c;
- box-shadow: 0;
- margin-bottom: 0;
- background: white;
-}
-.milestone-progress .progress-bar {
- background: #5cb85c;
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
index 10318261ce..d630e0045b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
@@ -50,7 +50,8 @@ public abstract class SideInfoPanel extends Panel {
+ " if (!onedev.server.util.isDevice()) "
+ " $(this).data('ps').update();"
+ " }"
- + "});", getMarkupId());
+ + "});"
+ + "$(window).resize();", getMarkupId());
moreInfoSideOpened.getHandler().appendJavaScript(script);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java
index e1fdf9ad4d..30965fa7df 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java
@@ -40,7 +40,6 @@ import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.util.TextUtils;
@SuppressWarnings("serial")
public class IssueStateListPage extends IssueSettingPage {
@@ -113,23 +112,6 @@ public class IssueStateListPage extends IssueSettingPage {
}
});
- columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Done")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
- StateSpec state = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, state) {
-
- @Override
- protected Component newLabel(String componentId) {
- return new Label(componentId, TextUtils.describe(state.isDone()));
- }
-
- });
- }
-
- });
-
columns.add(new AbstractColumn<StateSpec, Void>(Model.of("Color")) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index f3ba308084..c93b8e412c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -680,6 +680,10 @@ onedev.server = {
},
onDomReady: function() {
+ $(window).resize(function() {
+ $(document).find(".resize-aware").trigger("resized");
+ });
+
onedev.server.setupAjaxLoadingIndicator();
onedev.server.form.setupDirtyCheck();
onedev.server.focus.setupAutoFocus();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index 804e4d925f..b808359bfb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -10,6 +10,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -47,6 +48,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmListener;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
@@ -55,8 +57,6 @@ import io.onedev.server.web.component.issue.board.BoardEditPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.milestone.MilestoneDueLabel;
import io.onedev.server.web.component.milestone.MilestoneStatusLabel;
-import io.onedev.server.web.component.milestone.closelink.MilestoneCloseLink;
-import io.onedev.server.web.component.milestone.deletelink.MilestoneDeleteLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
@@ -200,7 +200,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
@Override
protected Milestone load() {
if (milestoneId != null)
- return OneDev.getInstance(MilestoneManager.class).load(milestoneId);
+ return getMilestoneManager().load(milestoneId);
else
return null;
}
@@ -212,6 +212,10 @@ public class IssueBoardsPage extends ProjectIssuesPage {
backlogQuery = params.get(PARAM_BACKLOG_QUERY).toString();
}
+ private MilestoneManager getMilestoneManager() {
+ return OneDev.getInstance(MilestoneManager.class);
+ }
+
private List<Milestone> getMilestones() {
List<Milestone> milestones = new ArrayList<>(getProject().getMilestones());
Collections.sort(milestones, new Comparator<Milestone>() {
@@ -472,41 +476,31 @@ public class IssueBoardsPage extends ProjectIssuesPage {
};
item.add(actions);
- actions.add(new MilestoneCloseLink("close") {
+ actions.add(new AjaxLink<Void>("close") {
@Override
public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
+ Milestone milestone = item.getModelObject();
+ milestone.setClosed(true);
+ getMilestoneManager().save(milestone);
dropdown.close();
}
- @Override
- protected Milestone getMilestone() {
- return item.getModelObject();
- }
-
@Override
protected void onConfigure() {
super.onConfigure();
setVisible(!item.getModelObject().isClosed());
}
- @Override
- protected void onMilestoneClosed(AjaxRequestTarget target) {
- setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(
- getProject(), getBoard(), null, backlog, query, backlogQuery));
- }
-
});
actions.add(new AjaxLink<Void>("reopen") {
@Override
public void onClick(AjaxRequestTarget target) {
- Milestone milestone = getMilestone();
+ Milestone milestone = item.getModelObject();
milestone.setClosed(false);
- OneDev.getInstance(MilestoneManager.class).save(milestone);
- setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(
- getProject(), getBoard(), null, backlog, query, backlogQuery));
+ getMilestoneManager().save(milestone);
+ dropdown.close();
}
@Override
@@ -520,35 +514,32 @@ public class IssueBoardsPage extends ProjectIssuesPage {
@Override
public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
dropdown.close();
}
});
- actions.add(new MilestoneDeleteLink("delete") {
+ actions.add(new AjaxLink<Void>("delete") {
@Override
- public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
- dropdown.close();
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmListener(
+ "Do you really want to delete milestone '" + item.getModelObject().getName() + "'?"));
}
-
+
@Override
- protected Milestone getMilestone() {
- return item.getModelObject();
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Milestone milestone = item.getModelObject();
+ if (milestone.equals(IssueBoardsPage.this.getMilestone())) {
+ getMilestoneManager().delete(milestone);
+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(
+ getProject(), getBoard(), null, backlog, query, backlogQuery));
+ } else {
+ getMilestoneManager().delete(milestone);
+ }
}
- @Override
- protected void onMilestoneDeleted(AjaxRequestTarget target) {
- Milestone nextMilestone;
- if (item.getModelObject().equals(IssueBoardsPage.this.getMilestone()))
- nextMilestone = null;
- else
- nextMilestone = IssueBoardsPage.this.getMilestone();
- setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(
- getProject(), getBoard(), nextMilestone, backlog, query, backlogQuery));
- }
-
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.html
deleted file mode 100644
index af22528876..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<wicket:panel>
- <div class="issue-stats clearfix">
- <div class="text">
- <a wicket:id="open"><span wicket:id="count"></span></a>
- <a wicket:id="closed"><span wicket:id="count"></span></a>
- </div >
- <div wicket:id="progress" class="progress"></div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java
deleted file mode 100644
index a1f784c521..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.onedev.server.web.page.project.issues.milestones;
-
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.search.entity.issue.IssueCriteria;
-import io.onedev.server.web.component.milestone.progress.MilestoneProgressBar;
-
-@SuppressWarnings("serial")
-class IssueStatsPanel extends GenericPanel<Milestone> {
-
- public IssueStatsPanel(String id, IModel<Milestone> model) {
- super(id, model);
- }
-
- private Milestone getMilestone() {
- return getModelObject();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new MilestoneProgressBar("progress", getModel()));
-
- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- IssueCriteria todoCriteria = issueSetting.getDoneCriteria(false);
- Link<Void> link = new BookmarkablePageLink<Void>("open", MilestoneDetailPage.class,
- MilestoneDetailPage.paramsOf(getMilestone(), todoCriteria.toString()));
- link.add(new Label("count", getMilestone().getNumOfIssuesTodo() + " todo"));
- add(link);
-
- IssueCriteria doneCriteria = issueSetting.getDoneCriteria(true);
- link = new BookmarkablePageLink<Void>("closed", MilestoneDetailPage.class,
- MilestoneDetailPage.paramsOf(getMilestone(), doneCriteria.toString()));
- link.add(new Label("count", getMilestone().getNumOfIssuesDone() + " done"));
- add(link);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java
index d218a72592..67b90480ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.page.project.issues.milestones;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.GenericPanel;
@@ -9,8 +10,7 @@ import org.apache.wicket.model.IModel;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.model.Milestone;
-import io.onedev.server.web.component.milestone.closelink.MilestoneCloseLink;
-import io.onedev.server.web.component.milestone.deletelink.MilestoneDeleteLink;
+import io.onedev.server.web.ajaxlistener.ConfirmListener;
@SuppressWarnings("serial")
abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {
@@ -31,9 +31,8 @@ abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {
@Override
public void onClick(AjaxRequestTarget target) {
- Milestone milestone = getMilestone();
- milestone.setClosed(false);
- OneDev.getInstance(MilestoneManager.class).save(milestone);
+ getMilestone().setClosed(false);
+ getMilestoneManager().save(getMilestone());
target.add(MilestoneActionsPanel.this);
onUpdated(target);
}
@@ -46,7 +45,7 @@ abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {
});
- add(new MilestoneCloseLink("close") {
+ add(new AjaxLink<Void>("close") {
@Override
protected void onConfigure() {
@@ -55,37 +54,41 @@ abstract class MilestoneActionsPanel extends GenericPanel<Milestone> {
}
@Override
- protected Milestone getMilestone() {
- return MilestoneActionsPanel.this.getMilestone();
- }
-
- @Override
- protected void onMilestoneClosed(AjaxRequestTarget target) {
+ public void onClick(AjaxRequestTarget target) {
+ getMilestone().setClosed(true);
+ getMilestoneManager().save(getMilestone());
target.add(MilestoneActionsPanel.this);
onUpdated(target);
}
-
+
});
add(new BookmarkablePageLink<Void>("edit", MilestoneEditPage.class,
MilestoneEditPage.paramsOf(getMilestone())));
- add(new MilestoneDeleteLink("delete") {
+ add(new AjaxLink<Void>("delete") {
@Override
- protected Milestone getMilestone() {
- return MilestoneActionsPanel.this.getMilestone();
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmListener(
+ "Do you really want to delete milestone '" + getMilestone().getName() + "'?"));
}
-
+
@Override
- protected void onMilestoneDeleted(AjaxRequestTarget target) {
+ public void onClick(AjaxRequestTarget target) {
+ getMilestoneManager().delete(getMilestone());
target.add(MilestoneActionsPanel.this);
onDeleted(target);
}
-
+
});
setOutputMarkupId(true);
}
+
+ private MilestoneManager getMilestoneManager() {
+ return OneDev.getInstance(MilestoneManager.class);
+ }
protected abstract void onDeleted(AjaxRequestTarget target);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
index 66a21c68de..dd60e7963a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.page.project.issues.milestones;
import java.util.ArrayList;
+import java.util.Map;
import javax.annotation.Nullable;
@@ -8,6 +9,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -18,9 +20,12 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.MilestoneCriteria;
+import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.issue.list.IssueListPanel;
+import io.onedev.server.web.component.issue.statestats.StateStatsBar;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.milestone.MilestoneDueLabel;
import io.onedev.server.web.component.milestone.MilestoneStatusLabel;
import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
@@ -99,7 +104,23 @@ public class MilestoneDetailPage extends ProjectIssuesPage {
});
- add(new IssueStatsPanel("issueStats", milestoneModel));
+ add(new StateStatsBar("issueStats", new LoadableDetachableModel<Map<String, Integer>>() {
+
+ @Override
+ protected Map<String, Integer> load() {
+ return getMilestone().getStateStats();
+ }
+
+ }) {
+
+ @Override
+ protected Link<Void> newStateLink(String componentId, String state) {
+ String query = new IssueQuery(new StateCriteria(state)).toString();
+ PageParameters params = MilestoneDetailPage.paramsOf(getMilestone(), query);
+ return new ViewStateAwarePageLink<Void>(componentId, MilestoneDetailPage.class, params);
+ }
+
+ });
PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html
index a18d6972fd..ea83e4ec13 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html
@@ -18,6 +18,9 @@
<table wicket:id="milestones" class="table"></table>
</div>
</div>
+ <wicket:fragment wicket:id="issueStatsFrag">
+ <div wicket:id="content"></div>
+ </wicket:fragment>
<wicket:fragment wicket:id="nameFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
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.java
index 4fee89ed83..e68027d35d 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
@@ -1,8 +1,11 @@
package io.onedev.server.web.page.project.issues.milestones;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.annotation.Nullable;
@@ -11,6 +14,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
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.util.SortableDataProvider;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -28,17 +32,23 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.criterion.Restrictions;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.StateCriteria;
+import io.onedev.server.util.MilestoneAndState;
import io.onedev.server.util.MilestoneSort;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.issue.statestats.StateStatsBar;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.milestone.MilestoneDueLabel;
@@ -58,7 +68,22 @@ public class MilestoneListPage extends ProjectIssuesPage {
private final MilestoneSort sort;
- private Component milestonesTable;
+ private final IModel<Collection<MilestoneAndState>> milestoneAndStatesModel =
+ new LoadableDetachableModel<Collection<MilestoneAndState>>() {
+
+ @Override
+ protected Collection<MilestoneAndState> 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);
+ }
+
+ };
+
+ private DataTable<Milestone, Void> milestonesTable;
private EntityCriteria<Milestone> getCriteria(boolean closed) {
EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);
@@ -150,6 +175,11 @@ public class MilestoneListPage extends ProjectIssuesPage {
columns.add(new AbstractColumn<Milestone, Void>(Model.of("Name")) {
+ @Override
+ public String getCssClass() {
+ return "name";
+ }
+
@Override
public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,
IModel<Milestone> rowModel) {
@@ -165,6 +195,11 @@ public class MilestoneListPage extends ProjectIssuesPage {
columns.add(new AbstractColumn<Milestone, Void>(Model.of("Due Date")) {
+ @Override
+ public String getCssClass() {
+ return "due-date";
+ }
+
@Override
public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,
IModel<Milestone> rowModel) {
@@ -173,26 +208,67 @@ public class MilestoneListPage extends ProjectIssuesPage {
});
- columns.add(new AbstractColumn<Milestone, Void>(Model.of("Issues")) {
+ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Issue Stats")) {
@Override
public String getCssClass() {
- return "issues";
+ return "issue-stats";
}
-
+
@Override
- public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,
+ public void populateItem(Item<ICellPopulator<Milestone>> cellItem, String componentId,
IModel<Milestone> rowModel) {
- cellItem.add(new IssueStatsPanel(componentId, rowModel));
+ Fragment fragment = new Fragment(componentId, "issueStatsFrag", MilestoneListPage.this) {
+
+ @Override
+ protected void onBeforeRender() {
+ /*
+ * Create StateStatsBar here as it requires to access the milestoneAndStatsModel which can
+ * only be calculated correctly after the milestone table is initialized
+ */
+ addOrReplace(new StateStatsBar("content", new LoadableDetachableModel<Map<String, Integer>>() {
+
+ @Override
+ protected Map<String, Integer> load() {
+ Map<String, Integer> stateStats = new HashMap<>();
+ for (MilestoneAndState milestoneAndState: milestoneAndStatesModel.getObject()) {
+ if (milestoneAndState.getMilestoneId().equals(rowModel.getObject().getId())) {
+ Integer count = stateStats.get(milestoneAndState.getIssueState());
+ if (count != null)
+ count ++;
+ else
+ count = 1;
+ stateStats.put(milestoneAndState.getIssueState(), count);
+ }
+ }
+ return stateStats;
+ }
+
+ }) {
+
+ @Override
+ protected Link<Void> newStateLink(String componentId, String state) {
+ String query = new IssueQuery(new StateCriteria(state)).toString();
+ PageParameters params = MilestoneDetailPage.paramsOf(rowModel.getObject(), query);
+ return new ViewStateAwarePageLink<Void>(componentId, MilestoneDetailPage.class, params);
+ }
+
+ });
+ super.onBeforeRender();
+ }
+
+ };
+ cellItem.add(fragment);
}
+
});
if (SecurityUtils.canManage(getProject())) {
- columns.add(new AbstractColumn<Milestone, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<Milestone, Void>(Model.of("Actions")) {
@Override
public String getCssClass() {
- return "";
+ return "expanded actions";
}
@Override
@@ -265,6 +341,12 @@ public class MilestoneListPage extends ProjectIssuesPage {
milestonesTable.setOutputMarkupId(true);
}
+ @Override
+ protected void onDetach() {
+ milestoneAndStatesModel.detach();
+ super.onDetach();
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css
index 7abe42735b..d282679c74 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css
@@ -4,22 +4,19 @@
#milestone-list>.head>.pull-left {
margin-right: 20px;
}
-#milestone-list>.body tbody .actions {
- white-space: nowrap;
+#milestone-list table {
+ table-layout: fixed;
}
-.issue-stats>.progress {
- float: left;
- width: 200px;
- margin-bottom: 0;
+#milestone-list>.body tbody td.issue-stats {
+ padding-right: 20px;
}
-.issue-stats>.text {
- float: left;
- margin-right: 16px;
- margin-bottom: 4px;
+
+#milestone-list>.body tbody td.actions {
+ white-space: nowrap;
}
-.issue-stats>.text a:first-child {
- margin-right: 8px;
+#milestone-list>.body tbody td.issue-stats .state-stats {
}
+
.milestone-sort.active:before {
font-family: "FontAwesome";
content: "\f00c";
@@ -42,9 +39,8 @@
#milestone-detail>.title>.name {
margin-right: 10px;
}
-#milestone-detail>.title>.status {
- font-size: 16px;
- margin-top: -2px;
+#milestone-detail>.title .state-stats {
+ width: 300px;
}
#milestone-detail>.title .due, #milestone-detail>.title a {
font-weight: normal;
@@ -56,7 +52,7 @@
padding: 20px;
}
@media(max-width: 767px) {
- #milestone-list>.body .actions {
+ #milestone-list>.body .expanded {
display: none;
}
}
\ No newline at end of file