Skip to content

The Unified and Autonomous Development Platform

Fix issue #363 - Able to move/delete issues in batch

Robin Shen0c3907bce2a8
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 93119d7f91..3cfe4cf506 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -76,4 +76,6 @@ public interface BuildManager extends EntityManager<Build> {
void populateBuilds(Collection<PullRequest> requests);
+ void delete(Collection<Build> builds);
+
}
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 c8f8c4a907..e773c169ac 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
@@ -62,5 +62,9 @@ public interface IssueManager extends EntityManager<Issue> {
Collection<Long> getIssueNumbers(Long projectId);
+ void move(Project targetProject, Collection<Issue> issues);
+
+ void delete(Collection<Issue> issues);
+
Collection<MilestoneAndState> queryMilestoneAndStates(Project project, Collection<Milestone> milestones);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 5bcd6a7bad..4dfba1bcc7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -70,5 +70,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
int count(@Nullable Project targetProject, EntityCriteria<PullRequest> requestCriteria);
List<PullRequest> query(Project targetProject, String term, int count);
+
+ void delete(Collection<PullRequest> requests);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 8ad821459c..2e4c12b96f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -1003,5 +1003,12 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
for (Build build: getSession().createQuery(query).getResultList())
build.getRequest().getBuilds().add(build);
}
+
+ @Transactional
+ @Override
+ public void delete(Collection<Build> builds) {
+ for (Build build: builds)
+ delete(build);
+ }
}
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 a5b5c9dfaf..ce90d50b5e 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
@@ -35,6 +35,7 @@ import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueQuerySettingManager;
@@ -48,6 +49,7 @@ import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Milestone;
@@ -75,7 +77,9 @@ import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
+import io.onedev.server.storage.AttachmentStorageManager;
import io.onedev.server.util.MilestoneAndState;
+import io.onedev.server.util.Pair;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
@@ -94,6 +98,10 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
private final IssueQuerySettingManager issueQuerySettingManager;
+ private final AttachmentStorageManager attachmentStorageManager;
+
+ private final IssueCommentManager issueCommentManager;
+
private final SettingManager settingManager;
private final ProjectManager projectManager;
@@ -112,7 +120,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
public DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager,
TransactionManager transactionManager, IssueQuerySettingManager issueQuerySettingManager,
SettingManager settingManager, ListenerRegistry listenerRegistry,
- ProjectManager projectManager, UserManager userManager, RoleManager roleManager) {
+ ProjectManager projectManager, UserManager userManager,
+ RoleManager roleManager, AttachmentStorageManager attachmentStorageManager,
+ IssueCommentManager issueCommentManager) {
super(dao);
this.issueFieldManager = issueFieldManager;
this.issueQuerySettingManager = issueQuerySettingManager;
@@ -122,6 +132,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
this.transactionManager = transactionManager;
this.userManager = userManager;
this.roleManager = roleManager;
+ this.attachmentStorageManager = attachmentStorageManager;
+ this.issueCommentManager = issueCommentManager;
}
@SuppressWarnings("unchecked")
@@ -739,4 +751,46 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
return getSession().createQuery(criteriaQuery).getResultList();
}
+ @Transactional
+ @Override
+ public void move(Project targetProject, Collection<Issue> issues) {
+ List<Pair<Project, String>> attachmentInfos = new ArrayList<>();
+ for (Issue issue: issues) {
+ attachmentInfos.add(new Pair<>(issue.getAttachmentProject(), issue.getAttachmentGroup()));
+ if (issue.getDescription() != null) {
+ issue.setDescription(issue.getDescription().replace(
+ issue.getAttachmentProject().getName() + "/attachment/" + issue.getAttachmentGroup(),
+ targetProject.getName() + "/attachment/" + issue.getAttachmentGroup()));
+ }
+ for (IssueComment comment: issue.getComments()) {
+ comment.setContent(comment.getContent().replace(
+ issue.getAttachmentProject().getName() + "/attachment/" + issue.getAttachmentGroup(),
+ targetProject.getName() + "/attachment/" + issue.getAttachmentGroup()));
+ issueCommentManager.save(comment);
+ }
+ issue.setProject(targetProject);
+ issue.setMilestone(null);
+ issue.setNumberScope(targetProject.getForkRoot());
+ issue.setNumber(getNextNumber(issue.getNumberScope()));
+ save(issue);
+ }
+
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ for (Pair<Project, String> attachmentInfo: attachmentInfos)
+ attachmentStorageManager.moveGroupDir(attachmentInfo.getFirst(), targetProject, attachmentInfo.getSecond());
+ }
+
+ });
+ }
+
+ @Transactional
+ @Override
+ public void delete(Collection<Issue> issues) {
+ for (Issue issue: issues)
+ delete(issue);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 73114f5f3a..c66d3c6f7a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -1028,4 +1028,11 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
return requests;
}
+ @Transactional
+ @Override
+ public void delete(Collection<PullRequest> requests) {
+ for (PullRequest request: requests)
+ delete(request);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index 68aa75edcb..c33160655f 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -249,7 +249,12 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
}
@Override
- public String getGroup() {
+ public Project getAttachmentProject() {
+ return project;
+ }
+
+ @Override
+ public String getAttachmentGroup() {
return uuid;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index f1cdaea48d..2a75bafee1 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -695,7 +695,12 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
}
@Override
- public String getGroup() {
+ public Project getAttachmentProject() {
+ return project;
+ }
+
+ @Override
+ public String getAttachmentGroup() {
return uuid;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 86564db1e7..e50cb34da6 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -964,9 +964,13 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
.containsAll(requiredJobs);
}
+ @Override
+ public Project getAttachmentProject() {
+ return targetProject;
+ }
@Override
- public String getGroup() {
+ public String getAttachmentGroup() {
return uuid;
}
diff --git a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
index 45bad65caa..c7cf5ccb5f 100644
--- a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
+++ b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageManager.java
@@ -15,4 +15,6 @@ public interface AttachmentStorageManager {
*/
File getGroupDir(Project project, String group);
+ void moveGroupDir(Project fromProject, Project toProject, String group);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java
index f107da165f..e973ded868 100644
--- a/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java
+++ b/server-core/src/main/java/io/onedev/server/storage/AttachmentStorageSupport.java
@@ -4,8 +4,8 @@ import io.onedev.server.model.Project;
public interface AttachmentStorageSupport {
- Project getProject();
+ Project getAttachmentProject();
- String getGroup();
+ String getAttachmentGroup();
}
diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java
index 2c7ed2ce23..d5d390fef3 100644
--- a/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java
+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultAttachmentStorageManager.java
@@ -66,6 +66,23 @@ public class DefaultAttachmentStorageManager implements AttachmentStorageManager
return new File(baseDir, TEMP + "/" + group);
}
+ @Override
+ public void moveGroupDir(Project fromProject, Project toProject, String group) {
+ File fromBaseDir = storageManager.getProjectAttachmentDir(fromProject.getId());
+ File fromGroupDir = getPermanentGroupDir(fromBaseDir, group);
+
+ File toBaseDir = storageManager.getProjectAttachmentDir(toProject.getId());
+ File toGroupDir = getPermanentGroupDir(toBaseDir, group);
+
+ FileUtils.createDir(toGroupDir.getParentFile());
+
+ try {
+ FileUtils.moveDirectory(fromGroupDir, toGroupDir);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
private File getPermanentGroupDir(File base, String group) {
String prefix = group.substring(0, 2);
return new File(base, PERMANENT + "/" + prefix + "/" + group);
@@ -128,8 +145,8 @@ public class DefaultAttachmentStorageManager implements AttachmentStorageManager
public void on(EntityPersisted event) {
if (event.isNew() && event.getEntity() instanceof AttachmentStorageSupport) {
AttachmentStorageSupport storageSupport = (AttachmentStorageSupport) event.getEntity();
- File base = storageManager.getProjectAttachmentDir(storageSupport.getProject().getId());
- String group = storageSupport.getGroup();
+ File base = storageManager.getProjectAttachmentDir(storageSupport.getAttachmentProject().getId());
+ String group = storageSupport.getAttachmentGroup();
transactionManager.runAfterCommit(new Runnable() {
@Override
@@ -147,7 +164,7 @@ public class DefaultAttachmentStorageManager implements AttachmentStorageManager
if (event.getEntity() instanceof AttachmentStorageSupport) {
AttachmentStorageSupport storageSupport = (AttachmentStorageSupport) event.getEntity();
File attachmentStorage = getPermanentGroupDir(
- storageManager.getProjectAttachmentDir(storageSupport.getProject().getId()), storageSupport.getGroup());
+ storageManager.getProjectAttachmentDir(storageSupport.getAttachmentProject().getId()), storageSupport.getAttachmentGroup());
transactionManager.runAfterCommit(new Runnable() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow3.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow3.svg
new file mode 100644
index 0000000000..7cd1b674e0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/arrow3.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1626237008766" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2523" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M837.9904 570.0608H124.5696a29.0304 29.0304 0 0 1-29.0304-29.0304V482.9696a29.0304 29.0304 0 0 1 29.0304-29.0304h713.4208z" p-id="2524"></path><path d="M561.3056 808.96l-40.96-40.96a28.928 28.928 0 0 1 0-40.96l215.04-215.04-215.04-215.04a28.9792 28.9792 0 0 1 0-40.96l40.96-40.96a28.9792 28.9792 0 0 1 40.96 0l296.96 296.96-296.96 296.96a28.9792 28.9792 0 0 1-40.96 0z" p-id="2525"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-selected.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-selected.svg
deleted file mode 100644
index 88c0732dfe..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/edit-selected.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path stroke='currentColor' stroke-width="10" d='m 939.23982,149.91597 a 64.270168,65.07941 0 0 1 0,91.83679 L 573.32534,612.16118 a 61.023069,61.791426 0 0 1 -28.60807,16.43993 l -149.53451,37.81181 a 33.702649,34.127008 0 0 1 -40.75668,-41.26987 l 37.39761,-151.53071 c 2.74325,-10.88437 8.28571,-20.80501 16.06755,-28.79821 L 773.8617,74.235645 c 24.18529,-24.546501 66.45356,-24.489811 90.63885,0 z m -84.14466,80.89575 36.61385,-37.18824 -72.44391,-69.10435 -34.59839,34.97734 z M 528.53777,562.50129 807.67632,279.05438 737.1359,207.62576 455.47804,492.83004 432.86031,586.76435 Z M 836.84423,452.35382 c 18.47488,0 33.59068,15.30613 33.59068,34.01363 V 849.633 c 0,62.35832 -50.38603,113.37876 -111.96894,113.37876 H 174.21208 c -61.58292,0 -111.968943,-51.02044 -111.968943,-113.37876 V 258.02262 c 0,-62.35832 50.386023,-113.37876 111.968943,-113.37876 H 516.1652 c 18.47487,0 33.59068,15.30614 33.59068,34.01363 0,18.70749 -15.11581,34.01363 -33.59068,34.01363 H 174.21208 a 45.347419,45.918399 0 0 0 -44.78758,45.3515 V 849.633 c 0,24.5465 20.5463,45.35151 44.78758,45.35151 H 758.46597 A 45.347419,45.918399 0 0 0 803.25355,849.633 V 486.36745 c 0,-18.7075 15.11581,-34.01363 33.59068,-34.01363 z' />
-</svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
index c2e2e9a513..0b1106c63d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
@@ -10,16 +10,19 @@
</div>
</form>
<div class="mb-4">
- <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray d-inline-block mb-2 mr-4 text-nowrap">
<wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <a wicket:id="saveQuery" class="save-query text-gray d-inline-block mb-2 mr-4 text-nowrap">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <a wicket:id="listParams" class="list-params text-gray mr-4 d-none d-xl-inline">
+ <a wicket:id="delete" class="delete text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="trash" class="icon"></wicket:svg> Delete...
+ </a>
+ <a wicket:id="listParams" class="list-params text-gray mr-4 mb-2 d-none d-xl-inline text-nowrap">
<wicket:svg href="select" class="icon"></wicket:svg> Display Params
</a>
- <a wicket:id="orderBy" class="order-by text-gray">
+ <a wicket:id="orderBy" class="order-by text-gray mb-2 d-inline-block text-nowrap">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index b7972dc0c9..06c99d6b5f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -12,6 +12,7 @@ import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -71,17 +72,21 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.BuildQueryBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.build.ParamValuesLabel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.JobDefLink;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.orderedit.OrderEditPanel;
@@ -115,6 +120,10 @@ public abstract class BuildListPanel extends Panel {
private DataTable<Build, Void> buildsTable;
+ private SelectionColumn<Build, Void> selectionColumn;
+
+ private SortableDataProvider<Build, Void> dataProvider;
+
private TextField<String> queryInput;
private WebMarkupContainer body;
@@ -247,6 +256,121 @@ public abstract class BuildListPanel extends Panel {
}.setOutputMarkupPlaceholderTag(true));
+ add(new MenuLink("delete") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "All Queried Builds";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete all queried builds?"));
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<Build> builds = new ArrayList<>();
+ for (Iterator<Build> it = (Iterator<Build>) dataProvider.iterator(0, buildsTable.getItemCount()); it.hasNext();) {
+ builds.add(it.next());
+ }
+ OneDev.getInstance(BuildManager.class).delete(builds);
+ target.add(body);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(buildsTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No builds to delete");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Selected Builds";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected builds?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<Build> builds = new ArrayList<>();
+ for (IModel<Build> each: selectionColumn.getSelections())
+ builds.add(each.getObject());
+ OneDev.getInstance(BuildManager.class).delete(builds);
+ target.add(body);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select builds to delete");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ return menuItems;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getProject() != null && SecurityUtils.canManageBuilds(getProject()));
+ }
+
+ });
+
add(new ModalLink("listParams") {
private List<String> listParams;
@@ -432,7 +556,7 @@ public abstract class BuildListPanel extends Panel {
});
add(queryForm);
- SortableDataProvider<Build, Void> dataProvider = new LoadableDetachableDataProvider<Build, Void>() {
+ dataProvider = new LoadableDetachableDataProvider<Build, Void>() {
@Override
public Iterator<? extends Build> iterator(long first, long count) {
@@ -483,6 +607,9 @@ public abstract class BuildListPanel extends Panel {
List<IColumn<Build, Void>> columns = new ArrayList<>();
+ if (getProject() != null && SecurityUtils.canManageBuilds(getProject()))
+ columns.add(selectionColumn = new SelectionColumn<Build, Void>());
+
columns.add(new AbstractColumn<Build, Void>(Model.of("Build")) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index 39da962fc4..1ee757cf46 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -13,26 +13,29 @@
<a wicket:id="newIssue" class="add-new btn btn-primary btn-icon flex-shrink-0 ml-3" title="Create new issue"><wicket:svg href="plus" class="icon"/></a>
</div>
<div class="mb-5">
- <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <a wicket:id="showSavedQueries" class="show-saved-queries d-inline-block text-gray mr-4 mb-2 text-nowrap">
<wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <a wicket:id="saveQuery" class="save-query d-inline-block text-gray mr-4 mb-2 text-nowrap">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <a wicket:id="batchEditSelected" class="text-gray mr-4">
- <wicket:svg href="edit-selected" class="icon"></wicket:svg> Batch Edit Selected
+ <a wicket:id="batchEdit" class="text-gray d-inline-block mr-4 mb-2 text-nowrap">
+ <wicket:svg href="edit" class="icon"></wicket:svg> Batch Edit...
</a>
- <a wicket:id="batchEditAll" class="text-gray mr-4">
- <wicket:svg href="edit" class="icon"></wicket:svg> Batch Edit All
+ <a wicket:id="move" class="text-gray d-inline-block mr-4 mb-2 text-nowrap">
+ <wicket:svg href="arrow3" class="icon"></wicket:svg> Move...
</a>
- <a wicket:id="listFields" class="list-fields text-gray mr-4">
+ <a wicket:id="delete" class="text-gray d-inline-block mr-4 mb-2 text-nowrap">
+ <wicket:svg href="trash" class="icon"></wicket:svg> Delete...
+ </a>
+ <a wicket:id="listFields" class="list-fields d-inline-block text-gray mr-4 mb-2 text-nowrap">
<wicket:svg href="select" class="icon"></wicket:svg> Display Fields
</a>
- <a wicket:id="orderBy" class="order-by text-gray mr-4">
+ <a wicket:id="orderBy" class="order-by d-inline-block text-gray mr-4 mb-2 text-nowrap">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
- <a wicket:id="importIssues" class="import-issues text-gray">
- <wicket:svg href="import" class="icon"></wicket:svg> Import Issues
+ <a wicket:id="import" class="import-issues d-inline-block text-gray mb-2 text-nowrap">
+ <wicket:svg href="import" class="icon"></wicket:svg> Import...
</a>
</div>
<div wicket:id="body" class="body">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 1cb156520e..9b2fce36ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -16,6 +16,7 @@ import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -77,6 +78,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
@@ -90,6 +92,7 @@ import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.orderedit.OrderEditPanel;
import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
import io.onedev.server.web.component.project.selector.ProjectSelector;
@@ -305,7 +308,7 @@ public abstract class IssueListPanel extends Panel {
});
- add(new MenuLink("importIssues") {
+ add(new MenuLink("import") {
@Override
protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
@@ -525,118 +528,489 @@ public abstract class IssueListPanel extends Panel {
});
- ModalLink batchEditSelectedLink;
- add(batchEditSelectedLink = new ModalLink("batchEditSelected") {
+ add(new MenuLink("batchEdit") {
@Override
- protected String getModalCssClass() {
- return "modal-lg";
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new BatchEditPanel(id) {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ menuItems.add(new MenuItem() {
@Override
- protected Project getProject() {
- return IssueListPanel.this.getProject();
+ public String getLabel() {
+ return "All Queried Issues";
}
@Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
- @Override
- protected void onUpdated(AjaxRequestTarget target) {
- modal.close();
- target.add(body);
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ dropdown.close();
+
+ return new BatchEditPanel(id) {
+
+ @Override
+ protected Project getProject() {
+ return IssueListPanel.this.getProject();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onUpdated(AjaxRequestTarget target) {
+ modal.close();
+ target.add(body);
+ }
+
+ @Override
+ protected Iterator<? extends Issue> getIssueIterator() {
+ return dataProvider.iterator(0, issuesTable.getItemCount());
+ }
+
+ @Override
+ protected int getIssueCount() {
+ return (int) issuesTable.getItemCount();
+ }
+
+ @Override
+ protected IssueQuery getIssueQuery() {
+ return queryModel.getObject();
+ }
+
+ };
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(issuesTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No issues to edit");
+ }
+ }
+
+ };
}
+
+ });
+
+ menuItems.add(new MenuItem() {
@Override
- protected Iterator<Issue> getIssueIterator() {
- List<Issue> issues = new ArrayList<>();
- for (IModel<Issue> each: selectionColumn.getSelections())
- issues.add(each.getObject());
- return issues.iterator();
+ public String getLabel() {
+ return "Selected Issues";
}
@Override
- protected int getIssueCount() {
- return selectionColumn.getSelections().size();
- }
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
- @Override
- protected IssueQuery getIssueQuery() {
- return queryModel.getObject();
- }
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
- };
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ dropdown.close();
+
+ return new BatchEditPanel(id) {
+
+ @Override
+ protected Project getProject() {
+ return IssueListPanel.this.getProject();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onUpdated(AjaxRequestTarget target) {
+ modal.close();
+ target.add(body);
+ }
+
+ @Override
+ protected Iterator<Issue> getIssueIterator() {
+ List<Issue> issues = new ArrayList<>();
+ for (IModel<Issue> each: selectionColumn.getSelections())
+ issues.add(each.getObject());
+ return issues.iterator();
+ }
+
+ @Override
+ protected int getIssueCount() {
+ return selectionColumn.getSelections().size();
+ }
+
+ @Override
+ protected IssueQuery getIssueQuery() {
+ return queryModel.getObject();
+ }
+
+ };
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select issues to edit");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ return menuItems;
}
-
+
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getProject() != null
- && selectionColumn != null
- && !selectionColumn.getSelections().isEmpty()
- && SecurityUtils.canManageIssues(getProject()));
+ setVisible(getProject() != null && SecurityUtils.canManageIssues(getProject()));
}
});
- batchEditSelectedLink.setOutputMarkupPlaceholderTag(true);
+
+ add(new MenuLink("move") {
- add(new ModalLink("batchEditAll") {
+ private Collection<Project> getTargetProjects() {
+ List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)
+ .getPermittedProjects(new AccessProject()));
+
+ Predicate<Project> issueManagementEnabledPredicate = item -> item.isIssueManagementEnabled();
+ CollectionUtils.filter(projects, issueManagementEnabledPredicate);
+ projects.remove(getProject());
+
+ Collections.sort(projects, new Comparator<Project>() {
- @Override
- protected String getModalCssClass() {
- return "modal-lg";
+ @Override
+ public int compare(Project o1, Project o2) {
+ return o1.getName().compareTo(o2.getName());
+ }
+
+ });
+ return projects;
}
-
+
@Override
- protected Component newContent(String id, ModalPanel modal) {
- return new BatchEditPanel(id) {
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown1) {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ menuItems.add(new MenuItem() {
@Override
- protected Project getProject() {
- return IssueListPanel.this.getProject();
+ public String getLabel() {
+ return "All Queried Issues";
}
-
+
@Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
+ public WebMarkupContainer newLink(String id) {
+ return new DropdownLink(id) {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown2) {
+ return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {
+
+ @Override
+ protected Collection<Project> load() {
+ return getTargetProjects();
+ }
+
+ }) {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Project project) {
+ dropdown1.close();
+ dropdown2.close();
+
+ Long projectId = project.getId();
+ new ConfirmModalPanel(target) {
+
+ private Project getTargetProject() {
+ return OneDev.getInstance(ProjectManager.class).load(projectId);
+ }
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Issue> issues = new ArrayList<>();
+ for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext();) {
+ issues.add(it.next());
+ }
+ OneDev.getInstance(IssueManager.class).move(project, issues);
+ target.add(body);
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Do you really want to move all queried issues to project '" + getTargetProject().getName() + "'?";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return null;
+ }
+
+ };
+ }
+
+ }.add(AttributeAppender.append("class", "no-current"));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(issuesTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No issues to move");
+ }
+ }
+
+ };
}
+
+ });
+
+ menuItems.add(new MenuItem() {
@Override
- protected void onUpdated(AjaxRequestTarget target) {
- modal.close();
- target.add(body);
+ public String getLabel() {
+ return "Selected Issues";
}
@Override
- protected Iterator<? extends Issue> getIssueIterator() {
- return dataProvider.iterator(0, issuesTable.getItemCount());
+ public WebMarkupContainer newLink(String id) {
+ return new DropdownLink(id) {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown2) {
+ return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {
+
+ @Override
+ protected Collection<Project> load() {
+ return getTargetProjects();
+ }
+
+ }) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Project project) {
+ dropdown1.close();
+ dropdown2.close();
+
+ Long projectId = project.getId();
+ new ConfirmModalPanel(target) {
+
+ private Project getTargetProject() {
+ return OneDev.getInstance(ProjectManager.class).load(projectId);
+ }
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Issue> issues = new ArrayList<>();
+ for (IModel<Issue> each: selectionColumn.getSelections())
+ issues.add(each.getObject());
+ OneDev.getInstance(IssueManager.class).move(project, issues);
+ target.add(body);
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Do you really want to move selected issues to project '" + getTargetProject().getName() + "'?";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return null;
+ }
+
+ };
+ }
+
+ }.add(AttributeAppender.append("class", "no-current"));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select issues to move");
+ }
+ }
+
+ };
}
+
+ });
+
+ return menuItems;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getProject() != null && SecurityUtils.canManageIssues(getProject()));
+ }
+
+ });
+
+ add(new MenuLink("delete") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ menuItems.add(new MenuItem() {
@Override
- protected int getIssueCount() {
- return (int) issuesTable.getItemCount();
+ public String getLabel() {
+ return "All Queried Issues";
}
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete all queried issues?"));
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<Issue> issues = new ArrayList<>();
+ for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext();) {
+ issues.add(it.next());
+ }
+ OneDev.getInstance(IssueManager.class).delete(issues);
+ target.add(body);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(issuesTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No issues to delete");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
@Override
- protected IssueQuery getIssueQuery() {
- return queryModel.getObject();
+ public String getLabel() {
+ return "Selected Issues";
}
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
- };
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected issues?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<Issue> issues = new ArrayList<>();
+ for (IModel<Issue> each: selectionColumn.getSelections())
+ issues.add(each.getObject());
+ OneDev.getInstance(IssueManager.class).delete(issues);
+ target.add(body);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select issues to delete");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ return menuItems;
}
-
+
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getProject() != null
- && issuesTable.getItemCount() != 0
- && SecurityUtils.canManageIssues(getProject()));
+ setVisible(getProject() != null && SecurityUtils.canManageIssues(getProject()));
}
});
@@ -702,16 +1076,9 @@ public abstract class IssueListPanel extends Panel {
}
});
- if (getProject() != null && SecurityUtils.canManageIssues(getProject())) {
- columns.add(selectionColumn = new SelectionColumn<Issue, Void>() {
-
- @Override
- protected void onSelectionChange(AjaxRequestTarget target) {
- target.add(batchEditSelectedLink);
- }
-
- });
- }
+
+ if (getProject() != null && SecurityUtils.canManageIssues(getProject()))
+ columns.add(selectionColumn = new SelectionColumn<Issue, Void>());
columns.add(new AbstractColumn<Issue, Void>(Model.of("")) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
index 490cc3c459..ea30107be4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
@@ -23,7 +23,7 @@
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
<a wicket:id="importProjects" class="import-projects text-gray">
- <wicket:svg href="import" class="icon"></wicket:svg> Import Projects
+ <wicket:svg href="import" class="icon"></wicket:svg> Import Projects...
</a>
</div>
<div wicket:id="body">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index 0fb3ca4f03..448ab56c94 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -13,13 +13,16 @@
<a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-3" title="Open new pull request"><wicket:svg href="plus" class="icon"/></a>
</div>
<div class="operations mb-5">
- <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4 mb-2 text-nowrap d-inline-block">
<wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
</a>
- <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <a wicket:id="saveQuery" class="save-query text-gray mr-4 mb-2 text-nowrap d-inline-block">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <a wicket:id="orderBy" class="order-by text-gray">
+ <a wicket:id="delete" class="delete text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="trash" class="icon"></wicket:svg> Delete...
+ </a>
+ <a wicket:id="orderBy" class="order-by text-gray mb-2 text-nowrap d-inline-block">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 7cb5a5c3ab..2277461867 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -12,6 +12,7 @@ import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -67,12 +68,16 @@ import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.orderedit.OrderEditPanel;
import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
import io.onedev.server.web.component.project.selector.ProjectSelector;
@@ -107,6 +112,10 @@ public abstract class PullRequestListPanel extends Panel {
private DataTable<PullRequest, Void> requestsTable;
+ private SelectionColumn<PullRequest, Void> selectionColumn;
+
+ private SortableDataProvider<PullRequest, Void> dataProvider;
+
private TextField<String> queryInput;
private Component saveQueryLink;
@@ -231,6 +240,121 @@ public abstract class PullRequestListPanel extends Panel {
}.setOutputMarkupPlaceholderTag(true));
+ add(new MenuLink("delete") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "All Queried Pull Requests";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete all queried pull requests?"));
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<PullRequest> requests = new ArrayList<>();
+ for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext();) {
+ requests.add(it.next());
+ }
+ OneDev.getInstance(PullRequestManager.class).delete(requests);
+ target.add(body);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(requestsTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No pull requests to delete");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Selected Pull Requests";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected pull requests?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<PullRequest> requests = new ArrayList<>();
+ for (IModel<PullRequest> each: selectionColumn.getSelections())
+ requests.add(each.getObject());
+ OneDev.getInstance(PullRequestManager.class).delete(requests);
+ target.add(body);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select pull requests to delete");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ return menuItems;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getProject() != null && SecurityUtils.canManagePullRequests(getProject()));
+ }
+
+ });
+
add(new DropdownLink("orderBy") {
@Override
@@ -375,6 +499,9 @@ public abstract class PullRequestListPanel extends Panel {
});
+ if (getProject() != null && SecurityUtils.canManagePullRequests(getProject()))
+ columns.add(selectionColumn = new SelectionColumn<PullRequest, Void>());
+
columns.add(new AbstractColumn<PullRequest, Void>(Model.of("")) {
@Override
@@ -497,7 +624,7 @@ public abstract class PullRequestListPanel extends Panel {
});
- SortableDataProvider<PullRequest, Void> dataProvider = new LoadableDetachableDataProvider<PullRequest, Void>() {
+ dataProvider = new LoadableDetachableDataProvider<PullRequest, Void>() {
@Override
public Iterator<? extends PullRequest> iterator(long first, long count) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index d598c86e90..2b299307b2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -789,7 +789,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
WebMarkupContainer actions = new WebMarkupContainer("actions");
fragment.add(actions);
- if (SecurityUtils.canManage(getPullRequest().getTargetProject())) {
+ if (SecurityUtils.canManagePullRequests(getPullRequest().getTargetProject())) {
actions.add(new Link<Void>("synchronize") {
@Override