Skip to content

The Unified and Autonomous Development Platform

feat: Able to add all cards from a board column to specified iteration (OD-1962)

Robin Shen6aa66bc58477
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
index 2377c986cd..c2d38907c3 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
@@ -2,8 +2,8 @@ package io.onedev.server.entitymanager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Iteration;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.persistence.dao.EntityManager;
import javax.annotation.Nullable;
@@ -41,6 +41,8 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {
void create(IssueChange change, @Nullable String note);
void addSchedule(Issue issue, Iteration iteration);
+
+ void addSchedule(List<Issue> issues, Iteration iteration);
void removeSchedule(Issue issue, Iteration iteration);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 960aa6ee43..b90142c8fb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -252,6 +252,13 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
change.setUser(SecurityUtils.getUser());
create(change, null);
}
+
+ @Transactional
+ @Override
+ public void addSchedule(List<Issue> issues, Iteration iteration) {
+ for (var issue: issues)
+ addSchedule(issue, iteration);
+ }
@Transactional
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java
index 4323a4644f..f77964062f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/AbstractColumnPanel.java
@@ -4,14 +4,22 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.IterationManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.ProjectScope;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
@@ -19,6 +27,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.util.visit.IVisitor;
import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
@SuppressWarnings("serial")
abstract class AbstractColumnPanel extends Panel implements EditContext {
@@ -77,6 +87,10 @@ abstract class AbstractColumnPanel extends Panel implements EditContext {
protected IssueManager getIssueManager() {
return OneDev.getInstance(IssueManager.class);
}
+
+ protected IterationManager getIterationManager() {
+ return OneDev.getInstance(IterationManager.class);
+ }
@Override
public Object getInputValue(String name) {
@@ -94,4 +108,58 @@ abstract class AbstractColumnPanel extends Panel implements EditContext {
@Nullable
protected abstract String getIterationPrefix();
+ protected MenuLink newAddToIterationLink(String componentId) {
+ return new MenuLink(componentId) {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ var menuItems = new ArrayList<MenuItem>();
+ for (var iteration: getProject().getSortedHierarchyIterations()) {
+ if ((getIterationPrefix() == null || iteration.getName().startsWith(getIterationPrefix()))
+ && (isBacklog() || !iteration.equals(getIterationSelection().getIteration()))) {
+ var iterationId = iteration.getId();
+ menuItems.add(new MenuItem() {
+ @Override
+ public String getLabel() {
+ return iteration.getName();
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ BasePage page = (BasePage) getPage();
+ dropdown.close();
+ var iteration = getIterationManager().load(iterationId);
+ var issues = new ArrayList<Issue>();
+ for (var issue: getIssueManager().query(getProjectScope(), getQuery(),
+ false, 0, Integer.MAX_VALUE)) {
+ if (issue.getSchedules().stream().noneMatch(it->it.getIteration().equals(iteration)))
+ issues.add(issue);
+ }
+ getIssueChangeManager().addSchedule(issues, iteration);
+ for (var issue: issues)
+ page.notifyObservablesChange(target, issue.getChangeObservables(true));
+ }
+
+ };
+ }
+ });
+ }
+ }
+ return menuItems;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getQuery() != null && SecurityUtils.canScheduleIssues(getProject()));
+ }
+
+ };
+ }
+
+ protected abstract boolean isBacklog();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
index 966ba8d922..b1fe912790 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
@@ -5,6 +5,7 @@
<span wicket:id="count" class="card-count badge badge-secondary badge-sm mr-2"></span>
<div class="ml-auto">
<a wicket:id="addCard" title="Add new card to this column" class="add-card"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <a wicket:id="addToIteration" title="Add all cards to specified iteration" class="add-to-iteration"><wicket:svg href="iteration" class="icon"></wicket:svg></a>
<a wicket:id="showProgress" title="Show total estimated/spent time" class="show-progress ml-1"><wicket:svg href="clock" class="icon"></wicket:svg></a>
<a wicket:id="viewAsList" title="Show issues in list" class="view-list ml-1"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index ab16de0084..75ea3bce42 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -119,6 +119,8 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {
}
});
+
+ add(newAddToIterationLink("addToIteration"));
if (getQuery() != null && getProject().isTimeTracking() && WicketUtils.isSubscriptionActive()) {
add(new DropdownLink("showProgress") {
@@ -163,8 +165,11 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {
var card = cardListPanel.findCard(issueId);
if (card == null) { // moved from other columns
- var issue = getIssueManager().load(issueId);
- getIssueChangeManager().removeSchedule(issue, getIterationSelection().getIteration());
+ var issue = getIssueManager().load(issueId);
+ for (var iteration: getProject().getHierarchyIterations()) {
+ if (getIterationPrefix() == null || iteration.getName().startsWith(getIterationPrefix()))
+ getIssueChangeManager().removeSchedule(issue, iteration);
+ }
}
cardListPanel.onCardDropped(target, issueId, cardIndex, true);
}
@@ -186,7 +191,10 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {
Issue issue = issueDragging.getIssue();
if (SecurityUtils.canScheduleIssues(issue.getProject())) {
issue = SerializationUtils.clone(issue);
- issue.removeSchedule(getIterationSelection().getIteration());
+ for (var iteration: getProject().getHierarchyIterations()) {
+ if (getIterationPrefix() == null || iteration.getName().startsWith(getIterationPrefix()))
+ issue.removeSchedule(iteration);
+ }
issue.getLastActivity().setDate(new Date());
}
if (getQuery().matches(issue)) {
@@ -251,5 +259,9 @@ abstract class BacklogColumnPanel extends AbstractColumnPanel {
@Nullable
protected abstract IssueQuery getBacklogQuery();
-
+
+ @Override
+ protected boolean isBacklog() {
+ return true;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
index e6cc5c868d..9a3b062c7b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
@@ -6,6 +6,7 @@
<span wicket:id="count" class="card-count badge badge-secondary badge-sm mr-3"></span>
<div class="ml-auto">
<a wicket:id="addCard" title="Add new card to this column" class="add-card"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <a wicket:id="addToIteration" title="Add all cards to specified iteration" class="add-to-iteration"><wicket:svg href="iteration" class="icon"></wicket:svg></a>
<a wicket:id="showProgress" title="Show total estimated/spent time" class="show-progress ml-1"><wicket:svg href="clock" class="icon"></wicket:svg></a>
<a wicket:id="viewAsList" title="Show issues in list" class="show-list ml-1"><wicket:svg href="unordered-list" class="icon"></wicket:svg></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index 1acb675e51..3c2753c895 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -293,6 +293,7 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {
head.add(new WebMarkupContainer("viewAsList").setVisible(false));
}
+ head.add(newAddToIterationLink("addToIteration"));
head.add(new ModalLink("addCard") {
@Override
@@ -509,5 +510,10 @@ abstract class BoardColumnPanel extends AbstractColumnPanel {
@Nullable
protected abstract IssueQuery getBoardQuery();
+
+ @Override
+ protected boolean isBacklog() {
+ return false;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
index 07dc847355..d9743d39ca 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
@@ -104,11 +104,14 @@ public class IterationEditBean implements Validatable, Serializable {
public static IterationEditBean ofNew(Project project, @Nullable String namePrefix) {
var bean = new IterationEditBean();
bean.namePrefix = namePrefix;
- var iterations = project.getSortedHierarchyIterations().stream()
- .filter(it -> (namePrefix == null || it.getName().startsWith(namePrefix)))
- .collect(toList());
- if (!iterations.isEmpty()) {
- var lastIteration = iterations.get(iterations.size()-1);
+ var iterations = project.getHierarchyIterations().stream()
+ .filter(it -> namePrefix == null || it.getName().startsWith(namePrefix)).collect(toList());
+ var datesComparator = new Iteration.DatesComparator();
+ var lastIterationOpt = iterations.stream().filter(it->!it.isClosed()).max(datesComparator);
+ if (!lastIterationOpt.isPresent())
+ lastIterationOpt = iterations.stream().filter(it->it.isClosed()).max(datesComparator);
+ if (lastIterationOpt.isPresent()) {
+ var lastIteration = lastIterationOpt.get();
var matcher = ENDS_WITH_DIGITS.matcher(lastIteration.getName());
if (matcher.matches())
bean.setName(matcher.group(1) + (parseInt(matcher.group(2)) + 1));