Skip to content

The Unified and Autonomous Development Platform

Do not display issue description and pull request description change

Robin Shenedea7f027481
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 2b40f4843c..1047ed0c34 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -1,370 +1,371 @@
-package io.onedev.server.web.component.issue.activities;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.Cookie;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.http.WebResponse;
-
-import com.google.common.collect.Lists;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.entitymanager.IssueCommentManager;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.IssueComment;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
-import io.onedev.server.util.SecurityUtils;
-import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.issue.activities.activity.IssueActivity;
-import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;
-import io.onedev.server.web.component.issue.activities.activity.IssueCommentedActivity;
-import io.onedev.server.web.component.issue.activities.activity.IssueOpenedActivity;
-import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.user.ident.Mode;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-
-@SuppressWarnings("serial")
-public abstract class IssueActivitiesPanel extends Panel {
-
- private static final String COOKIE_SHOW_COMMENTS = "onedev.server.issue.showComments";
-
- private static final String COOKIE_SHOW_CHANGE_HISTORY = "onedev.server.issue.showChangeHistory";
-
- private RepeatingView activitiesView;
-
- private boolean showComments = true;
-
- private boolean showChangeHistory = true;
-
- public IssueActivitiesPanel(String panelId) {
- super(panelId);
-
- WebRequest request = (WebRequest) RequestCycle.get().getRequest();
- Cookie cookie = request.getCookie(COOKIE_SHOW_COMMENTS);
- if (cookie != null)
- showComments = Boolean.valueOf(cookie.getValue());
-
- cookie = request.getCookie(COOKIE_SHOW_CHANGE_HISTORY);
- if (cookie != null)
- showChangeHistory = Boolean.valueOf(cookie.getValue());
- }
-
- @Override
- protected void onBeforeRender() {
- activitiesView = new RepeatingView("activities");
- addOrReplace(activitiesView);
- Issue issue = getIssue();
-
- for (IssueActivity activity: getActivities()) {
- if (issue.isVisitedAfter(activity.getDate())) {
- activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));
- } else {
- Component row = newActivityRow(activitiesView.newChildId(), activity);
- row.add(AttributeAppender.append("class", "new"));
- activitiesView.add(row);
- }
- }
-
- super.onBeforeRender();
- }
-
- private List<IssueActivity> getActivities() {
- List<IssueActivity> activities = new ArrayList<>();
-
- activities.add(new IssueOpenedActivity(getIssue()));
-
- List<IssueActivity> otherActivities = new ArrayList<>();
- if (showComments) {
- for (IssueComment comment: getIssue().getComments())
- otherActivities.add(new IssueCommentedActivity(comment));
- }
-
- if (showChangeHistory) {
- for (IssueChange change: getIssue().getChanges()) {
- if (change.getData() instanceof IssueReferencedFromIssueData) {
- IssueReferencedFromIssueData referencedFromIssueData = (IssueReferencedFromIssueData) change.getData();
- Issue issue = OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId());
- if (issue != null)
- otherActivities.add(new IssueChangeActivity(change));
- } else if (change.getData() instanceof IssueReferencedFromPullRequestData) {
- IssueReferencedFromPullRequestData referencedFromPullRequestData = (IssueReferencedFromPullRequestData) change.getData();
- PullRequest request = OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId());
- if (request != null)
- otherActivities.add(new IssueChangeActivity(change));
- } else if (change.getData() instanceof IssueReferencedFromCodeCommentData) {
- IssueReferencedFromCodeCommentData referencedFromCodeCommentData = (IssueReferencedFromCodeCommentData) change.getData();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());
- if (comment != null)
- otherActivities.add(new IssueChangeActivity(change));
- } else {
- otherActivities.add(new IssueChangeActivity(change));
- }
- }
- }
-
- otherActivities.sort((o1, o2) -> {
- if (o1.getDate().getTime()<o2.getDate().getTime())
- return -1;
- else if (o1.getDate().getTime()>o2.getDate().getTime())
- return 1;
- else
- return 1;
- });
-
- activities.addAll(otherActivities);
-
- return activities;
- }
-
- private Component newActivityRow(String id, IssueActivity activity) {
- WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));
- row.setOutputMarkupId(true);
- String anchor = activity.getAnchor();
- if (anchor != null)
- row.setMarkupId(anchor);
-
- if (activity.getUser() != null) {
- row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));
- row.add(AttributeAppender.append("class", "with-avatar"));
- } else {
- row.add(new WebMarkupContainer("avatar").setVisible(false));
- }
-
- row.add(activity.render("content", new DeleteCallback() {
-
- @Override
- public void onDelete(AjaxRequestTarget target) {
- row.remove();
- target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));
- }
-
- }));
-
- row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));
- return row;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new WebSocketObserver() {
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- updateActivities(handler);
- }
-
- private void updateActivities(IPartialPageRequestHandler handler) {
- @SuppressWarnings("deprecation")
- Component prevActivityRow = activitiesView.get(activitiesView.size()-1);
- IssueActivity lastActivity = (IssueActivity) prevActivityRow.getDefaultModelObject();
- List<IssueActivity> newActivities = new ArrayList<>();
- for (IssueActivity activity: getActivities()) {
- if (activity.getDate().getTime() > lastActivity.getDate().getTime())
- newActivities.add(activity);
- }
-
- for (IssueActivity activity: newActivities) {
- Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
- newActivityRow.add(AttributeAppender.append("class", "new"));
- activitiesView.add(newActivityRow);
-
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());
- handler.prependJavaScript(script);
- handler.add(newActivityRow);
- prevActivityRow = newActivityRow;
- }
- }
-
- @Override
- public Collection<String> getObservables() {
- return Lists.newArrayList(Issue.getWebSocketObservable(getIssue().getId()));
- }
-
- });
-
- if (SecurityUtils.getUser() != null) {
- Fragment fragment = new Fragment("addComment", "addCommentFrag", this);
- fragment.setOutputMarkupId(true);
- CommentInput input = new CommentInput("comment", Model.of(""), false) {
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getIssue().getUUID());
- }
-
- @Override
- protected Project getProject() {
- return getIssue().getProject();
- }
-
- @Override
- protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getIssue().getParticipants());
- }
-
- @Override
- protected List<AttributeModifier> getInputModifiers() {
- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));
- }
-
- };
- input.setRequired(true).setLabel(Model.of("Comment"));
-
- Form<?> form = new Form<Void>("form");
- form.add(new NotificationPanel("feedback", form));
- form.add(input);
- form.add(new AjaxSubmitLink("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- IssueComment comment = new IssueComment();
- comment.setContent(input.getModelObject());
- comment.setUser(SecurityUtils.getUser());
- comment.setDate(new Date());
- comment.setIssue(getIssue());
- OneDev.getInstance(IssueCommentManager.class).save(comment);
-
- input.clearMarkdown();
-
- @SuppressWarnings("deprecation")
- Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
- Component newActivityRow = newActivityRow(activitiesView.newChildId(), new IssueCommentedActivity(comment));
- activitiesView.add(newActivityRow);
-
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());
- target.prependJavaScript(script);
- target.add(newActivityRow);
-
- target.add(fragment);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- form.setOutputMarkupId(true);
- fragment.add(form);
- add(fragment);
- } else {
- Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);
- fragment.add(new Link<Void>("login") {
-
- @Override
- public void onClick() {
- throw new RestartResponseAtInterceptPageException(LoginPage.class);
- }
-
- });
- add(fragment);
- }
-
- setOutputMarkupId(true);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new IssueActivitiesCssResourceReference()));
- }
-
- protected abstract Issue getIssue();
-
- public Component renderOptions(String componentId) {
- Fragment fragment = new Fragment(componentId, "optionsFrag", this);
- fragment.add(new AjaxLink<Void>("showComments") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (showComments)
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- showComments = !showComments;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(IssueActivitiesPanel.this);
- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
- }
-
- });
-
- fragment.add(new AjaxLink<Void>("showChangeHistory") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (showChangeHistory)
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- showChangeHistory = !showChangeHistory;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(IssueActivitiesPanel.this);
- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
- }
-
- });
-
- return fragment;
- }
-
-}
+package io.onedev.server.web.component.issue.activities;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.Cookie;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+
+import com.google.common.collect.Lists;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.entitymanager.IssueCommentManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.component.issue.activities.activity.IssueActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueCommentedActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueOpenedActivity;
+import io.onedev.server.web.component.markdown.AttachmentSupport;
+import io.onedev.server.web.component.project.comment.CommentInput;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
+
+@SuppressWarnings("serial")
+public abstract class IssueActivitiesPanel extends Panel {
+
+ private static final String COOKIE_SHOW_COMMENTS = "onedev.server.issue.showComments";
+
+ private static final String COOKIE_SHOW_CHANGE_HISTORY = "onedev.server.issue.showChangeHistory";
+
+ private RepeatingView activitiesView;
+
+ private boolean showComments = true;
+
+ private boolean showChangeHistory = true;
+
+ public IssueActivitiesPanel(String panelId) {
+ super(panelId);
+
+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();
+ Cookie cookie = request.getCookie(COOKIE_SHOW_COMMENTS);
+ if (cookie != null)
+ showComments = Boolean.valueOf(cookie.getValue());
+
+ cookie = request.getCookie(COOKIE_SHOW_CHANGE_HISTORY);
+ if (cookie != null)
+ showChangeHistory = Boolean.valueOf(cookie.getValue());
+ }
+
+ @Override
+ protected void onBeforeRender() {
+ activitiesView = new RepeatingView("activities");
+ addOrReplace(activitiesView);
+ Issue issue = getIssue();
+
+ for (IssueActivity activity: getActivities()) {
+ if (issue.isVisitedAfter(activity.getDate())) {
+ activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));
+ } else {
+ Component row = newActivityRow(activitiesView.newChildId(), activity);
+ row.add(AttributeAppender.append("class", "new"));
+ activitiesView.add(row);
+ }
+ }
+
+ super.onBeforeRender();
+ }
+
+ private List<IssueActivity> getActivities() {
+ List<IssueActivity> activities = new ArrayList<>();
+
+ activities.add(new IssueOpenedActivity(getIssue()));
+
+ List<IssueActivity> otherActivities = new ArrayList<>();
+ if (showComments) {
+ for (IssueComment comment: getIssue().getComments())
+ otherActivities.add(new IssueCommentedActivity(comment));
+ }
+
+ if (showChangeHistory) {
+ for (IssueChange change: getIssue().getChanges()) {
+ if (change.getData() instanceof IssueReferencedFromIssueData) {
+ IssueReferencedFromIssueData referencedFromIssueData = (IssueReferencedFromIssueData) change.getData();
+ Issue issue = OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId());
+ if (issue != null)
+ otherActivities.add(new IssueChangeActivity(change));
+ } else if (change.getData() instanceof IssueReferencedFromPullRequestData) {
+ IssueReferencedFromPullRequestData referencedFromPullRequestData = (IssueReferencedFromPullRequestData) change.getData();
+ PullRequest request = OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId());
+ if (request != null)
+ otherActivities.add(new IssueChangeActivity(change));
+ } else if (change.getData() instanceof IssueReferencedFromCodeCommentData) {
+ IssueReferencedFromCodeCommentData referencedFromCodeCommentData = (IssueReferencedFromCodeCommentData) change.getData();
+ CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());
+ if (comment != null)
+ otherActivities.add(new IssueChangeActivity(change));
+ } else if (!(change.getData() instanceof IssueDescriptionChangeData)) {
+ otherActivities.add(new IssueChangeActivity(change));
+ }
+ }
+ }
+
+ otherActivities.sort((o1, o2) -> {
+ if (o1.getDate().getTime()<o2.getDate().getTime())
+ return -1;
+ else if (o1.getDate().getTime()>o2.getDate().getTime())
+ return 1;
+ else
+ return 1;
+ });
+
+ activities.addAll(otherActivities);
+
+ return activities;
+ }
+
+ private Component newActivityRow(String id, IssueActivity activity) {
+ WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));
+ row.setOutputMarkupId(true);
+ String anchor = activity.getAnchor();
+ if (anchor != null)
+ row.setMarkupId(anchor);
+
+ if (activity.getUser() != null) {
+ row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));
+ row.add(AttributeAppender.append("class", "with-avatar"));
+ } else {
+ row.add(new WebMarkupContainer("avatar").setVisible(false));
+ }
+
+ row.add(activity.render("content", new DeleteCallback() {
+
+ @Override
+ public void onDelete(AjaxRequestTarget target) {
+ row.remove();
+ target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));
+ }
+
+ }));
+
+ row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));
+ return row;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new WebSocketObserver() {
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ updateActivities(handler);
+ }
+
+ private void updateActivities(IPartialPageRequestHandler handler) {
+ @SuppressWarnings("deprecation")
+ Component prevActivityRow = activitiesView.get(activitiesView.size()-1);
+ IssueActivity lastActivity = (IssueActivity) prevActivityRow.getDefaultModelObject();
+ List<IssueActivity> newActivities = new ArrayList<>();
+ for (IssueActivity activity: getActivities()) {
+ if (activity.getDate().getTime() > lastActivity.getDate().getTime())
+ newActivities.add(activity);
+ }
+
+ for (IssueActivity activity: newActivities) {
+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
+ newActivityRow.add(AttributeAppender.append("class", "new"));
+ activitiesView.add(newActivityRow);
+
+ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
+ newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());
+ handler.prependJavaScript(script);
+ handler.add(newActivityRow);
+ prevActivityRow = newActivityRow;
+ }
+ }
+
+ @Override
+ public Collection<String> getObservables() {
+ return Lists.newArrayList(Issue.getWebSocketObservable(getIssue().getId()));
+ }
+
+ });
+
+ if (SecurityUtils.getUser() != null) {
+ Fragment fragment = new Fragment("addComment", "addCommentFrag", this);
+ fragment.setOutputMarkupId(true);
+ CommentInput input = new CommentInput("comment", Model.of(""), false) {
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getIssue().getUUID());
+ }
+
+ @Override
+ protected Project getProject() {
+ return getIssue().getProject();
+ }
+
+ @Override
+ protected List<User> getMentionables() {
+ return OneDev.getInstance(UserManager.class).queryAndSort(getIssue().getParticipants());
+ }
+
+ @Override
+ protected List<AttributeModifier> getInputModifiers() {
+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));
+ }
+
+ };
+ input.setRequired(true).setLabel(Model.of("Comment"));
+
+ Form<?> form = new Form<Void>("form");
+ form.add(new NotificationPanel("feedback", form));
+ form.add(input);
+ form.add(new AjaxSubmitLink("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ IssueComment comment = new IssueComment();
+ comment.setContent(input.getModelObject());
+ comment.setUser(SecurityUtils.getUser());
+ comment.setDate(new Date());
+ comment.setIssue(getIssue());
+ OneDev.getInstance(IssueCommentManager.class).save(comment);
+
+ input.clearMarkdown();
+
+ @SuppressWarnings("deprecation")
+ Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), new IssueCommentedActivity(comment));
+ activitiesView.add(newActivityRow);
+
+ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
+ newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());
+ target.prependJavaScript(script);
+ target.add(newActivityRow);
+
+ target.add(fragment);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+ fragment.add(form);
+ add(fragment);
+ } else {
+ Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);
+ fragment.add(new Link<Void>("login") {
+
+ @Override
+ public void onClick() {
+ throw new RestartResponseAtInterceptPageException(LoginPage.class);
+ }
+
+ });
+ add(fragment);
+ }
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new IssueActivitiesCssResourceReference()));
+ }
+
+ protected abstract Issue getIssue();
+
+ public Component renderOptions(String componentId) {
+ Fragment fragment = new Fragment(componentId, "optionsFrag", this);
+ fragment.add(new AjaxLink<Void>("showComments") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showComments)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showComments = !showComments;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(IssueActivitiesPanel.this);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ fragment.add(new AjaxLink<Void>("showChangeHistory") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showChangeHistory)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showChangeHistory = !showChangeHistory;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(IssueActivitiesPanel.this);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ return fragment;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 0b0159f730..16550bcafd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -1,507 +1,508 @@
-package io.onedev.server.web.page.project.pullrequests.detail.activities;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.Cookie;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.ObjectId;
-import org.joda.time.DateTime;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.PullRequestUpdate;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;
-import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.user.ident.Mode;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestOpenedActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestUpdatedActivity;
-import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-
-@SuppressWarnings("serial")
-public class PullRequestActivitiesPage extends PullRequestDetailPage {
-
- private static final String COOKIE_SHOW_COMMENTS = "onedev.server.pullRequest.showComments";
-
- private static final String COOKIE_SHOW_COMMITS = "onedev.server.pullRequest.showCommits";
-
- private static final String COOKIE_SHOW_CHANGE_HISTORY = "onedev.server.pullRequest.showChangeHistory";
-
- private boolean showComments = true;
-
- private boolean showCommits = true;
-
- private boolean showChangeHistory = true;
-
- private WebMarkupContainer container;
-
- private RepeatingView activitiesView;
-
- public PullRequestActivitiesPage(PageParameters params) {
- super(params);
-
- WebRequest request = (WebRequest) RequestCycle.get().getRequest();
- Cookie cookie = request.getCookie(COOKIE_SHOW_COMMENTS);
- if (cookie != null)
- showComments = Boolean.valueOf(cookie.getValue());
-
- cookie = request.getCookie(COOKIE_SHOW_COMMITS);
- if (cookie != null)
- showCommits = Boolean.valueOf(cookie.getValue());
-
- cookie = request.getCookie(COOKIE_SHOW_CHANGE_HISTORY);
- if (cookie != null)
- showChangeHistory = Boolean.valueOf(cookie.getValue());
- }
-
- private Component newActivityRow(String id, PullRequestActivity activity) {
- WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));
- row.setOutputMarkupId(true);
-
- String anchor = activity.getAnchor();
- if (anchor != null)
- row.setMarkupId(anchor);
-
- if (activity.getUser() != null)
- row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));
- else
- row.add(new WebMarkupContainer("avatar"));
-
- Component content = activity.render("content", new DeleteCallback() {
-
- @Override
- public void onDelete(AjaxRequestTarget target) {
- row.remove();
- target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));
- }
-
- });
-
- row.add(content);
-
- row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));
-
- return row;
- }
-
- private List<PullRequestActivity> getActivities() {
- PullRequest request = getPullRequest();
- List<PullRequestActivity> activities = new ArrayList<>();
-
- activities.add(new PullRequestOpenedActivity(request));
-
- List<PullRequestActivity> otherActivities = new ArrayList<>();
- if (showCommits) {
- for (PullRequestUpdate update: request.getUpdates())
- otherActivities.add(new PullRequestUpdatedActivity(update));
- }
-
- if (showComments) {
- for (PullRequestComment comment: request.getComments()) {
- otherActivities.add(new PullRequestCommentedActivity(comment));
- }
- }
-
- if (showChangeHistory) {
- for (PullRequestChange change: request.getChanges()) {
- if (change.getData() instanceof PullRequestReferencedFromIssueData) {
- PullRequestReferencedFromIssueData referencedFromIssueData = (PullRequestReferencedFromIssueData) change.getData();
- Issue issue = OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId());
- if (issue != null)
- otherActivities.add(new PullRequestChangeActivity(change));
- } else if (change.getData() instanceof PullRequestReferencedFromPullRequestData) {
- PullRequestReferencedFromPullRequestData referencedFromPullRequestData = (PullRequestReferencedFromPullRequestData) change.getData();
- PullRequest otherRequest = OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId());
- if (otherRequest != null)
- otherActivities.add(new PullRequestChangeActivity(change));
- } else if (change.getData() instanceof PullRequestReferencedFromCodeCommentData) {
- PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData = (PullRequestReferencedFromCodeCommentData) change.getData();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());
- if (comment != null)
- otherActivities.add(new PullRequestChangeActivity(change));
- } else {
- otherActivities.add(new PullRequestChangeActivity(change));
- }
- }
- }
-
- otherActivities.sort((o1, o2) -> {
- if (o1.getDate().getTime()<o2.getDate().getTime())
- return -1;
- else if (o1.getDate().getTime()>o2.getDate().getTime())
- return 1;
- else if (o1 instanceof PullRequestOpenedActivity)
- return -1;
- else
- return 1;
- });
-
- activities.addAll(otherActivities);
-
- return activities;
- }
-
- private Component newSinceChangesRow(String id, Date sinceDate) {
- WebMarkupContainer row = new WebMarkupContainer(id);
- row.setOutputMarkupId(true);
-
- row.add(new WebMarkupContainer("avatar"));
- WebMarkupContainer contentColumn = new Fragment("content", "sinceChangesRowContentFrag", this);
- contentColumn.add(AttributeAppender.append("colspan", "2"));
- contentColumn.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));
- row.add(contentColumn);
-
- row.add(AttributeAppender.append("class", "since-changes"));
-
- return row;
- }
-
- private BuildManager getBuildManager() {
- return OneDev.getInstance(BuildManager.class);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(container = new WebMarkupContainer("activities") {
-
- @Override
- protected void onBeforeRender() {
- addOrReplace(activitiesView = new RepeatingView("activities"));
-
- List<PullRequestActivity> activities = getActivities();
-
- Collection<ObjectId> commitIds = new HashSet<>();
- for (PullRequestActivity activity: activities) {
- if (activity instanceof PullRequestUpdatedActivity) {
- PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;
- commitIds.addAll(updatedActivity.getUpdate().getCommits()
- .stream().map(it->it.copy()).collect(Collectors.toSet()));
- }
- }
-
- PullRequest request = getPullRequest();
- Project project = request.getTargetProject();
- project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));
-
- List<PullRequestActivity> oldActivities = new ArrayList<>();
- List<PullRequestActivity> newActivities = new ArrayList<>();
- for (PullRequestActivity activity: activities) {
- if (request.isVisitedAfter(activity.getDate())) {
- oldActivities.add(activity);
- } else {
- newActivities.add(activity);
- }
- }
-
- for (PullRequestActivity activity: oldActivities) {
- activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));
- }
-
- if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {
- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
- Component row = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
- for (PullRequestActivity activity: newActivities) {
- if (activity instanceof PullRequestUpdatedActivity) {
- row.add(AttributeAppender.append("class", "visible"));
- break;
- }
- }
- activitiesView.add(row);
- }
-
- for (PullRequestActivity activity: newActivities) {
- Component row = newActivityRow(activitiesView.newChildId(), activity);
- row.add(AttributeAppender.append("class", "new"));
- activitiesView.add(row);
- }
-
- super.onBeforeRender();
- }
-
- });
- container.setOutputMarkupId(true);
-
- if (getLoginUser() != null) {
- Fragment fragment = new Fragment("addComment", "addCommentFrag", this);
- fragment.setOutputMarkupId(true);
-
- Form<?> form = new Form<Void>("form");
- fragment.add(form);
-
- CommentInput input = new CommentInput("input", Model.of(""), false) {
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID());
- }
-
- @Override
- protected Project getProject() {
- return PullRequestActivitiesPage.this.getProject();
- }
-
- @Override
- protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getPullRequest().getParticipants());
- }
-
- @Override
- protected List<AttributeModifier> getInputModifiers() {
- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));
- }
-
- };
- input.setRequired(true).setLabel(Model.of("Comment"));
- form.add(input);
-
- form.add(new NotificationPanel("feedback", input));
-
- form.add(new AjaxSubmitLink("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- PullRequestComment comment = new PullRequestComment();
- comment.setRequest(getPullRequest());
- comment.setUser(getLoginUser());
- comment.setContent(input.getModelObject());
- OneDev.getInstance(PullRequestCommentManager.class).save(comment);
- input.clearMarkdown();
-
- target.add(fragment);
-
- @SuppressWarnings("deprecation")
- Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
- Component newActivityRow = newActivityRow(activitiesView.newChildId(), new PullRequestCommentedActivity(comment));
- activitiesView.add(newActivityRow);
-
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());
- target.prependJavaScript(script);
- target.add(newActivityRow);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- container.add(fragment);
- } else {
- Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);
- fragment.add(new Link<Void>("login") {
-
- @Override
- public void onClick() {
- throw new RestartResponseAtInterceptPageException(LoginPage.class);
- }
-
- });
- container.add(fragment);
- }
-
- add(new WebSocketObserver() {
-
- @Override
- public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
- }
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- @SuppressWarnings("deprecation")
- Component prevActivityRow = activitiesView.get(activitiesView.size()-1);
- PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();
- List<PullRequestActivity> newActivities = new ArrayList<>();
- for (PullRequestActivity activity: getActivities()) {
- if (activity.getDate().after(lastActivity.getDate()))
- newActivities.add(activity);
- }
-
- Component sinceChangesRow = null;
- for (Component row: activitiesView) {
- if (row.getDefaultModelObject() == null) {
- sinceChangesRow = row;
- break;
- }
- }
-
- if (sinceChangesRow == null && !newActivities.isEmpty()) {
- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
- sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
- activitiesView.add(sinceChangesRow);
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());
- handler.prependJavaScript(script);
- handler.add(sinceChangesRow);
- prevActivityRow = sinceChangesRow;
- }
-
- Collection<ObjectId> commitIds = new HashSet<>();
-
- for (PullRequestActivity activity: newActivities) {
- Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
- newActivityRow.add(AttributeAppender.append("class", "new"));
- activitiesView.add(newActivityRow);
-
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());
- handler.prependJavaScript(script);
- handler.add(newActivityRow);
-
- if (activity instanceof PullRequestUpdatedActivity) {
- handler.appendJavaScript("$('tr.since-changes').addClass('visible');");
- PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;
- commitIds.addAll(updatedActivity.getUpdate().getCommits()
- .stream().map(it->it.copy()).collect(Collectors.toSet()));
- }
- prevActivityRow = newActivityRow;
- }
-
- PullRequest request = getPullRequest();
- Project project = request.getTargetProject();
- project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new PullRequestActivitiesCssResourceReference()));
- }
-
- public Component renderOptions(String componentId) {
- Fragment fragment = new Fragment(componentId, "optionsFrag", this);
-
- fragment.add(new AjaxLink<Void>("showComments") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (showComments)
- add(AttributeAppender.append("class", "active"));
- setOutputMarkupId(true);
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- showComments = !showComments;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(container);
- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
- }
-
- });
-
- fragment.add(new AjaxLink<Void>("showCommits") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (showCommits)
- add(AttributeAppender.append("class", "active"));
- setOutputMarkupId(true);
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- showCommits = !showCommits;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_COMMITS, String.valueOf(showCommits));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(container);
- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
- }
-
- });
-
- fragment.add(new AjaxLink<Void>("showChangeHistory") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (showChangeHistory)
- add(AttributeAppender.append("class", "active"));
- setOutputMarkupId(true);
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- showChangeHistory = !showChangeHistory;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(container);
- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
- }
-
- });
-
- return fragment;
- }
-}
+package io.onedev.server.web.page.project.pullrequests.detail.activities;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.Cookie;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
+import org.joda.time.DateTime;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.PullRequestUpdate;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;
+import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.component.markdown.AttachmentSupport;
+import io.onedev.server.web.component.project.comment.CommentInput;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestOpenedActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestUpdatedActivity;
+import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
+
+@SuppressWarnings("serial")
+public class PullRequestActivitiesPage extends PullRequestDetailPage {
+
+ private static final String COOKIE_SHOW_COMMENTS = "onedev.server.pullRequest.showComments";
+
+ private static final String COOKIE_SHOW_COMMITS = "onedev.server.pullRequest.showCommits";
+
+ private static final String COOKIE_SHOW_CHANGE_HISTORY = "onedev.server.pullRequest.showChangeHistory";
+
+ private boolean showComments = true;
+
+ private boolean showCommits = true;
+
+ private boolean showChangeHistory = true;
+
+ private WebMarkupContainer container;
+
+ private RepeatingView activitiesView;
+
+ public PullRequestActivitiesPage(PageParameters params) {
+ super(params);
+
+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();
+ Cookie cookie = request.getCookie(COOKIE_SHOW_COMMENTS);
+ if (cookie != null)
+ showComments = Boolean.valueOf(cookie.getValue());
+
+ cookie = request.getCookie(COOKIE_SHOW_COMMITS);
+ if (cookie != null)
+ showCommits = Boolean.valueOf(cookie.getValue());
+
+ cookie = request.getCookie(COOKIE_SHOW_CHANGE_HISTORY);
+ if (cookie != null)
+ showChangeHistory = Boolean.valueOf(cookie.getValue());
+ }
+
+ private Component newActivityRow(String id, PullRequestActivity activity) {
+ WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));
+ row.setOutputMarkupId(true);
+
+ String anchor = activity.getAnchor();
+ if (anchor != null)
+ row.setMarkupId(anchor);
+
+ if (activity.getUser() != null)
+ row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));
+ else
+ row.add(new WebMarkupContainer("avatar"));
+
+ Component content = activity.render("content", new DeleteCallback() {
+
+ @Override
+ public void onDelete(AjaxRequestTarget target) {
+ row.remove();
+ target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));
+ }
+
+ });
+
+ row.add(content);
+
+ row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));
+
+ return row;
+ }
+
+ private List<PullRequestActivity> getActivities() {
+ PullRequest request = getPullRequest();
+ List<PullRequestActivity> activities = new ArrayList<>();
+
+ activities.add(new PullRequestOpenedActivity(request));
+
+ List<PullRequestActivity> otherActivities = new ArrayList<>();
+ if (showCommits) {
+ for (PullRequestUpdate update: request.getUpdates())
+ otherActivities.add(new PullRequestUpdatedActivity(update));
+ }
+
+ if (showComments) {
+ for (PullRequestComment comment: request.getComments()) {
+ otherActivities.add(new PullRequestCommentedActivity(comment));
+ }
+ }
+
+ if (showChangeHistory) {
+ for (PullRequestChange change: request.getChanges()) {
+ if (change.getData() instanceof PullRequestReferencedFromIssueData) {
+ PullRequestReferencedFromIssueData referencedFromIssueData = (PullRequestReferencedFromIssueData) change.getData();
+ Issue issue = OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId());
+ if (issue != null)
+ otherActivities.add(new PullRequestChangeActivity(change));
+ } else if (change.getData() instanceof PullRequestReferencedFromPullRequestData) {
+ PullRequestReferencedFromPullRequestData referencedFromPullRequestData = (PullRequestReferencedFromPullRequestData) change.getData();
+ PullRequest otherRequest = OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId());
+ if (otherRequest != null)
+ otherActivities.add(new PullRequestChangeActivity(change));
+ } else if (change.getData() instanceof PullRequestReferencedFromCodeCommentData) {
+ PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData = (PullRequestReferencedFromCodeCommentData) change.getData();
+ CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());
+ if (comment != null)
+ otherActivities.add(new PullRequestChangeActivity(change));
+ } else if (!(change.getData() instanceof PullRequestDescriptionChangeData)) {
+ otherActivities.add(new PullRequestChangeActivity(change));
+ }
+ }
+ }
+
+ otherActivities.sort((o1, o2) -> {
+ if (o1.getDate().getTime()<o2.getDate().getTime())
+ return -1;
+ else if (o1.getDate().getTime()>o2.getDate().getTime())
+ return 1;
+ else if (o1 instanceof PullRequestOpenedActivity)
+ return -1;
+ else
+ return 1;
+ });
+
+ activities.addAll(otherActivities);
+
+ return activities;
+ }
+
+ private Component newSinceChangesRow(String id, Date sinceDate) {
+ WebMarkupContainer row = new WebMarkupContainer(id);
+ row.setOutputMarkupId(true);
+
+ row.add(new WebMarkupContainer("avatar"));
+ WebMarkupContainer contentColumn = new Fragment("content", "sinceChangesRowContentFrag", this);
+ contentColumn.add(AttributeAppender.append("colspan", "2"));
+ contentColumn.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));
+ row.add(contentColumn);
+
+ row.add(AttributeAppender.append("class", "since-changes"));
+
+ return row;
+ }
+
+ private BuildManager getBuildManager() {
+ return OneDev.getInstance(BuildManager.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(container = new WebMarkupContainer("activities") {
+
+ @Override
+ protected void onBeforeRender() {
+ addOrReplace(activitiesView = new RepeatingView("activities"));
+
+ List<PullRequestActivity> activities = getActivities();
+
+ Collection<ObjectId> commitIds = new HashSet<>();
+ for (PullRequestActivity activity: activities) {
+ if (activity instanceof PullRequestUpdatedActivity) {
+ PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;
+ commitIds.addAll(updatedActivity.getUpdate().getCommits()
+ .stream().map(it->it.copy()).collect(Collectors.toSet()));
+ }
+ }
+
+ PullRequest request = getPullRequest();
+ Project project = request.getTargetProject();
+ project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));
+
+ List<PullRequestActivity> oldActivities = new ArrayList<>();
+ List<PullRequestActivity> newActivities = new ArrayList<>();
+ for (PullRequestActivity activity: activities) {
+ if (request.isVisitedAfter(activity.getDate())) {
+ oldActivities.add(activity);
+ } else {
+ newActivities.add(activity);
+ }
+ }
+
+ for (PullRequestActivity activity: oldActivities) {
+ activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));
+ }
+
+ if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {
+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
+ Component row = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
+ for (PullRequestActivity activity: newActivities) {
+ if (activity instanceof PullRequestUpdatedActivity) {
+ row.add(AttributeAppender.append("class", "visible"));
+ break;
+ }
+ }
+ activitiesView.add(row);
+ }
+
+ for (PullRequestActivity activity: newActivities) {
+ Component row = newActivityRow(activitiesView.newChildId(), activity);
+ row.add(AttributeAppender.append("class", "new"));
+ activitiesView.add(row);
+ }
+
+ super.onBeforeRender();
+ }
+
+ });
+ container.setOutputMarkupId(true);
+
+ if (getLoginUser() != null) {
+ Fragment fragment = new Fragment("addComment", "addCommentFrag", this);
+ fragment.setOutputMarkupId(true);
+
+ Form<?> form = new Form<Void>("form");
+ fragment.add(form);
+
+ CommentInput input = new CommentInput("input", Model.of(""), false) {
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID());
+ }
+
+ @Override
+ protected Project getProject() {
+ return PullRequestActivitiesPage.this.getProject();
+ }
+
+ @Override
+ protected List<User> getMentionables() {
+ return OneDev.getInstance(UserManager.class).queryAndSort(getPullRequest().getParticipants());
+ }
+
+ @Override
+ protected List<AttributeModifier> getInputModifiers() {
+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));
+ }
+
+ };
+ input.setRequired(true).setLabel(Model.of("Comment"));
+ form.add(input);
+
+ form.add(new NotificationPanel("feedback", input));
+
+ form.add(new AjaxSubmitLink("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ PullRequestComment comment = new PullRequestComment();
+ comment.setRequest(getPullRequest());
+ comment.setUser(getLoginUser());
+ comment.setContent(input.getModelObject());
+ OneDev.getInstance(PullRequestCommentManager.class).save(comment);
+ input.clearMarkdown();
+
+ target.add(fragment);
+
+ @SuppressWarnings("deprecation")
+ Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), new PullRequestCommentedActivity(comment));
+ activitiesView.add(newActivityRow);
+
+ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
+ newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());
+ target.prependJavaScript(script);
+ target.add(newActivityRow);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+ container.add(fragment);
+ } else {
+ Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);
+ fragment.add(new Link<Void>("login") {
+
+ @Override
+ public void onClick() {
+ throw new RestartResponseAtInterceptPageException(LoginPage.class);
+ }
+
+ });
+ container.add(fragment);
+ }
+
+ add(new WebSocketObserver() {
+
+ @Override
+ public Collection<String> getObservables() {
+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ }
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ @SuppressWarnings("deprecation")
+ Component prevActivityRow = activitiesView.get(activitiesView.size()-1);
+ PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();
+ List<PullRequestActivity> newActivities = new ArrayList<>();
+ for (PullRequestActivity activity: getActivities()) {
+ if (activity.getDate().after(lastActivity.getDate()))
+ newActivities.add(activity);
+ }
+
+ Component sinceChangesRow = null;
+ for (Component row: activitiesView) {
+ if (row.getDefaultModelObject() == null) {
+ sinceChangesRow = row;
+ break;
+ }
+ }
+
+ if (sinceChangesRow == null && !newActivities.isEmpty()) {
+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
+ sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
+ activitiesView.add(sinceChangesRow);
+ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
+ sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());
+ handler.prependJavaScript(script);
+ handler.add(sinceChangesRow);
+ prevActivityRow = sinceChangesRow;
+ }
+
+ Collection<ObjectId> commitIds = new HashSet<>();
+
+ for (PullRequestActivity activity: newActivities) {
+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
+ newActivityRow.add(AttributeAppender.append("class", "new"));
+ activitiesView.add(newActivityRow);
+
+ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
+ newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());
+ handler.prependJavaScript(script);
+ handler.add(newActivityRow);
+
+ if (activity instanceof PullRequestUpdatedActivity) {
+ handler.appendJavaScript("$('tr.since-changes').addClass('visible');");
+ PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;
+ commitIds.addAll(updatedActivity.getUpdate().getCommits()
+ .stream().map(it->it.copy()).collect(Collectors.toSet()));
+ }
+ prevActivityRow = newActivityRow;
+ }
+
+ PullRequest request = getPullRequest();
+ Project project = request.getTargetProject();
+ project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new PullRequestActivitiesCssResourceReference()));
+ }
+
+ public Component renderOptions(String componentId) {
+ Fragment fragment = new Fragment(componentId, "optionsFrag", this);
+
+ fragment.add(new AjaxLink<Void>("showComments") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showComments)
+ add(AttributeAppender.append("class", "active"));
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showComments = !showComments;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(container);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ fragment.add(new AjaxLink<Void>("showCommits") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showCommits)
+ add(AttributeAppender.append("class", "active"));
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showCommits = !showCommits;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_COMMITS, String.valueOf(showCommits));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(container);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ fragment.add(new AjaxLink<Void>("showChangeHistory") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (showChangeHistory)
+ add(AttributeAppender.append("class", "active"));
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showChangeHistory = !showChangeHistory;
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(container);
+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
+ }
+
+ });
+
+ return fragment;
+ }
+}