The Unified and Autonomous Development Platform
Fix issue #880 - Boards: Allow "No Milestone" in milestone dropdown
Robin Shen3cc559f3dab9
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 c2fe765e27..28182fda69 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@@ -51,6 +51,8 @@ public class Milestone extends AbstractEntity {public static final String PROP_CLOSED = "closed";+ public static final String NONE = "none";+@ManyToOne@JoinColumn(nullable=false)private Project project;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 652bd58967..a6b1b10e4a 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@@ -345,6 +345,7 @@ public class Project extends AbstractEntity {private Collection<BuildQueryPersonalization> buildQueryPersonalizations = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<Milestone> milestones = new ArrayList<>();private boolean codeManagement = true;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/MilestoneNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/MilestoneNameValidator.javanew file mode 100644index 0000000000..e32050692f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/MilestoneNameValidator.java@@ -0,0 +1,35 @@+package io.onedev.server.util.validation;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.server.model.Milestone;+import io.onedev.server.util.validation.annotation.MilestoneName;++public class MilestoneNameValidator implements ConstraintValidator<MilestoneName, String> {++ private String message;++ @Override+ public void initialize(MilestoneName constaintAnnotation) {+ message = constaintAnnotation.message();+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null)+ return true;++ if (value.equals(Milestone.NONE)) {+ constraintContext.disableDefaultConstraintViolation();+ String message = this.message;+ if (message.length() == 0)+ message = "'" + value + "' is a reserved name";+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else {+ return true;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/MilestoneName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/MilestoneName.javanew file mode 100644index 0000000000..7c679e1252--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/MilestoneName.java@@ -0,0 +1,23 @@+package io.onedev.server.util.validation.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++import javax.validation.Constraint;+import javax.validation.Payload;++import io.onedev.server.util.validation.ProjectNameValidator;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+@Constraint(validatedBy=ProjectNameValidator.class)+public @interface MilestoneName {++ String message() default "";++ Class<?>[] groups() default {};++ Class<? extends Payload>[] payload() default {};+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.htmlindex 85e7bc2c23..bb137abd3c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html@@ -10,7 +10,11 @@<wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg></a><a wicket:id="backlog" title="Show issues not scheduled into current milestone" class="bg-white backlog btn btn-outline-secondary btn-hover-primary text-nowrap"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Backlog</a>- <a wicket:id="milestone"></a>+ <a wicket:id="milestone" title="Milestone" class="milestone-selector btn text-nowrap bg-white">+ <wicket:svg href="milestone" class="icon mr-2"></wicket:svg>+ <span wicket:id="label"></span>+ <wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg>+ </a></span><div class="clearable-wrapper w-100 w-auto-md flex-grow-1"><div class="input-group">@@ -37,13 +41,6 @@<a wicket:id="useDefault"><wicket:svg href="undo" class="icon mr-1"></wicket:svg>Use Default</a></div></wicket:fragment>- <wicket:fragment wicket:id="hasMilestoneFrag">- <a wicket:id="link" title="Milestone" class="milestone-selector btn text-nowrap bg-white">- <wicket:svg href="milestone" class="icon mr-2"></wicket:svg>- <span wicket:id="label"></span>- <wicket:svg href="arrow" class="icon rotate-90 ml-1"></wicket:svg>- </a>- </wicket:fragment><wicket:fragment wicket:id="boardMenuFrag"><div class="board-menu p-4"><div class="text-muted mb-3"><wicket:svg href="bulb" class="icon"/> The first board will be the primary board</div>@@ -66,6 +63,7 @@</wicket:fragment><wicket:fragment wicket:id="milestoneMenuFrag"><div class="milestone-menu p-4">+ <wicket:enclosure child="milestones"><table class="milestones table"><tr wicket:id="milestones" class="milestone"><td class="name">@@ -82,8 +80,10 @@</td></tr></table>+ </wicket:enclosure><a wicket:id="showClosed" class="show-closed btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="double-arrow" class="icon rotate-90 mr-2"></wicket:svg> Show Closed</a>- <a wicket:id="newMilestone" class="new-milestone btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> Add New Milestone</a>+ <a wicket:id="unscheduled" class="no-milestone btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="inbox" class="icon mr-2"></wicket:svg> Unscheduled</a>+ <a wicket:id="newMilestone" class="new-milestone btn btn-block btn-light btn-hover-primary btn-sm"><wicket:svg href="plus" class="icon mr-2"></wicket:svg> Create Milestone</a></div></wicket:fragment><wicket:fragment wicket:id="milestoneActionsFrag">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 a750a3e05a..90b1d01ab0 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@@ -32,10 +32,8 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -57,7 +55,6 @@ import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;-import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -69,7 +66,6 @@ import io.onedev.server.web.component.milestone.MilestoneStatusLabel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;-import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;import io.onedev.server.web.util.ConfirmClickModifier;@@ -183,9 +179,13 @@ public class IssueBoardsPage extends ProjectIssuesPage {Milestone milestone;String milestoneName = params.get(PARAM_MILESTONE).toString();if (milestoneName != null) {- milestone = getProject().getHierarchyMilestone(milestoneName);- if (milestone == null)- throw new ExplicitException("Can not find milestone: " + milestoneName);+ if (milestoneName.equals(Milestone.NONE)) {+ 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 {@@ -415,24 +415,17 @@ public class IssueBoardsPage extends ProjectIssuesPage {}});- if (getMilestone() != null) {- Fragment milestoneFragment = new Fragment("milestone", "hasMilestoneFrag", this);- milestoneFragment.setRenderBodyOnly(true);- milestoneFragment.add(new DropdownLink("link") {++ form.add(new DropdownLink("milestone") {- private boolean showClosed;+ private boolean showClosed;++ @Override+ protected void onInitialize() {+ super.onInitialize();- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return getMilestone().getName();- }-- }));+ if (getMilestone() != null) {+ add(new Label("label", getMilestone().getName()));if (getMilestone().getDueDate() != null&& getMilestone().getDueDate().before(new Date())@@ -442,197 +435,206 @@ public class IssueBoardsPage extends ProjectIssuesPage {} else {add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));}+ } else {+ add(new Label("label", "<i>Unscheduled</i>").setEscapeModelStrings(false));+ add(AttributeAppender.append("class", "btn-outline-secondary btn-hover-primary"));}+ }- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Fragment menuFragment = new Fragment(id, "milestoneMenuFrag", IssueBoardsPage.this);- if (SecurityUtils.canManage(getProject()))- menuFragment.add(AttributeAppender.append("class", "administrative"));+ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment menuFragment = new Fragment(id, "milestoneMenuFrag", IssueBoardsPage.this);+ if (SecurityUtils.canManage(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<List<Milestone>>() {- @Override- protected List<Milestone> load() {- List<Milestone> milestones = getProject().getSortedHierarchyMilestones()+ @Override+ protected List<Milestone> load() {+ List<Milestone> milestones = getProject().getSortedHierarchyMilestones()+ .stream()+ .filter(it->!it.isClosed())+ .collect(Collectors.toList());+ if (getMilestone() != null && getMilestone().isClosed() || showClosed) {+ List<Milestone> closedMilestones = getProject().getSortedHierarchyMilestones().stream()- .filter(it->!it.isClosed())+ .filter(it->it.isClosed()).collect(Collectors.toList());- if (getMilestone().isClosed() || showClosed) {- List<Milestone> closedMilestones = getProject().getSortedHierarchyMilestones()- .stream()- .filter(it->it.isClosed())- .collect(Collectors.toList());- milestones.addAll(closedMilestones);- }- return milestones;+ milestones.addAll(closedMilestones);}-- }) {-- private void toggleClose(Milestone milestone) {- milestone.setClosed(!milestone.isClosed());- if (milestone.equals(IssueBoardsPage.this.getMilestone())) {- getMilestoneManager().save(milestone);- setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(),- milestone, backlog, queryString, backlogQueryString));- } else {- getMilestoneManager().save(milestone);- }- dropdown.close();- if (milestone.isClosed())- Session.get().success("Milestone '" + milestone.getName() + "' is closed");- else- Session.get().success("Milestone '" + milestone.getName() + "' is reopened");+ return milestones;+ }++ }) {++ private void toggleClose(Milestone milestone) {+ milestone.setClosed(!milestone.isClosed());+ if (milestone.equals(IssueBoardsPage.this.getMilestone())) {+ getMilestoneManager().save(milestone);+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject(), getBoard(),+ milestone, backlog, queryString, backlogQueryString));+ } else {+ getMilestoneManager().save(milestone);}+ dropdown.close();+ if (milestone.isClosed())+ Session.get().success("Milestone '" + milestone.getName() + "' is closed");+ else+ Session.get().success("Milestone '" + milestone.getName() + "' is reopened");+ }++ @Override+ protected void populateItem(ListItem<Milestone> item) {+ Milestone milestone = item.getModelObject();+ PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), milestone,+ backlog, queryString, backlogQueryString);+ Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);+ link.add(new Label("name", milestone.getName()));+ item.add(link);+ item.add(new WebMarkupContainer("inherited") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!item.getModelObject().getProject().equals(getProject()));+ }++ });- @Override- protected void populateItem(ListItem<Milestone> item) {- Milestone milestone = item.getModelObject();- PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(), milestone,- backlog, queryString, backlogQueryString);- Link<Void> link = new BookmarkablePageLink<Void>("select", IssueBoardsPage.class, params);- link.add(new Label("name", milestone.getName()));- item.add(link);- item.add(new WebMarkupContainer("inherited") {-+ item.add(new MilestoneStatusLabel("status", item.getModel()));+ item.add(new MilestoneDateLabel("dueDate", item.getModel()));++ if (SecurityUtils.canManageIssues(getProject())+ && item.getModelObject().getProject().equals(getProject())) {+ Fragment fragment = new Fragment("actions", "milestoneActionsFrag", IssueBoardsPage.this);++ fragment.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ toggleClose(item.getModelObject());+ }+@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!item.getModelObject().getProject().equals(getProject()));+ setVisible(!item.getModelObject().isClosed());}});-- item.add(new MilestoneStatusLabel("status", item.getModel()));- item.add(new MilestoneDateLabel("dueDate", item.getModel()));-- if (SecurityUtils.canManageIssues(getProject())- && item.getModelObject().getProject().equals(getProject())) {- Fragment fragment = new Fragment("actions", "milestoneActionsFrag", IssueBoardsPage.this);-- fragment.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- toggleClose(item.getModelObject());- }+ fragment.add(new AjaxLink<Void>("reopen") {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!item.getModelObject().isClosed());- }-- });- fragment.add(new AjaxLink<Void>("reopen") {+ @Override+ public void onClick(AjaxRequestTarget target) {+ toggleClose(item.getModelObject());+ }- @Override- public void onClick(AjaxRequestTarget target) {- toggleClose(item.getModelObject());- }+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(item.getModelObject().isClosed());+ }++ });+ fragment.add(new MilestoneEditLink("edit", item.getModelObject().getId()) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(item.getModelObject().isClosed());- }-- });- fragment.add(new MilestoneEditLink("edit", item.getModelObject().getId()) {-- @Override- public void onClick(AjaxRequestTarget target) {- super.onClick(target);- dropdown.close();- }+ @Override+ public void onClick(AjaxRequestTarget target) {+ super.onClick(target);+ dropdown.close();+ }- });- fragment.add(new AjaxLink<Void>("delete") {+ });+ fragment.add(new AjaxLink<Void>("delete") {- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener(- "Do you really want to delete milestone '" + item.getModelObject().getName() + "'?"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- dropdown.close();- Milestone milestone = item.getModelObject();- if (milestone.equals(IssueBoardsPage.this.getMilestone())) {- getMilestoneManager().delete(milestone);- PageParameters params = IssueBoardsPage.paramsOf(- getProject(), getBoard(), null, backlog, queryString,- backlogQueryString);- setResponsePage(IssueBoardsPage.class, params);- } else {- getMilestoneManager().delete(milestone);- }- Session.get().success("Milestone '" + milestone.getName() + "' deleted");+ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(+ "Do you really want to delete milestone '" + item.getModelObject().getName() + "'?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ dropdown.close();+ Milestone milestone = item.getModelObject();+ if (milestone.equals(IssueBoardsPage.this.getMilestone())) {+ getMilestoneManager().delete(milestone);+ PageParameters params = IssueBoardsPage.paramsOf(+ getProject(), getBoard(), null, backlog, queryString,+ backlogQueryString);+ setResponsePage(IssueBoardsPage.class, params);+ } else {+ getMilestoneManager().delete(milestone);}+ Session.get().success("Milestone '" + milestone.getName() + "' deleted");+ }- });-- item.add(fragment);- } else {- item.add(new Label("actions", " ").setEscapeModelStrings(false));- }+ });+ item.add(fragment);+ } else {+ item.add(new Label("actions", " ").setEscapeModelStrings(false));}- });- menuFragment.add(new AjaxLink<Void>("showClosed") {-- @Override- public void onClick(AjaxRequestTarget target) {- showClosed = true;- target.add(menuFragment);- }+ }- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!showClosed && !getMilestone().isClosed()- && getProject().getMilestones().stream().anyMatch(it->it.isClosed()));- }-- });- menuFragment.add(new CreateMilestoneLink("newMilestone") {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getModelObject().isEmpty());+ }++ });+ menuFragment.add(new AjaxLink<Void>("showClosed") {- @Override- public void onClick(AjaxRequestTarget target) {- super.onClick(target);- dropdown.close();- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManageIssues(getProject()));- }-- });- menuFragment.setOutputMarkupId(true);- return menuFragment;- }+ @Override+ public void onClick(AjaxRequestTarget target) {+ showClosed = true;+ target.add(menuFragment);+ }- });- form.add(milestoneFragment);- } else if (SecurityUtils.canManageIssues(getProject())) {- form.add(new CreateMilestoneLink("milestone") {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!showClosed && (getMilestone() == null || !getMilestone().isClosed())+ && getProject().getHierarchyMilestones().stream().anyMatch(it->it.isClosed()));+ }++ });++ PageParameters params = IssueBoardsPage.paramsOfUnscheduled(getProject(), getBoard(),+ backlog, queryString, backlogQueryString);++ menuFragment.add(new BookmarkablePageLink<Void>("unscheduled", IssueBoardsPage.class, params) {- @Override- public IModel<?> getBody() {- return Model.of(String.format("<svg class='icon mr-2'><use xlink:href='%s'/></svg>Add Milestone",- SpriteImage.getVersionedHref(IconScope.class, "plus")));- }+ @Override+ protected void onConfigure() {+ super.onConfigure();+ }++ });- }.setEscapeModelStrings(false).add(AttributeAppender.append("class", "btn btn-outline-secondary bg-white btn-hover-primary")));- } else {- form.add(new WebMarkupContainer("milestone").setVisible(false));- }+ menuFragment.add(new CreateMilestoneLink("newMilestone") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ super.onClick(target);+ dropdown.close();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManageIssues(getProject()));+ }++ });+ menuFragment.setOutputMarkupId(true);+ return menuFragment;+ }++ });queryInput = new TextField<String>("input", new IModel<String>() {@@ -882,6 +884,20 @@ public class IssueBoardsPage extends ProjectIssuesPage {return params;}+ public static PageParameters paramsOfUnscheduled(Project project, @Nullable BoardSpec board,+ boolean backlog, @Nullable String query, @Nullable String backlogQuery) {+ PageParameters params = paramsOf(project);+ if (board != null)+ params.add(PARAM_BOARD, board.getName());+ params.add(PARAM_MILESTONE, Milestone.NONE);+ params.add(PARAM_BACKLOG, backlog);+ if (query != null)+ params.add(PARAM_QUERY, query);+ if (backlogQuery != null)+ params.add(PARAM_BACKLOG_QUERY, backlogQuery);+ return params;+ }+private class CreateBoardLink extends ModalLink {public CreateBoardLink(String id) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.jsindex 3761efd213..b7155e8a38 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js@@ -34,9 +34,6 @@ onedev.server.issueBoards = {$(ui.helper).outerWidth($card.outerWidth());containerContentWidth = $container.prop("scrollWidth");callback($card.data("issue"));- console.log("start");- console.log($card.offset().left);- console.log($container.scrollLeft());},drag: function(event, ui) {var cardLeft = $(ui.helper).offset().left;@@ -57,7 +54,6 @@ onedev.server.issueBoards = {var cardRight = cardLeft + $(ui.helper).outerWidth();var containerWidth = $container.outerWidth();var containerRight = containerLeft + containerWidth;- console.log(cardRight + ">" + containerRight);if (cardRight > containerRight) {var scrollLeft = $container.scrollLeft();