Skip to content

The Unified and Autonomous Development Platform

feat: Mark queried issues/code comments/pull requests as read (#1805)

Robin Shen7e55b0d2d515
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 08d5987686..99eed99b07 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -36,6 +36,7 @@ import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRe
import io.onedev.server.web.util.LoadableDetachableDataProvider;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
+import io.onedev.server.xodus.VisitInfoManager;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -539,7 +540,49 @@ public abstract class CodeCommentListPanel extends Panel {
}
});
- }
+ }
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Set All Queried Comments as Read";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(commentsTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No comments to set as read");
+ }
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ var visitInfoManager = OneDev.getInstance(VisitInfoManager.class);
+ for (Iterator<CodeComment> it = (Iterator<CodeComment>) dataProvider.iterator(0, commentsTable.getItemCount()); it.hasNext(); )
+ visitInfoManager.visitCodeComment(SecurityUtils.getUser(), it.next());
+ target.add(body);
+ }
+
+ };
+ }
+
+ });
+
return menuItems;
}
@@ -607,7 +650,7 @@ public abstract class CodeCommentListPanel extends Panel {
}.setVisible(getPage() instanceof PullRequestCodeCommentsPage));
- queryInput = new TextField<String>("input", queryStringModel);
+ queryInput = new TextField<>("input", queryStringModel);
queryInput.add(new CodeCommentQueryBehavior(new AbstractReadOnlyModel<Project>() {
@Override
@@ -654,14 +697,14 @@ public abstract class CodeCommentListPanel extends Panel {
body.add(new FencedFeedbackPanel("feedback", this));
- dataProvider = new LoadableDetachableDataProvider<CodeComment, Void>() {
+ dataProvider = new LoadableDetachableDataProvider<>() {
@Override
public Iterator<? extends CodeComment> iterator(long first, long count) {
var query = queryModel.getObject();
if (query != null) {
return getCodeCommentManager().query(getProject(), getPullRequest(),
- query, (int)first, (int)count).iterator();
+ query, (int) first, (int) count).iterator();
} else {
return new ArrayList<CodeComment>().iterator();
}
@@ -671,7 +714,7 @@ public abstract class CodeCommentListPanel extends Panel {
public long calcSize() {
try {
var query = queryModel.getObject();
- if (query != null)
+ if (query != null)
return getCodeCommentManager().count(getProject(), getPullRequest(), query.getCriteria());
} catch (ExplicitException e) {
error(e.getMessage());
@@ -682,22 +725,22 @@ public abstract class CodeCommentListPanel extends Panel {
@Override
public IModel<CodeComment> model(CodeComment object) {
Long commentId = object.getId();
- return new LoadableDetachableModel<CodeComment>() {
+ return new LoadableDetachableModel<>() {
@Override
protected CodeComment load() {
return OneDev.getInstance(CodeCommentManager.class).load(commentId);
}
-
+
};
}
-
+
};
List<IColumn<CodeComment, Void>> columns = new ArrayList<>();
if (SecurityUtils.canManageCodeComments(getProject())) {
- columns.add(selectionColumn = new SelectionColumn<CodeComment, Void>());
+ columns.add(selectionColumn = new SelectionColumn<>());
} else if (getPullRequest() != null) {
Collection<User> keyUsers = Sets.newHashSet(getPullRequest().getSubmitter());
for (PullRequestReview review: getPullRequest().getReviews())
@@ -705,10 +748,10 @@ public abstract class CodeCommentListPanel extends Panel {
for (PullRequestAssignment assignment: getPullRequest().getAssignments())
keyUsers.add(assignment.getUser());
if (keyUsers.contains(SecurityUtils.getUser()))
- columns.add(selectionColumn = new SelectionColumn<CodeComment, Void>());
+ columns.add(selectionColumn = new SelectionColumn<>());
}
- columns.add(new AbstractColumn<CodeComment, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
@@ -719,10 +762,10 @@ public abstract class CodeCommentListPanel extends Panel {
public String getCssClass() {
return "new-indicator";
}
-
+
});
- columns.add(new AbstractColumn<CodeComment, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
@@ -757,14 +800,14 @@ public abstract class CodeCommentListPanel extends Panel {
setEscapeModelStrings(false);
}
});
-
+
String url = OneDev.getInstance(UrlManager.class).urlFor(comment);
var link = new ExternalLink("description", UrlUtils.makeRelative(url));
link.add(new Label("label", StringUtils.abbreviate(comment.getContent(), MAX_DESCRIPTION_LEN)));
fragment.add(link);
-
+
fragment.add(new Label("file", "on file " + comment.getMark().getPath()));
-
+
LastActivity lastActivity = comment.getLastActivity();
if (lastActivity.getUser() != null) {
fragment.add(new UserIdentPanel("user", lastActivity.getUser(), Mode.NAME));
@@ -774,13 +817,13 @@ public abstract class CodeCommentListPanel extends Panel {
fragment.add(new Label("activity", lastActivity.getDescription()));
fragment.add(new Label("date", DateUtils.formatAge(lastActivity.getDate()))
.add(new AttributeAppender("title", DateUtils.formatDateTime(lastActivity.getDate()))));
-
+
cellItem.add(fragment);
}
-
+
});
- body.add(commentsTable = new DefaultDataTable<CodeComment, Void>("comments", columns, dataProvider,
+ body.add(commentsTable = new DefaultDataTable<>("comments", columns, dataProvider,
WebConstants.PAGE_SIZE, getPagingHistorySupport()) {
@Override
@@ -794,7 +837,7 @@ public abstract class CodeCommentListPanel extends Panel {
return comment.isVisitedAfter(comment.getLastActivity().getDate()) ? "comment" : "comment new";
}
}));
-
+
var commentId = comment.getId();
item.add(new ChangeObserver() {
@Override
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 c7bd79be37..2ebc15fe47 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
@@ -64,6 +64,8 @@ import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.imports.IssueImportPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.util.*;
+import io.onedev.server.xodus.IssueInfoManager;
+import io.onedev.server.xodus.VisitInfoManager;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.StringUtils;
@@ -551,61 +553,6 @@ public abstract class IssueListPanel extends Panel {
protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return "Watch/Unwatch Selected Issues";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new DropdownLink(id) {
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown2) {
- return new WatchStatusPanel(id) {
-
- @Override
- protected WatchStatus getWatchStatus() {
- return null;
- }
-
- @Override
- protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {
- dropdown.close();
- dropdown2.close();
-
- var issues = selectionColumn.getSelections().stream()
- .map(it->it.getObject()).collect(toList());
- getWatchManager().setWatchStatus(SecurityUtils.getUser(), issues, watchStatus);
- selectionColumn.getSelections().clear();
- Session.get().success("Watch status changed");
- }
- };
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(!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 watch/unwatch");
- }
- }
-
- };
- }
-
- });
-
if (getProject() != null && getProject().isTimeTracking()
&& SecurityUtils.canManageIssues(getProject())
&& WicketUtils.isSubscriptionActive()) {
@@ -959,12 +906,11 @@ public abstract class IssueListPanel extends Panel {
});
}
-
menuItems.add(new MenuItem() {
@Override
public String getLabel() {
- return "Watch/Unwatch All Queried Issues";
+ return "Watch/Unwatch Selected Issues";
}
@Override
@@ -985,20 +931,19 @@ public abstract class IssueListPanel extends Panel {
dropdown.close();
dropdown2.close();
- Collection<Issue> issues = new ArrayList<>();
- for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext(); )
- issues.add(it.next());
+ var issues = selectionColumn.getSelections().stream()
+ .map(it->it.getObject()).collect(toList());
getWatchManager().setWatchStatus(SecurityUtils.getUser(), issues, watchStatus);
+ selectionColumn.getSelections().clear();
Session.get().success("Watch status changed");
}
-
};
}
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(issuesTable.getItemCount() != 0);
+ setEnabled(!selectionColumn.getSelections().isEmpty());
}
@Override
@@ -1007,14 +952,15 @@ public abstract class IssueListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "No issues to watch/unwatch");
+ tag.put("title", "Please select issues to watch/unwatch");
}
}
+
};
}
});
-
+
if (getProject() != null && getProject().isTimeTracking()
&& SecurityUtils.canManageIssues(getProject())
&& WicketUtils.isSubscriptionActive()) {
@@ -1371,6 +1317,102 @@ public abstract class IssueListPanel extends Panel {
});
}
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Watch/Unwatch All Queried Issues";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new DropdownLink(id) {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown2) {
+ return new WatchStatusPanel(id) {
+
+ @Override
+ protected WatchStatus getWatchStatus() {
+ return null;
+ }
+
+ @Override
+ protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {
+ dropdown.close();
+ dropdown2.close();
+
+ Collection<Issue> issues = new ArrayList<>();
+ for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext(); )
+ issues.add(it.next());
+ getWatchManager().setWatchStatus(SecurityUtils.getUser(), issues, watchStatus);
+ Session.get().success("Watch status changed");
+ }
+
+ };
+ }
+
+ @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 watch/unwatch");
+ }
+ }
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Set All Queried Issues as Read";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @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 set as read");
+ }
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ var visitInfoManager = OneDev.getInstance(VisitInfoManager.class);
+ for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext(); )
+ visitInfoManager.visitIssue(SecurityUtils.getUser(), it.next());
+ target.add(body);
+ }
+
+ };
+ }
+
+ });
return menuItems;
}
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 bcd7454fb2..2912cf87e3 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
@@ -7,10 +7,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestLabel;
-import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.*;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.search.entity.EntitySort;
@@ -49,6 +46,7 @@ import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.*;
+import io.onedev.server.xodus.VisitInfoManager;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
@@ -627,6 +625,47 @@ public abstract class PullRequestListPanel extends Panel {
});
}
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Set All Queried Pull Requests as Read";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @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 set as read");
+ }
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ var visitInfoManager = OneDev.getInstance(VisitInfoManager.class);
+ for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext(); )
+ visitInfoManager.visitPullRequest(SecurityUtils.getUser(), it.next());
+ target.add(body);
+ }
+
+ };
+ }
+
+ });
return menuItems;
}