Skip to content

The Unified and Autonomous Development Platform

Refactor issue notification to send less mail

Robin Shen087a20499323
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java b/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java
index d33dc81d4c..5da253f584 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java
@@ -29,16 +29,6 @@ public class IssueActionEvent extends IssueEvent implements MarkdownAware {
return action.getDate();
}
- @Override
- public String getTitle() {
- return action.getData().getTitle(action, true);
- }
-
- @Override
- public String describeAsHtml() {
- return action.getData().describeAsHtml(action);
- }
-
@Override
public String getMarkdown() {
if (action.getData().getCommentSupport() != null)
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueCommented.java b/core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
index 8557155cf2..9e50f80924 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
@@ -34,17 +34,4 @@ public class IssueCommented extends IssueEvent implements MarkdownAware {
return comment.getDate();
}
- @Override
- public String getTitle() {
- return String.format("[Commented] Issue #%d: %s", getIssue().getNumber(), getIssue().getTitle());
- }
-
- @Override
- public String describeAsHtml() {
- StringBuilder builder = new StringBuilder(String.format("<b>%s added new comment</b>", escape(getUser().getDisplayName())));
- builder.append("<p style='margin: 16px 0;'>");
- builder.append(escape(comment.getContent()));
- return builder.toString();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueEvent.java b/core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
index b4662ef9f1..ef401c7395 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueEvent.java
@@ -2,10 +2,6 @@ package io.onedev.server.event.issue;
import java.util.Date;
-import javax.annotation.Nullable;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
@@ -25,13 +21,4 @@ public abstract class IssueEvent {
public abstract Date getDate();
- public abstract String getTitle();
-
- protected String escape(String content) {
- return OneDev.getInstance(MarkdownManager.class).escape(content);
- }
-
- @Nullable
- public abstract String describeAsHtml();
-
}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
index 968941f117..46ba75f406 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
@@ -27,14 +27,4 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {
return getIssue().getSubmitDate();
}
- @Override
- public String getTitle() {
- return String.format("[%s] Issue #%d: %s", getIssue().getState(), getIssue().getNumber(), getIssue().getTitle());
- }
-
- @Override
- public String describeAsHtml() {
- return String.format("<b>%s opened new issue</b>", escape(getUser().getDisplayName()));
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
index e0b71c7f5a..ce534fb9a3 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
@@ -1,8 +1,10 @@
package io.onedev.server.manager.impl;
import java.util.Collection;
+import java.util.Date;
import java.util.HashSet;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -17,6 +19,7 @@ import io.onedev.server.manager.IssueWatchManager;
import io.onedev.server.manager.MailManager;
import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.manager.UrlManager;
+import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueAction;
@@ -42,52 +45,24 @@ public class DefaultIssueNotificationManager {
private final IssueWatchManager issueWatchManager;
+ private final UserInfoManager userInfoManager;
+
@Inject
public DefaultIssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,
- UrlManager urlManager, IssueWatchManager issueWatchManager) {
+ UrlManager urlManager, IssueWatchManager issueWatchManager, UserInfoManager userInfoManager) {
this.mailManager = mailManager;
this.urlManager = urlManager;
this.markdownManager = markdownManager;
this.issueWatchManager = issueWatchManager;
- }
-
- private String getUrl(IssueEvent event) {
- if (event instanceof IssueOpened)
- return urlManager.urlFor(((IssueOpened)event).getIssue());
- else if (event instanceof IssueCommented)
- return urlManager.urlFor(((IssueCommented)event).getComment());
- else if (event instanceof IssueActionEvent)
- return urlManager.urlFor(((IssueActionEvent)event).getAction());
- else
- return urlManager.urlFor(event.getIssue());
- }
-
- private void appendParagraph(StringBuilder builder) {
- builder.append("<p style='margin: 16px 0;'>");
- }
-
- private void appendIssueInfo(StringBuilder builder, IssueEvent event) {
- Issue issue = event.getIssue();
- builder.append("<div style='border: 1px solid #E0E0E0; background: #F9F9F9; padding: 16px; border-radius: 4px;'>");
- builder.append(String.format("<a href='%s'>Issue #%d: %s</a>",
- getUrl(event), issue.getNumber(), issue.getTitle()));
- if (event.getIssue().getDescription() != null) {
- appendParagraph(builder);
- builder.append(markdownManager.escape(event.getIssue().getDescription()));
- }
- builder.append("</div>");
+ this.userInfoManager = userInfoManager;
}
@Transactional
@Listen
public void on(IssueEvent event) {
- Collection<User> involvedUsers = new HashSet<>();
- Collection<User> notifiedUsers = new HashSet<>();
-
- involvedUsers.add(event.getUser());
-
Issue issue = event.getIssue();
-
+ User user = event.getUser();
+
for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
@Override
@@ -114,60 +89,77 @@ public class DefaultIssueNotificationManager {
watch(issue, entry.getKey(), entry.getValue());
}
- if (event instanceof IssueActionEvent) {
- IssueAction issueAction = ((IssueActionEvent) event).getAction();
- for (Group group: issueAction.getData().getNewGroups().values())
- involvedUsers.addAll(group.getMembers());
- for (Map.Entry<String, User> entry: issueAction.getData().getNewUsers().entrySet()) {
- String subject = String.format("You are designated as \"%s\" of issue #%d: %s",
- entry.getKey(), issue.getNumber(), issue.getTitle());
- StringBuilder body = new StringBuilder();
- body.append(event.describeAsHtml());
- appendParagraph(body);
- appendIssueInfo(body, event);
- mailManager.sendMailAsync(Lists.newArrayList(entry.getValue().getEmail()), subject, body.toString());
- notifiedUsers.add(entry.getValue());
- }
- }
+ if (user != null)
+ watch(issue, user, true);
+ Collection<User> notifiedUsers = new HashSet<>();
if (event instanceof MarkdownAware) {
MarkdownAware markdownAware = (MarkdownAware) event;
String markdown = markdownAware.getMarkdown();
if (markdown != null) {
String rendered = markdownManager.render(markdown);
- Collection<User> mentionedUsers = new MentionParser().parseMentions(rendered);
- mentionedUsers.removeAll(notifiedUsers);
- for (User user: mentionedUsers) {
- String subject = String.format("You are mentioned in issue #%d: %s",
+ Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);
+ if (!mentionUsers.isEmpty()) {
+ for (User mentionedUser: mentionUsers)
+ watch(issue, mentionedUser, true);
+
+ String url;
+ if (event instanceof IssueOpened)
+ url = urlManager.urlFor(((IssueOpened)event).getIssue());
+ else if (event instanceof IssueCommented)
+ url = urlManager.urlFor(((IssueCommented)event).getComment());
+ else if (event instanceof IssueActionEvent)
+ url = urlManager.urlFor(((IssueActionEvent)event).getAction());
+ else
+ url = urlManager.urlFor(event.getIssue());
+
+ String subject = String.format("You are mentioned in issue #%d - %s",
issue.getNumber(), issue.getTitle());
- StringBuilder body = new StringBuilder();
- body.append(event.describeAsHtml());
- appendParagraph(body);
- appendIssueInfo(body, event);
- mailManager.sendMailAsync(Lists.newArrayList(user.getEmail()), subject, body.toString());
- notifiedUsers.add(user);
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+
+ mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ subject, body);
+ notifiedUsers.addAll(mentionUsers);
}
}
}
- involvedUsers.addAll(notifiedUsers);
- for (User user: involvedUsers)
- watch(issue, user, true);
-
+ if (event instanceof IssueActionEvent) {
+ IssueAction issueAction = ((IssueActionEvent) event).getAction();
+ for (Group group: issueAction.getData().getNewGroups().values()) {
+ for (User member: group.getMembers())
+ watch(issue, member, true);
+ }
+ String url = urlManager.urlFor(issue);
+ for (Map.Entry<String, User> entry: issueAction.getData().getNewUsers().entrySet()) {
+ String subject = String.format("You are designated as \"%s\" of issue #%d: %s",
+ entry.getKey(), issue.getNumber(), issue.getTitle());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(Lists.newArrayList(entry.getValue().getEmail()), subject, body.toString());
+ notifiedUsers.add(entry.getValue());
+ }
+ }
+
Collection<User> usersToNotify = new HashSet<>();
+
for (IssueWatch watch: issue.getWatches()) {
- if (watch.isWatching() && !watch.getUser().equals(event.getUser())
- && !notifiedUsers.contains(watch.getUser())) {
+ Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
+ if (watch.isWatching()
+ && !userInfoManager.isNotified(watch.getUser(), watch.getIssue())
+ && !watch.getUser().equals(event.getUser())
+ && (visitDate == null || visitDate.getTime()<event.getDate().getTime())
+ && !notifiedUsers.contains(watch.getUser())) {
usersToNotify.add(watch.getUser());
+ userInfoManager.setIssueNotified(watch.getUser(), watch.getIssue(), true);
+ issueWatchManager.save(watch);
}
}
-
- for (User user: usersToNotify) {
- StringBuilder body = new StringBuilder();
- body.append(event.describeAsHtml());
- appendParagraph(body);
- appendIssueInfo(body, event);
- mailManager.sendMailAsync(Lists.newArrayList(user.getEmail()), event.getTitle(), body.toString());
+
+ if (!usersToNotify.isEmpty()) {
+ String url = urlManager.urlFor(issue);
+ String subject = String.format("New activities in issue #%d - %s", issue.getNumber(), issue.getTitle());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java
index ef29427676..7ee31e3d1a 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java
@@ -1,7 +1,6 @@
package io.onedev.server.model.support.issue.changedata;
import java.io.Serializable;
-import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
@@ -12,18 +11,16 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.IssueAction;
import io.onedev.server.model.User;
import io.onedev.server.model.support.CommentSupport;
+import io.onedev.server.model.support.DiffSupport;
public interface ActionData extends Serializable {
Component render(String componentId, IssueAction action);
- String getTitle(IssueAction action, boolean external);
-
- String describeAsHtml(IssueAction action);
-
- List<String> getOldLines();
-
- List<String> getNewLines();
+ String getDescription();
+
+ @Nullable
+ DiffSupport getDiffSupport();
@Nullable
CommentSupport getCommentSupport();
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java
index 3c3a72fb6f..9d54e30220 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java
@@ -7,16 +7,11 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.util.lang.Objects;
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.MarkdownManager;
-import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueAction;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.support.CommentSupport;
import io.onedev.server.model.support.issue.IssueField;
-import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.ActionDataPanel;
-import io.onedev.utils.HtmlUtils;
public class BatchUpdateData extends FieldChangeData {
@@ -100,37 +95,15 @@ public class BatchUpdateData extends FieldChangeData {
private static final long serialVersionUID = 1L;
@Override
- protected BatchUpdateData getChangeData() {
- return BatchUpdateData.this;
- }
-
- @Override
- protected IssueAction getChange() {
+ protected IssueAction getAction() {
return action;
}
};
}
@Override
- public String getTitle(IssueAction action, boolean external) {
- Issue issue = action.getIssue();
- if (external)
- return String.format("[Batch Edited] Issue #%d: %s", issue.getNumber(), issue.getTitle());
- else
- return "batch edited";
+ public String getDescription() {
+ return "batch edited";
}
- @Override
- public String describeAsHtml(IssueAction change) {
- String escapedName = HtmlUtils.escapeHtml(change.getUser().getDisplayName());
- StringBuilder builder = new StringBuilder(String.format("<b>%s batch edited</b>", escapedName));
- builder.append("<p style='margin: 16px 0;'>");
- builder.append(DiffUtils.diffAsHtml(getOldLines(), null, getNewLines(), null, true));
- if (comment != null) {
- builder.append("<p style='margin: 16px 0;'>");
- builder.append(OneDev.getInstance(MarkdownManager.class).escape(comment));
- }
- return builder.toString();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java
index 6eb477cc67..1996f87288 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java
@@ -12,15 +12,13 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Group;
-import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueAction;
import io.onedev.server.model.User;
import io.onedev.server.model.support.CommentSupport;
+import io.onedev.server.model.support.DiffSupport;
import io.onedev.server.model.support.issue.IssueField;
-import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-import io.onedev.utils.HtmlUtils;
import io.onedev.utils.StringUtils;
public class FieldChangeData implements ActionData {
@@ -84,16 +82,12 @@ public class FieldChangeData implements ActionData {
@Override
public Component render(String componentId, IssueAction action) {
- return new PlainDiffPanel(componentId, oldLines, null, newLines, null, true);
+ return new PlainDiffPanel(componentId, oldLines, "a.txt", newLines, "b.txt", true);
}
@Override
- public String getTitle(IssueAction action, boolean external) {
- Issue issue = action.getIssue();
- if (external)
- return String.format("[Fields Changed] Issue #%d: %s", issue.getNumber(), issue.getTitle());
- else
- return "changed fields";
+ public String getDescription() {
+ return "changed fields";
}
public List<String> getLines(Map<String, IssueField> fields) {
@@ -103,26 +97,38 @@ public class FieldChangeData implements ActionData {
return lines;
}
- @Override
- public String describeAsHtml(IssueAction action) {
- String escaped = HtmlUtils.escapeHtml(action.getUser().getDisplayName());
- StringBuilder builder = new StringBuilder(String.format("<b>%s changed fields</b>", escaped));
- builder.append("<p style='margin: 16px 0;'>");
- builder.append(DiffUtils.diffAsHtml(oldLines, null, newLines, null, true));
- return builder.toString();
- }
-
@Override
public CommentSupport getCommentSupport() {
return null;
}
- public List<String> getOldLines() {
- return oldLines;
- }
+ @Override
+ public DiffSupport getDiffSupport() {
+ return new DiffSupport() {
+
+ private static final long serialVersionUID = 1L;
- public List<String> getNewLines() {
- return newLines;
+ @Override
+ public List<String> getOldLines() {
+ return oldLines;
+ }
+
+ @Override
+ public List<String> getNewLines() {
+ return newLines;
+ }
+
+ @Override
+ public String getOldFileName() {
+ return "a.txt";
+ }
+
+ @Override
+ public String getNewFileName() {
+ return "b.txt";
+ }
+
+ };
}
@Override
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java
index 34f0c0c21e..e626a9e562 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java
@@ -10,14 +10,12 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import io.onedev.server.model.Group;
-import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueAction;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.User;
import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.util.diff.DiffUtils;
+import io.onedev.server.model.support.DiffSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-import io.onedev.utils.HtmlUtils;
public class MilestoneChangeData implements ActionData {
@@ -34,11 +32,10 @@ public class MilestoneChangeData implements ActionData {
@Override
public Component render(String componentId, IssueAction action) {
- return new PlainDiffPanel(componentId, getOldLines(), null, getNewLines(), null, true);
+ return new PlainDiffPanel(componentId, getOldLines(), "a.txt", getNewLines(), "b.txt", true);
}
- @Override
- public List<String> getOldLines() {
+ private List<String> getOldLines() {
List<String> oldLines = new ArrayList<>();
if (oldMilestone != null)
oldLines.add("Milestone: " + oldMilestone);
@@ -47,8 +44,7 @@ public class MilestoneChangeData implements ActionData {
return oldLines;
}
- @Override
- public List<String> getNewLines() {
+ private List<String> getNewLines() {
List<String> newLines = new ArrayList<>();
if (newMilestone != null)
newLines.add("Milestone: " + newMilestone);
@@ -57,6 +53,35 @@ public class MilestoneChangeData implements ActionData {
return newLines;
}
+ @Override
+ public DiffSupport getDiffSupport() {
+ return new DiffSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<String> getOldLines() {
+ return getOldLines();
+ }
+
+ @Override
+ public List<String> getNewLines() {
+ return getNewLines();
+ }
+
+ @Override
+ public String getOldFileName() {
+ return "a.txt";
+ }
+
+ @Override
+ public String getNewFileName() {
+ return "b.txt";
+ }
+
+ };
+ }
+
public String getOldMilestone() {
return oldMilestone;
}
@@ -66,21 +91,8 @@ public class MilestoneChangeData implements ActionData {
}
@Override
- public String getTitle(IssueAction action, boolean external) {
- Issue issue = action.getIssue();
- if (external)
- return String.format("[Milestone Changed] Issue #%d: %s", issue.getNumber(), issue.getTitle());
- else
- return "changed milestone";
- }
-
- @Override
- public String describeAsHtml(IssueAction action) {
- String escaped = HtmlUtils.escapeHtml(action.getUser().getDisplayName());
- StringBuilder builder = new StringBuilder(String.format("<b>%s changed milestone</b>", escaped));
- builder.append("<p style='margin: 16px 0;'>");
- builder.append(DiffUtils.diffAsHtml(getOldLines(), null, getNewLines(), null, true));
- return builder.toString();
+ public String getDescription() {
+ return "changed milestone";
}
@Override
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java
index 7b714da407..cb61d697ae 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java
@@ -6,15 +6,10 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.MarkdownManager;
-import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueAction;
import io.onedev.server.model.support.CommentSupport;
import io.onedev.server.model.support.issue.IssueField;
-import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.ActionDataPanel;
-import io.onedev.utils.HtmlUtils;
public class StateChangeData extends FieldChangeData {
@@ -71,37 +66,15 @@ public class StateChangeData extends FieldChangeData {
private static final long serialVersionUID = 1L;
@Override
- protected StateChangeData getChangeData() {
- return StateChangeData.this;
- }
-
- @Override
- protected IssueAction getChange() {
+ protected IssueAction getAction() {
return action;
}
};
}
@Override
- public String getTitle(IssueAction action, boolean external) {
- Issue issue = action.getIssue();
- if (external)
- return String.format("[%s] Issue #%d: %s", newState, issue.getNumber(), issue.getTitle());
- else
- return "changed state";
+ public String getDescription() {
+ return "changed state";
}
- @Override
- public String describeAsHtml(IssueAction change) {
- String escapedName = HtmlUtils.escapeHtml(change.getUser().getDisplayName());
- StringBuilder builder = new StringBuilder(String.format("<b>%s changed state</b>", escapedName));
- builder.append("<p style='margin: 16px 0;'>");
- builder.append(DiffUtils.diffAsHtml(getOldLines(), null, getNewLines(), null, true));
- if (comment != null) {
- builder.append("<p style='margin: 16px 0;'>");
- builder.append(OneDev.getInstance(MarkdownManager.class).escape(comment));
- }
- return builder.toString();
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java
index 41c9087c6c..2974405318 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java
@@ -7,13 +7,11 @@ import java.util.Map;
import org.apache.wicket.Component;
import io.onedev.server.model.Group;
-import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueAction;
import io.onedev.server.model.User;
import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.util.diff.DiffUtils;
+import io.onedev.server.model.support.DiffSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-import io.onedev.utils.HtmlUtils;
import jersey.repackaged.com.google.common.collect.Lists;
public class TitleChangeData implements ActionData {
@@ -35,31 +33,37 @@ public class TitleChangeData implements ActionData {
}
@Override
- public List<String> getOldLines() {
- return Lists.newArrayList(oldTitle);
- }
+ public DiffSupport getDiffSupport() {
+ return new DiffSupport() {
- @Override
- public List<String> getNewLines() {
- return Lists.newArrayList(newTitle);
- }
-
- @Override
- public String getTitle(IssueAction action, boolean external) {
- Issue issue = action.getIssue();
- if (external)
- return String.format("[Title Changed] Issue #%d: %s", issue.getNumber(), issue.getTitle());
- else
- return "changed title";
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<String> getOldLines() {
+ return Lists.newArrayList(oldTitle);
+ }
+
+ @Override
+ public List<String> getNewLines() {
+ return Lists.newArrayList(newTitle);
+ }
+
+ @Override
+ public String getOldFileName() {
+ return "a.txt";
+ }
+
+ @Override
+ public String getNewFileName() {
+ return "b.txt";
+ }
+
+ };
}
@Override
- public String describeAsHtml(IssueAction action) {
- String escaped = HtmlUtils.escapeHtml(action.getUser().getDisplayName());
- StringBuilder builder = new StringBuilder(String.format("<b>%s changed title</b>", escaped));
- builder.append("<p style='margin: 16px 0;'>");
- builder.append(DiffUtils.diffAsHtml(Lists.newArrayList(oldTitle), "a.txt", Lists.newArrayList(newTitle), "b.txt", true));
- return builder.toString();
+ public String getDescription() {
+ return "changed title";
}
@Override
diff --git a/core/src/main/java/io/onedev/server/security/SecurityUtils.java b/core/src/main/java/io/onedev/server/security/SecurityUtils.java
index bcdef51711..fdaed245a9 100644
--- a/core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -15,6 +15,7 @@ import io.onedev.server.manager.UserManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueAction;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -141,12 +142,21 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
}
- public static boolean canModify(PullRequestAction statusChange) {
+ public static boolean canModify(PullRequestAction action) {
User currentUser = getUser();
if (currentUser == null) {
return false;
} else {
- return currentUser.equals(statusChange.getUser()) || canModify(statusChange.getRequest());
+ return currentUser.equals(action.getUser()) || canModify(action.getRequest());
+ }
+ }
+
+ public static boolean canModify(IssueAction action) {
+ User currentUser = getUser();
+ if (currentUser == null) {
+ return false;
+ } else {
+ return currentUser.equals(action.getUser()) || canModify(action.getIssue());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.html
index 166a1af720..92f5339477 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.html
@@ -1,21 +1,6 @@
<wicket:panel>
- <div class="change-data">
- <div wicket:id="fields"></div>
+ <div class="action-data">
+ <div wicket:id="diff"></div>
<div wicket:id="comment"></div>
</div>
- <wicket:fragment wicket:id="viewFrag">
- <div wicket:id="content"></div>
- <div wicket:id="actions" class="actions">
- <a wicket:id="edit">Edit</a>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="editFrag">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="input"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>
- <button wicket:id="cancel" class="btn btn-sm btn-default">Cancel</button>
- </div>
- </form>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.java
index 033342e5d9..fed0576696 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionDataPanel.java
@@ -1,164 +1,92 @@
package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
-import java.util.ArrayList;
-import java.util.List;
-
-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.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueActionManager;
-import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueAction;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.changedata.ActionData;
+import io.onedev.server.model.support.DiffSupport;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.component.projectcomment.CommentInput;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.projectcomment.ProjectCommentPanel;
+import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-
@SuppressWarnings("serial")
public abstract class ActionDataPanel extends Panel {
+ private static final String DIFF_ID = "diff";
+
private static final String COMMENT_ID = "comment";
public ActionDataPanel(String id) {
super(id);
}
- private Component newViewer() {
- Fragment viewer = new Fragment(COMMENT_ID, "viewFrag", this);
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
- if (StringUtils.isNotBlank(getChangeData().getCommentSupport().getComment())) {
- viewer.add(new MarkdownViewer("content", new IModel<String>() {
+ DiffSupport diffSupport = getAction().getData().getDiffSupport();
+ if (diffSupport != null)
+ add(new PlainDiffPanel(DIFF_ID, diffSupport.getOldLines(), "a.txt", diffSupport.getNewLines(), "b.txt", true));
+ else
+ add(new WebMarkupContainer(DIFF_ID).setVisible(false));
+
+ if (getAction().getData().getCommentSupport() != null) {
+ add(new ProjectCommentPanel(COMMENT_ID) {
@Override
- public String getObject() {
- return getChangeData().getCommentSupport().getComment();
+ protected String getComment() {
+ return getAction().getData().getCommentSupport().getComment();
}
@Override
- public void detach() {
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ getAction().getData().getCommentSupport().setComment(comment);
+ OneDev.getInstance(IssueActionManager.class).save(getAction());
}
@Override
- public void setObject(String object) {
- getChangeData().getCommentSupport().setComment(object);
- getChange().setData(getChangeData());
- OneDev.getInstance(IssueActionManager.class).save(getChange());
+ protected Project getProject() {
+ return getAction().getIssue().getProject();
}
- }, null));
- } else {
- viewer.add(new Label("content", "<i>No comment</i>").setEscapeModelStrings(false));
- }
-
- WebMarkupContainer actions = new WebMarkupContainer("actions");
- actions.setVisible(SecurityUtils.canModify(getIssue()));
- actions.add(new AjaxLink<Void>("edit") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Fragment editor = new Fragment(COMMENT_ID, "editFrag", ActionDataPanel.this);
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
- editor.add(form);
-
- CommentInput input = new CommentInput("input", Model.of(getChangeData().getCommentSupport().getComment()), false) {
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getIssue().getProject(), getIssue().getUUID());
- }
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getAction().getIssue().getUUID());
+ }
- @Override
- protected Project getProject() {
- return getIssue().getProject();
- }
-
- };
- form.add(input);
-
- form.add(new AjaxButton("save") {
+ @Override
+ protected boolean canManageComment() {
+ return SecurityUtils.canModify(getAction());
+ }
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- getChangeData().getCommentSupport().setComment(input.getModelObject());
- getChange().setData(getChangeData());
- OneDev.getInstance(IssueActionManager.class).save(getChange());
+ @Override
+ protected String getRequiredLabel() {
+ return null;
+ }
- Component viewer = newViewer();
- editor.replaceWith(viewer);
- target.add(viewer);
- }
-
- });
-
- form.add(new AjaxLink<Void>("cancel") {
+ @Override
+ protected ContentVersionSupport getContentVersionSupport() {
+ return null;
+ }
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Component viewer = newViewer();
- editor.replaceWith(viewer);
- target.add(viewer);
- }
-
- });
+ @Override
+ protected DeleteCallback getDeleteCallback() {
+ return null;
+ }
- editor.setOutputMarkupId(true);
- viewer.replaceWith(editor);
- target.add(editor);
- }
-
- });
-
- viewer.add(actions);
-
- viewer.setOutputMarkupId(true);
- return viewer;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<String> oldLines = new ArrayList<>(getChangeData().getOldLines());
- List<String> newLines = new ArrayList<>(getChangeData().getNewLines());
- add(new PlainDiffPanel("fields", oldLines, null, newLines, null, true).setVisible(!oldLines.equals(newLines)));
-
- if (getChangeData().getCommentSupport() != null)
- add(newViewer());
- else
+ });
+ } else {
add(new WebMarkupContainer(COMMENT_ID).setVisible(false));
+ }
}
- private Issue getIssue() {
- return getChange().getIssue();
- }
-
- protected abstract ActionData getChangeData();
-
- protected abstract IssueAction getChange();
+ protected abstract IssueAction getAction();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionPanel.html
index 6edc058288..08c1dda506 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div class="change activity">
+ <div class="action activity">
<div class="head">
- <span wicket:id="user" class="user"></span> <span wicket:id="title"></span> <span wicket:id="age"></span>
+ <span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
</div>
<div wicket:id="body" class="body"></div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionPanel.java
index dc62856094..52d94f7105 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActionPanel.java
@@ -20,13 +20,13 @@ class ActionPanel extends GenericPanel<IssueAction> {
protected void onInitialize() {
super.onInitialize();
- IssueAction change = getModelObject();
- User userForDisplay = User.getForDisplay(change.getUser(), change.getUserName());
+ IssueAction action = getModelObject();
+ User userForDisplay = User.getForDisplay(action.getUser(), action.getUserName());
add(new UserLink("user", userForDisplay));
- add(new Label("title", change.getData().getTitle(change, false)));
- add(new Label("age", DateUtils.formatAge(change.getDate())));
+ add(new Label("description", action.getData().getDescription()));
+ add(new Label("age", DateUtils.formatAge(action.getDate())));
- add(change.getData().render("body", change));
+ add(action.getData().render("body", action));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.html
index ad52ba85fd..edcc676b81 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.html
@@ -7,22 +7,4 @@
</div>
<div wicket:id="body" class="body"></div>
</div>
- <wicket:fragment wicket:id="viewFrag">
- <div wicket:id="content"></div>
- <div wicket:id="actions" class="actions">
- <a wicket:id="edit">Edit</a>
- <span class="middot"></span>
- <a wicket:id="delete">Delete</a>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="editFrag">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="feedback" class="feedback"></div>
- <div wicket:id="input"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>
- <button wicket:id="cancel" class="btn btn-sm btn-default">Cancel</button>
- </div>
- </form>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java
index 64aa934bc8..84967ae2e6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java
@@ -1,19 +1,10 @@
package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
-import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.model.IssueComment;
@@ -23,12 +14,10 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.component.projectcomment.CommentInput;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.projectcomment.ProjectCommentPanel;
import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
@SuppressWarnings("serial")
class CommentedPanel extends GenericPanel<IssueComment> {
@@ -47,129 +36,53 @@ class CommentedPanel extends GenericPanel<IssueComment> {
add(new UserLink("user", User.getForDisplay(getComment().getUser(), getComment().getUserName())));
add(new Label("age", DateUtils.formatAge(getComment().getDate())));
- add(newViewer());
-
- setOutputMarkupId(true);
- }
-
- private Component newViewer() {
- Fragment viewer = new Fragment("body", "viewFrag", this);
-
- viewer.add(new MarkdownViewer("content", new IModel<String>() {
+ add(new ProjectCommentPanel("body") {
@Override
- public String getObject() {
- return getComment().getContent();
+ protected String getComment() {
+ return CommentedPanel.this.getComment().getContent();
}
@Override
- public void detach() {
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ CommentedPanel.this.getComment().setContent(comment);
+ OneDev.getInstance(IssueCommentManager.class).save(CommentedPanel.this.getComment());
}
@Override
- public void setObject(String object) {
- getComment().setContent(object);
- OneDev.getInstance(IssueCommentManager.class).save(getComment());
+ protected Project getProject() {
+ return CommentedPanel.this.getComment().getIssue().getProject();
}
-
- }, null));
-
- WebMarkupContainer actions = new WebMarkupContainer("actions");
- actions.setVisible(SecurityUtils.canModify(getComment()));
-
- actions.add(new AjaxLink<Void>("edit") {
@Override
- public void onClick(AjaxRequestTarget target) {
- Fragment editor = new Fragment("body", "editFrag", CommentedPanel.this);
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
- editor.add(form);
- NotificationPanel feedback = new NotificationPanel("feedback", form);
- feedback.setOutputMarkupPlaceholderTag(true);
- form.add(feedback);
- CommentInput input = new CommentInput("input", Model.of(getComment().getContent()), false) {
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getComment().getIssue().getUUID());
- }
-
- @Override
- protected Project getProject() {
- return getComment().getIssue().getProject();
- }
-
- };
- input.setRequired(true).setLabel(Model.of("Comment"));
- form.add(input);
-
- form.add(new AjaxSubmitLink("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- IssueComment comment = getComment();
- comment.setContent(input.getModelObject());
- OneDev.getInstance(IssueCommentManager.class).save(comment);
-
- Component viewer = newViewer();
- editor.replaceWith(viewer);
- target.add(viewer);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(feedback);
- }
-
- });
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Component viewer = newViewer();
- editor.replaceWith(viewer);
- target.add(viewer);
- }
-
- });
-
- editor.setOutputMarkupId(true);
- viewer.replaceWith(editor);
- target.add(editor);
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(CommentedPanel.this.getComment().getIssue().getProject(),
+ CommentedPanel.this.getComment().getIssue().getUUID());
}
- });
-
- actions.add(new AjaxLink<Void>("delete") {
+ @Override
+ protected boolean canManageComment() {
+ return SecurityUtils.canModify(CommentedPanel.this.getComment().getIssue());
+ }
@Override
- public void onClick(AjaxRequestTarget target) {
- OneDev.getInstance(IssueCommentManager.class).delete(getComment());
- deleteCallback.onDelete(target);
+ protected String getRequiredLabel() {
+ return "Comment";
}
-
+
@Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this comment?"));
+ protected ContentVersionSupport getContentVersionSupport() {
+ return null;
}
+ @Override
+ protected DeleteCallback getDeleteCallback() {
+ return deleteCallback;
+ }
+
});
-
- viewer.add(actions);
- viewer.setOutputMarkupId(true);
-
- return viewer;
+
+ setOutputMarkupId(true);
}
private IssueComment getComment() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.html
index 11dae5c6c4..01edde3ad7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.html
@@ -5,20 +5,4 @@
</div>
<div wicket:id="body" class="body"></div>
</div>
- <wicket:fragment wicket:id="viewFrag">
- <div wicket:id="content"></div>
- <div wicket:id="actions" class="actions">
- <a wicket:id="edit">Edit</a>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="editFrag">
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="feedback" class="feedback"></div>
- <div wicket:id="input"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware">Save</button>
- <button wicket:id="cancel" class="btn btn-sm btn-default">Cancel</button>
- </div>
- </form>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java
index f954c799f2..b2497559a1 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedPanel.java
@@ -1,21 +1,10 @@
package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;
-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.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.hibernate.StaleStateException;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
@@ -26,158 +15,76 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.component.projectcomment.CommentInput;
+import io.onedev.server.web.component.projectcomment.ProjectCommentPanel;
+import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
class OpenedPanel extends GenericPanel<Issue> {
- private static final String BODY_ID = "body";
-
public OpenedPanel(String id, IModel<Issue> model) {
super(id, model);
}
- private Component newViewer() {
- Fragment viewer = new Fragment(BODY_ID, "viewFrag", this);
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Issue issue = getIssue();
+ add(new UserLink("user", User.getForDisplay(issue.getSubmitter(), issue.getSubmitterName())));
+ add(new Label("age", DateUtils.formatAge(issue.getSubmitDate())));
- String description = getIssue().getDescription();
- if (StringUtils.isNotBlank(description)) {
- ContentVersionSupport contentVersionSupport;
- if (SecurityUtils.canModify(getIssue())) {
- contentVersionSupport = new ContentVersionSupport() {
+ add(new ProjectCommentPanel("body") {
- @Override
- public long getVersion() {
- return getIssue().getVersion();
- }
-
- };
- } else {
- contentVersionSupport = null;
+ @Override
+ protected String getComment() {
+ return getIssue().getDescription();
}
- viewer.add(new MarkdownViewer("content", new IModel<String>() {
- @Override
- public String getObject() {
- return getIssue().getDescription();
- }
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ getIssue().setDescription(comment);
+ OneDev.getInstance(IssueManager.class).save(getIssue());
+ }
- @Override
- public void detach() {
- }
+ @Override
+ protected Project getProject() {
+ return getIssue().getProject();
+ }
- @Override
- public void setObject(String object) {
- getIssue().setDescription(object);
- OneDev.getInstance(IssueManager.class).save(getIssue());
- }
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getIssue().getUUID());
+ }
- }, contentVersionSupport));
- } else {
- viewer.add(new Label("content", "<i>No description</i>").setEscapeModelStrings(false));
- }
-
- WebMarkupContainer actions = new WebMarkupContainer("actions");
- actions.setVisible(SecurityUtils.canModify(getIssue()));
- actions.add(new AjaxLink<Void>("edit") {
+ @Override
+ protected boolean canManageComment() {
+ return SecurityUtils.canModify(getIssue());
+ }
@Override
- public void onClick(AjaxRequestTarget target) {
- Fragment editor = new Fragment(BODY_ID, "editFrag", OpenedPanel.this);
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
- editor.add(form);
-
- NotificationPanel feedback = new NotificationPanel("feedback", form);
- feedback.setOutputMarkupPlaceholderTag(true);
- form.add(feedback);
-
- long lastVersion = getIssue().getVersion();
- CommentInput input = new CommentInput("input", Model.of(getIssue().getDescription()), false) {
+ protected String getRequiredLabel() {
+ return null;
+ }
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getIssue().getProject(), getIssue().getUUID());
- }
+ @Override
+ protected ContentVersionSupport getContentVersionSupport() {
+ return new ContentVersionSupport() {
@Override
- protected Project getProject() {
- return getIssue().getProject();
+ public long getVersion() {
+ return getIssue().getVersion();
}
};
- form.add(input);
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(feedback);
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- try {
- if (getIssue().getVersion() != lastVersion)
- throw new StaleStateException("");
- getIssue().setDescription(input.getModelObject());
- OneDev.getInstance(IssueManager.class).save(getIssue());
-
- Component viewer = newViewer();
- editor.replaceWith(viewer);
- target.add(viewer);
- } catch (StaleStateException e) {
- error("Some one changed the content you are editing. Reload the page and try again.");
- target.add(feedback);
- }
- }
-
- });
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Component viewer = newViewer();
- editor.replaceWith(viewer);
- target.add(viewer);
- }
-
- });
-
- editor.setOutputMarkupId(true);
- viewer.replaceWith(editor);
- target.add(editor);
}
+ @Override
+ protected DeleteCallback getDeleteCallback() {
+ return null;
+ }
+
});
-
- viewer.add(actions);
-
- viewer.setOutputMarkupId(true);
- return viewer;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Issue issue = getIssue();
- add(new UserLink("user", User.getForDisplay(issue.getSubmitter(), issue.getSubmitterName())));
- add(new Label("age", DateUtils.formatAge(issue.getSubmitDate())));
-
- add(newViewer());
}
private Issue getIssue() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css
index 4d0c2eff23..505c2085a2 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css
@@ -32,18 +32,18 @@
margin-top: 8px;
}
#issue-detail>.main>.activities .activity>.body>.actions,
-#issue-detail>.main>.activities .activity>.body>.change-data>div>.actions {
+#issue-detail>.main>.activities .activity>.body>.action-data>div>.actions {
margin-top: 8px;
}
#issue-detail>.main>.activities .activity>.body>.actions a,
-#issue-detail>.main>.activities .activity>.body>.change-data>div>.actions a {
+#issue-detail>.main>.activities .activity>.body>.action-data>div>.actions a {
color: #888;
margin-right: 0;
}
#issue-detail>.main>.activities .activity>.body .actions .middot {
margin: 0 4px;
}
-#issue-detail>.main>.activities .activity>.body .change-data .plain.diff {
+#issue-detail>.main>.activities .activity>.body .action-data .plain.diff {
margin-bottom: 12px;
}
#issue-detail>.main>.activities .activity>.head a {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionCommentPanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionCommentPanel.html
deleted file mode 100644
index 609d052824..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionCommentPanel.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:panel>
- <div wicket:id="comment"></div>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionCommentPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionCommentPanel.java
deleted file mode 100644
index 5c1eecf454..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionCommentPanel.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.requestdetail.activities.activity;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.PullRequestActionManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequestAction;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
-import io.onedev.server.web.component.projectcomment.ProjectCommentPanel;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-
-@SuppressWarnings("serial")
-public abstract class ActionCommentPanel extends Panel {
-
- public ActionCommentPanel(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new ProjectCommentPanel("comment") {
-
- @Override
- protected String getComment() {
- return getAction().getData().getCommentSupport().getComment();
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getAction().getData().getCommentSupport().setComment(comment);
- OneDev.getInstance(PullRequestActionManager.class).save(getAction());
- }
-
- @Override
- protected Project getProject() {
- return getAction().getRequest().getTargetProject();
- }
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getAction().getRequest().getUUID());
- }
-
- @Override
- protected boolean canManageComment() {
- return SecurityUtils.canModify(getAction());
- }
-
- @Override
- protected String getRequiredLabel() {
- return null;
- }
-
- @Override
- protected ContentVersionSupport getContentVersionSupport() {
- return null;
- }
-
- @Override
- protected DeleteCallback getDeleteCallback() {
- return null;
- }
-
- });
- }
-
- protected abstract PullRequestAction getAction();
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionDataPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionDataPanel.java
index 6751f2a0e0..e3752f2e82 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionDataPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/ActionDataPanel.java
@@ -1,23 +1,37 @@
package io.onedev.server.web.page.project.pullrequests.requestdetail.activities.activity;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.PullRequestActionManager;
+import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestAction;
import io.onedev.server.model.User;
import io.onedev.server.model.support.DiffSupport;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.web.component.markdown.AttachmentSupport;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.projectcomment.ProjectCommentPanel;
import io.onedev.server.web.page.project.pullrequests.requestdetail.activities.SinceChangesLink;
+import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
public abstract class ActionDataPanel extends Panel {
+ private static final String COMMENT_ID = "comment";
+
+ private static final String DIFF_ID = "diff";
+
public ActionDataPanel(String id) {
super(id);
}
@@ -30,25 +44,61 @@ public abstract class ActionDataPanel extends Panel {
if (getAction().getData().getCommentSupport() != null || getAction().getData().getDiffSupport() != null) {
fragment = new Fragment("content", "withCommentOrDiffFrag", this);
if (getAction().getData().getCommentSupport() != null) {
- fragment.add(new ActionCommentPanel("comment") {
+ fragment.add(new ProjectCommentPanel(COMMENT_ID) {
+
+ @Override
+ protected String getComment() {
+ return getAction().getData().getCommentSupport().getComment();
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ getAction().getData().getCommentSupport().setComment(comment);
+ OneDev.getInstance(PullRequestActionManager.class).save(getAction());
+ }
+
+ @Override
+ protected Project getProject() {
+ return getAction().getRequest().getTargetProject();
+ }
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getAction().getRequest().getUUID());
+ }
+
+ @Override
+ protected boolean canManageComment() {
+ return SecurityUtils.canModify(getAction());
+ }
+
+ @Override
+ protected String getRequiredLabel() {
+ return null;
+ }
+
+ @Override
+ protected ContentVersionSupport getContentVersionSupport() {
+ return null;
+ }
@Override
- protected PullRequestAction getAction() {
- return ActionDataPanel.this.getAction();
+ protected DeleteCallback getDeleteCallback() {
+ return null;
}
});
} else {
- fragment.add(new WebMarkupContainer("comment").setVisible(false));
+ fragment.add(new WebMarkupContainer(COMMENT_ID).setVisible(false));
}
DiffSupport diffSupport = getAction().getData().getDiffSupport();
if (diffSupport != null) {
- fragment.add(new PlainDiffPanel("diff",
+ fragment.add(new PlainDiffPanel(DIFF_ID,
diffSupport.getOldLines(), diffSupport.getOldFileName(),
diffSupport.getNewLines(), diffSupport.getNewFileName(),
true));
} else {
- fragment.add(new WebMarkupContainer("diff").setVisible(false));
+ fragment.add(new WebMarkupContainer(DIFF_ID).setVisible(false));
}
} else {
fragment = new Fragment("content", "withoutCommentAndDiffFrag", this);