The Unified and Autonomous Development Platform
feat: Able to filter milestones in issue board (OD-1955)
Robin Shen7539a767fb8a
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.javaindex b70e2dbec3..878f3dd8ae 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@@ -15,9 +15,6 @@ public interface MilestoneManager extends EntityManager<Milestone> {Milestone findInHierarchy(String milestoneFQN);- @Nullable- Milestone findNextOpen(Project project);-void createOrUpdate(Milestone milestone);}\ No newline at end of filediff --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.javaindex 54e43a4530..c5f1e9e6e8 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@@ -10,7 +10,6 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;-import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import javax.inject.Inject;@@ -65,16 +64,6 @@ public class DefaultMilestoneManager extends BaseEntityManager<Milestone> implemreturn count(true);}- @Sessional- @Override- public Milestone findNextOpen(Project project) {- EntityCriteria<Milestone> criteria = EntityCriteria.of(Milestone.class);- criteria.add(Restrictions.in("project", project.getSelfAndAncestors()));- criteria.add(Restrictions.eq(Milestone.PROP_CLOSED, false));- criteria.addOrder(Order.asc(Milestone.PROP_DUE_DATE));- return find(criteria);- }-@Transactional@Overridepublic void createOrUpdate(Milestone milestone) {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.javaindex 126f960ea6..698f278a65 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@@ -25,15 +25,13 @@ public class Milestone extends AbstractEntity {public static final String PROP_NAME = "name";- public static final String PROP_TYPE = "type";-public static final String PROP_START_DATE = "startDate";public static final String PROP_DUE_DATE = "dueDate";public static final String PROP_CLOSED = "closed";- public static final String NONE = "none";+ public static final String NONE = "[none]";@ManyToOne@JoinColumn(nullable=false)diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 88110a721e..3e43d5e09f 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -411,7 +411,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelprivate transient Optional<CommitQueryPersonalization> commitQueryPersonalizationOfCurrentUserHolder;- private transient List<Milestone> sortedMilestones;+ private transient List<Milestone> sortedHierarchyMilestones;private transient Optional<String> activeServer;@@ -1299,11 +1299,11 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel}public List<Milestone> getSortedHierarchyMilestones() {- if (sortedMilestones == null) {- sortedMilestones = new ArrayList<>(getHierarchyMilestones());- Collections.sort(sortedMilestones, new Milestone.DatesAndStatusComparator());+ if (sortedHierarchyMilestones == null) {+ sortedHierarchyMilestones = new ArrayList<>(getHierarchyMilestones());+ sortedHierarchyMilestones.sort(new Milestone.DatesAndStatusComparator());}- return sortedMilestones;+ return sortedHierarchyMilestones;}@Editablediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 524cba1f15..48a02fcdd7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -61,6 +61,8 @@ public class BoardSpec implements Serializable {private List<String> columns = new ArrayList<>();+ private String milestonePrefix;+private List<String> displayFields = Lists.newArrayList(Issue.NAME_STATE, IssueSchedule.NAME_MILESTONE);private List<String> displayLinks = new ArrayList<>();@@ -150,6 +152,17 @@ public class BoardSpec implements Serializable {return displayColumns;}+ @Editable(order=450, description = "" ++ "If specified, OneDev will only display milestones with this prefix, and the prefix will be stripped " ++ "for brevity. Also milestones created from this board will get this prefix automatically")+ public String getMilestonePrefix() {+ return milestonePrefix;+ }++ public void setMilestonePrefix(String milestonePrefix) {+ this.milestonePrefix = milestonePrefix;+ }+@Editable(order=500, placeholder="Not displaying any fields", description="Specify fields to display in board card")@ChoiceProvider("getDisplayFieldChoices")public List<String> getDisplayFields() {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.javaindex 1b8a1c1e5e..74447ba21f 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@@ -62,9 +62,9 @@ import javax.annotation.Nullable;import java.io.Serializable;import java.util.Date;import java.util.List;-import java.util.stream.Collectors;import static io.onedev.server.model.Issue.NAME_BOARD_POSITION;+import static java.util.stream.Collectors.toList;@SuppressWarnings("serial")public class IssueBoardsPage extends ProjectIssuesPage {@@ -176,21 +176,21 @@ public class IssueBoardsPage extends ProjectIssuesPage {Milestone milestone;String milestoneName = params.get(PARAM_MILESTONE).toString();if (milestoneName != null) {- if (milestoneName.equals(Milestone.NONE)) {+ if (milestoneName.equals(Milestone.NONE) || getBoard().getMilestonePrefix() != null && !milestoneName.startsWith(getBoard().getMilestonePrefix())) {milestone = null;} else {milestone = getProject().getHierarchyMilestone(milestoneName);if (milestone == null)throw new ExplicitException("Can not find milestone: " + milestoneName);}- } else if (!getProject().getSortedHierarchyMilestones().isEmpty()) {- milestone = getProject().getSortedHierarchyMilestones().iterator().next();+ } else if (!getMilestones().isEmpty()) {+ milestone = getMilestones().iterator().next();} else {milestone = null;}Long milestoneId = Milestone.idOf(milestone);- milestoneModel = new LoadableDetachableModel<Milestone>() {+ milestoneModel = new LoadableDetachableModel<>() {@Overrideprotected Milestone load() {@@ -199,7 +199,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {elsereturn null;}-+};backlog = params.get(PARAM_BACKLOG).toBoolean() && getMilestone() != null;@@ -449,24 +449,24 @@ public class IssueBoardsPage extends ProjectIssuesPage {if (SecurityUtils.canManageProject(getProject()))menuFragment.add(AttributeAppender.append("class", "administrative"));- menuFragment.add(new ListView<Milestone>("milestones", new LoadableDetachableModel<List<Milestone>>() {+ menuFragment.add(new ListView<Milestone>("milestones", new LoadableDetachableModel<>() {@Overrideprotected List<Milestone> load() {- List<Milestone> milestones = getProject().getSortedHierarchyMilestones()+ List<Milestone> milestones = getMilestones().stream()- .filter(it->!it.isClosed())- .collect(Collectors.toList());+ .filter(it -> !it.isClosed())+ .collect(toList());if (getMilestone() != null && getMilestone().isClosed() || showClosed) {- List<Milestone> closedMilestones = getProject().getSortedHierarchyMilestones()+ List<Milestone> closedMilestones = getMilestones().stream()- .filter(it->it.isClosed())- .collect(Collectors.toList());+ .filter(it -> it.isClosed())+ .collect(toList());milestones.addAll(closedMilestones);}return milestones;}-+}) {private void toggleClose(Milestone milestone) {@@ -539,8 +539,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {});- var bean = new MilestoneEditBean();- bean.readFrom(item.getModelObject());+ var bean = MilestoneEditBean.of(item.getModelObject(), getBoard().getMilestonePrefix());fragment.add(new AjaxLink<Void>("edit") {@Override@@ -552,7 +551,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overrideprotected void onSave(AjaxRequestTarget target, MilestoneEditBean bean) {var milestone = item.getModelObject();- bean.writeTo(milestone);+ bean.update(milestone);getMilestoneManager().createOrUpdate(milestone);setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(), milestone, backlog, queryString,@@ -615,7 +614,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {protected void onConfigure() {super.onConfigure();setVisible(!showClosed && (getMilestone() == null || !getMilestone().isClosed())- && getProject().getHierarchyMilestones().stream().anyMatch(it->it.isClosed()));+ && getMilestones().stream().anyMatch(Milestone::isClosed));}});@@ -637,14 +636,14 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overridepublic void onClick(AjaxRequestTarget target) {dropdown.close();- var bean = new MilestoneEditBean();+ var bean = MilestoneEditBean.ofNew(getProject(), getBoard().getMilestonePrefix());new BeanEditModalPanel<>(target, bean, "Create Milestone") {@Overrideprotected void onSave(AjaxRequestTarget target, MilestoneEditBean bean) {var milestone = new Milestone();milestone.setProject(getProject());- bean.writeTo(milestone);+ bean.update(milestone);getMilestoneManager().createOrUpdate(milestone);setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(), milestone, backlog, queryString,@@ -666,7 +665,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {});- queryInput = new TextField<String>("input", new IModel<String>() {+ queryInput = new TextField<String>("input", new IModel<>() {@Overridepublic void detach() {@@ -674,7 +673,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {@Overridepublic String getObject() {- return backlog?backlogQueryString:queryString;+ return backlog ? backlogQueryString : queryString;}@Override@@ -684,7 +683,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {elsequeryString = object;}-+});IssueQueryParseOption option = new IssueQueryParseOption()@@ -833,6 +832,12 @@ public class IssueBoardsPage extends ProjectIssuesPage {target.add(contentFrag);}+ private List<Milestone> getMilestones() {+ return getProject().getSortedHierarchyMilestones().stream()+ .filter(it -> getBoard().getMilestonePrefix() == null || it.getName().startsWith(getBoard().getMilestonePrefix()))+ .collect(toList());+ }+public static PageParameters paramsOf(Project project, @Nullable BoardSpec board,@Nullable Milestone milestone, boolean backlog, @Nullable String query,@Nullable String backlogQuery) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javaindex 9b12d989d3..a4dd2296f3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -50,8 +50,7 @@ public class MilestoneEditPage extends ProjectPage {protected void onInitialize() {super.onInitialize();- var bean = new MilestoneEditBean();- bean.readFrom(getMilestone());+ var bean = MilestoneEditBean.of(getMilestone(), "");BeanEditor editor = BeanContext.edit("editor", bean);Form<?> form = new Form<Void>("form") {@@ -59,7 +58,7 @@ public class MilestoneEditPage extends ProjectPage {protected void onSubmit() {super.onSubmit();- bean.writeTo(getMilestone());+ bean.update(getMilestone());OneDev.getInstance(MilestoneManager.class).createOrUpdate(getMilestone());Session.get().success("Milestone saved");setResponsePage(MilestoneIssuesPage.class,diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javaindex 61b4484220..4ecf588403 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -29,7 +29,7 @@ public class NewMilestonePage extends ProjectPage {protected void onInitialize() {super.onInitialize();- var bean = new MilestoneEditBean();+ var bean = MilestoneEditBean.ofNew(getProject(), "");BeanEditor editor = BeanContext.edit("editor", bean);Form<?> form = new Form<Void>("form") {@@ -39,7 +39,7 @@ public class NewMilestonePage extends ProjectPage {var milestone = new Milestone();milestone.setProject(getProject());- bean.writeTo(milestone);+ bean.update(milestone);OneDev.getInstance(MilestoneManager.class).createOrUpdate(milestone);Session.get().success("New milestone created");setResponsePage(MilestoneIssuesPage.class, MilestoneIssuesPage.paramsOf(getProject(), milestone, null));diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/MilestoneEditBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/MilestoneEditBean.javaindex e078da5fa8..a20f7fc773 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/MilestoneEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/MilestoneEditBean.java@@ -8,22 +8,32 @@ import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.validation.Validatable;+import org.joda.time.DateTime;+import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.NotEmpty;import java.io.Serializable;import java.util.Date;+import java.util.regex.Pattern;++import static java.lang.Integer.parseInt;+import static java.util.stream.Collectors.toList;@Editable@ClassValidating-public class MilestoneEditBean implements Serializable, Validatable {+public class MilestoneEditBean implements Validatable, Serializable {+ private static final Pattern ENDS_WITH_DIGITS = Pattern.compile("(.*)(\\d+)");+public String oldName;++ public String namePrefix;private String name;private String description;-+private Date startDate;private Date dueDate;@@ -37,6 +47,15 @@ public class MilestoneEditBean implements Serializable, Validatable {this.oldName = oldName;}+ @Editable(hidden = true)+ public String getNamePrefix() {+ return namePrefix;+ }++ public void setNamePrefix(String namePrefix) {+ this.namePrefix = namePrefix;+ }+@Editable(order=100)@NotEmptypublic String getName() {@@ -74,35 +93,64 @@ public class MilestoneEditBean implements Serializable, Validatable {public void setDueDate(Date dueDate) {this.dueDate = dueDate;}-- public void readFrom(Milestone milestone) {- oldName = milestone.getName();- setName(milestone.getName());- setDescription(milestone.getDescription());- setDueDate(milestone.getDueDate());- setStartDate(milestone.getStartDate());- }-- public void writeTo(Milestone milestone) {++ public void update(Milestone milestone) {milestone.setName(getName());milestone.setDescription(getDescription());- milestone.setDueDate(getDueDate());milestone.setStartDate(getStartDate());+ milestone.setDueDate(getDueDate());+ }++ public static MilestoneEditBean ofNew(Project project, @Nullable String namePrefix) {+ var bean = new MilestoneEditBean();+ bean.namePrefix = namePrefix;+ var milestones = project.getSortedHierarchyMilestones().stream()+ .filter(it -> (namePrefix == null || it.getName().startsWith(namePrefix)) && it.getStartDate() != null && it.getDueDate() != null)+ .collect(toList());+ if (!milestones.isEmpty()) {+ var lastMilestone = milestones.get(milestones.size()-1);+ var matcher = ENDS_WITH_DIGITS.matcher(lastMilestone.getName());+ if (matcher.matches())+ bean.setName(matcher.group(1) + (parseInt(matcher.group(2)) + 1));+ if (lastMilestone.getStartDate() != null && lastMilestone.getDueDate() != null) {+ bean.setStartDate(new DateTime(lastMilestone.getDueDate()).plusDays(1).toDate());+ var duration = lastMilestone.getDueDate().getTime() - lastMilestone.getStartDate().getTime();+ bean.setDueDate(new DateTime(bean.getStartDate()).plusMillis((int) duration).toDate());+ }+ }+ return bean;+ }++ public static MilestoneEditBean of(Milestone milestone, @Nullable String namePrefix) {+ var bean = new MilestoneEditBean();+ bean.oldName = milestone.getName();+ bean.namePrefix = namePrefix;+ bean.setName(milestone.getName());+ bean.setDescription(milestone.getDescription());+ bean.setStartDate(milestone.getStartDate());+ bean.setDueDate(milestone.getDueDate());+ return bean;}@Overridepublic boolean isValid(ConstraintValidatorContext context) {+ if (namePrefix != null && !name.startsWith(namePrefix)) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate("Name must prefix with: " + namePrefix)+ .addPropertyNode("name").addConstraintViolation();+ return false;+ }MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.findInHierarchy(Project.get(), name);if (milestoneWithSameName != null && (oldName == null || !oldName.equals(name))) {context.disableDefaultConstraintViolation();- var message = "This name has already been used by another milestone in the project hierarchy";+ var message = "Name has already been used by another milestone in the project hierarchy";context.buildConstraintViolationWithTemplate(message).addPropertyNode("name").addConstraintViolation();return false;- } else {- return true;}+ return true;}+}