The Unified and Autonomous Development Platform
Fix issue #752 - Able to mark code comment as resolvable
Robin Shena54093a187e4
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 2cdecd8e01..08270b2d3c 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -99,6 +99,7 @@ import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.entitymanager.GitLfsLockManager;@@ -144,6 +145,7 @@ import io.onedev.server.entitymanager.impl.DefaultBuildQueryPersonalizationManagimport io.onedev.server.entitymanager.impl.DefaultCodeCommentManager;import io.onedev.server.entitymanager.impl.DefaultCodeCommentQueryPersonalizationManager;import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;+import io.onedev.server.entitymanager.impl.DefaultCodeCommentStatusChangeManager;import io.onedev.server.entitymanager.impl.DefaultCommitQueryPersonalizationManager;import io.onedev.server.entitymanager.impl.DefaultEmailAddressManager;import io.onedev.server.entitymanager.impl.DefaultGitLfsLockManager;@@ -413,6 +415,7 @@ public class CoreModule extends AbstractPluginModule {bind(MembershipManager.class).to(DefaultMembershipManager.class);bind(PullRequestChangeManager.class).to(DefaultPullRequestChangeManager.class);bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);+ bind(CodeCommentStatusChangeManager.class).to(DefaultCodeCommentStatusChangeManager.class);bind(AttachmentStorageManager.class).to(DefaultAttachmentStorageManager.class);bind(PullRequestInfoManager.class).to(DefaultPullRequestInfoManager.class);bind(PullRequestNotificationManager.class);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentStatusChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentStatusChangeManager.javanew file mode 100644index 0000000000..16ab86d863--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentStatusChangeManager.java@@ -0,0 +1,12 @@+package io.onedev.server.entitymanager;++import javax.annotation.Nullable;++import io.onedev.server.model.CodeCommentStatusChange;+import io.onedev.server.persistence.dao.EntityManager;++public interface CodeCommentStatusChangeManager extends EntityManager<CodeCommentStatusChange> {++ void save(CodeCommentStatusChange change, @Nullable String note);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.javanew file mode 100644index 0000000000..819799cfc9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentStatusChangeManager.java@@ -0,0 +1,50 @@+package io.onedev.server.entitymanager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.commons.loader.ListenerRegistry;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;+import io.onedev.server.event.codecomment.CodeCommentStatusChanged;+import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultCodeCommentStatusChangeManager extends BaseEntityManager<CodeCommentStatusChange>+ implements CodeCommentStatusChangeManager {++ private final ListenerRegistry listenerRegistry;++ @Inject+ public DefaultCodeCommentStatusChangeManager(Dao dao, ListenerRegistry listenerRegistry) {+ super(dao);+ this.listenerRegistry = listenerRegistry;+ }++ @Override+ public void save(CodeCommentStatusChange change) {+ save(change, null);+ }++ @Transactional+ @Override+ public void save(CodeCommentStatusChange change, String note) {+ change.getComment().setResolved(change.isResolved());+ dao.persist(change);++ if (note != null) {+ CodeCommentReply reply = new CodeCommentReply();+ reply.setComment(change.getComment());+ reply.setCompareContext(change.getCompareContext());+ reply.setContent(note);+ reply.setDate(change.getDate());+ reply.setUser(change.getUser());+ dao.persist(reply);+ }+ listenerRegistry.post(new CodeCommentStatusChanged(change, note));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentResolved.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentResolved.javanew file mode 100644index 0000000000..76a88ec897--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentResolved.java@@ -0,0 +1,13 @@+package io.onedev.server.event.codecomment;++import javax.annotation.Nullable;++import io.onedev.server.model.CodeCommentStatusChange;++public class CodeCommentResolved extends CodeCommentStatusChanged {++ public CodeCommentResolved(CodeCommentStatusChange change, @Nullable String note) {+ super(change, note);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.javanew file mode 100644index 0000000000..72df7c4ca3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentStatusChanged.java@@ -0,0 +1,36 @@+package io.onedev.server.event.codecomment;++import javax.annotation.Nullable;++import io.onedev.server.model.CodeCommentStatusChange;++public class CodeCommentStatusChanged extends CodeCommentEvent {++ private final CodeCommentStatusChange change;++ private final String note;++ public CodeCommentStatusChanged(CodeCommentStatusChange change, @Nullable String note) {+ super(change.getUser(), change.getDate(), change.getComment());+ this.change = change;+ this.note = note;+ }++ public CodeCommentStatusChange getChange() {+ return change;+ }++ @Nullable+ public String getNote() {+ return note;+ }++ @Override+ public String getActivity() {+ if (change.isResolved())+ return "resolved";+ else+ return "unresolved";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUnresolved.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUnresolved.javanew file mode 100644index 0000000000..c7ee3aa682--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUnresolved.java@@ -0,0 +1,13 @@+package io.onedev.server.event.codecomment;++import javax.annotation.Nullable;++import io.onedev.server.model.CodeCommentStatusChange;++public class CodeCommentUnresolved extends CodeCommentStatusChanged {++ public CodeCommentUnresolved(CodeCommentStatusChange change, @Nullable String note) {+ super(change, note);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 1cbb44c260..7aa1ee4e50 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -4105,4 +4105,15 @@ public class DataMigrator {}}+ private void migrate88(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("CodeComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements())+ element.addElement("resolved").setText("false");+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex 0241e76f4c..f4fa8215fe 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -75,9 +75,13 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupppublic static final String PROP_LAST_UPDATE = "lastUpdate";+ public static final String PROP_RESOLVED = "resolved";+public static final String PROP_USER = "user";public static final String PROP_REPLIES = "replies";++ public static final String PROP_CHANGES = "changes";public static final String PROP_ID = "id";@@ -114,9 +118,14 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp@Embeddedprivate CompareContext compareContext;+ private boolean resolved;+@OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)private Collection<CodeCommentReply> replies = new ArrayList<>();+ @OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)+ private Collection<CodeCommentStatusChange> changes = new ArrayList<>();+@Column(nullable=false)private String uuid = UUID.randomUUID().toString();@@ -178,6 +187,14 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSuppthis.replies = replies;}+ public Collection<CodeCommentStatusChange> getChanges() {+ return changes;+ }++ public void setChanges(Collection<CodeCommentStatusChange> changes) {+ this.changes = changes;+ }+public String getUUID() {return uuid;}@@ -202,6 +219,14 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSuppthis.lastUpdate = lastUpdate;}+ public boolean isResolved() {+ return resolved;+ }++ public void setResolved(boolean resolved) {+ this.resolved = resolved;+ }+public boolean isVisitedAfter(Date date) {User user = SecurityUtils.getUser();if (user != null) {diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.javanew file mode 100644index 0000000000..b3add13758--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentStatusChange.java@@ -0,0 +1,83 @@+package io.onedev.server.model;++import java.util.Date;++import javax.persistence.Column;+import javax.persistence.Embedded;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;++import io.onedev.server.model.support.CompareContext;++@Entity+@Table(indexes={+ @Index(columnList="o_comment_id"), @Index(columnList="o_user_id")})+public class CodeCommentStatusChange extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @ManyToOne+ @JoinColumn(nullable=false)+ private CodeComment comment;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ @Column(nullable=false)+ private Date date = new Date();++ private boolean resolved;++ @Embedded+ private CompareContext compareContext;++ public CodeComment getComment() {+ return comment;+ }++ public void setComment(CodeComment comment) {+ this.comment = comment;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++ public boolean isResolved() {+ return resolved;+ }++ public void setResolved(boolean resolved) {+ this.resolved = resolved;+ }++ public CompareContext getCompareContext() {+ return compareContext;+ }++ public void setCompareContext(CompareContext compareContext) {+ this.compareContext = compareContext;+ }++ public String getAnchor() {+ return getClass().getSimpleName() + "-" + getId();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4index 354e49014a..6563873e1d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4@@ -7,7 +7,7 @@ query;criteria- : operator=CreatedByMe #OperatorCriteria+ : operator=(CreatedByMe|Resolved|Unresolved) #OperatorCriteria| operator=(CreatedBy|OnCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsUntil|IsSince|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria@@ -24,6 +24,14 @@ CreatedByMe: 'created' WS+ 'by' WS+ 'me';+Resolved+ : 'resolved'+ ;++Unresolved+ : 'unresolved'+ ;+CreatedBy: 'created' WS+ 'by';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex 20f210fa96..db6f018438 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -93,7 +93,14 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {@Overridepublic Criteria<CodeComment> visitOperatorCriteria(OperatorCriteriaContext ctx) {- return new CreatedByMeCriteria();+ switch (ctx.operator.getType()) {+ case CodeCommentQueryLexer.Resolved:+ return new ResolvedCriteria();+ case CodeCommentQueryLexer.Unresolved:+ return new UnresolvedCriteria();+ default:+ return new CreatedByMeCriteria();+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.javanew file mode 100644index 0000000000..9b01125b39--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java@@ -0,0 +1,30 @@+package io.onedev.server.search.entity.codecomment;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.CodeComment;+import io.onedev.server.util.criteria.Criteria;++public class ResolvedCriteria extends Criteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {+ return builder.equal(from.get(CodeComment.PROP_RESOLVED), true);+ }++ @Override+ public boolean matches(CodeComment comment) {+ return comment.isResolved();+ }++ @Override+ public String toStringWithoutParens() {+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Resolved);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.javanew file mode 100644index 0000000000..3216a62749--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java@@ -0,0 +1,30 @@+package io.onedev.server.search.entity.codecomment;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.CodeComment;+import io.onedev.server.util.criteria.Criteria;++public class UnresolvedCriteria extends Criteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {+ return builder.equal(from.get(CodeComment.PROP_RESOLVED), false);+ }++ @Override+ public boolean matches(CodeComment comment) {+ return !comment.isResolved();+ }++ @Override+ public String toStringWithoutParens() {+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Unresolved);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 9f0a119067..106af530c4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -74,6 +74,7 @@ import io.onedev.server.web.page.project.codecomments.InvalidCodeCommentPage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;+import io.onedev.server.web.util.TextUtils;@SuppressWarnings("serial")public abstract class CodeCommentListPanel extends Panel {@@ -534,6 +535,15 @@ public abstract class CodeCommentListPanel extends Panel {});+ columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Resolved")) {++ @Override+ public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {+ cellItem.add(new Label(componentId, TextUtils.describe(rowModel.getObject().isResolved())));+ }++ });+columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Last Update")) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.htmlindex 74045aac93..70a305353d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html@@ -1,47 +1,52 @@<wicket:panel><div class="code-comment">- <div wicket:id="comment" class="comment section"></div>- <div wicket:id="replies" class="reply section"></div>- <div wicket:id="addReply" class="add-reply"></div>+ <div wicket:id="comment" class="comment d-flex pl-2 py-3 flex-nowrap"></div>+ <div wicket:id="activities" class="activity d-flex pl-2 py-3 flex-nowrap"/>+ <div wicket:id="actions" class="actions d-flex pl-2 py-3 flex-nowrap"></div></div>- <wicket:fragment wicket:id="viewFrag">- <div class="user-avatar"><a wicket:id="userAvatar"></a></div>- <div class="detail">+ <wicket:fragment wicket:id="commentOrReplyViewFrag">+ <div class="user-avatar flex-shrink-0"><a wicket:id="userAvatar"></a></div>+ <div class="detail ml-3 flex-grow-1"><div class="head text-muted mb-1"><span wicket:id="userName" class="user-name"></span><span wicket:id="action" class="action"></span><span wicket:id="date" class="date"></span><a wicket:id="context" class="text-warning"><wicket:svg href="warning-o" class="icon icon-sm"/></a>+ <a wicket:id="anchor" class="reply-anchor ml-2"><wicket:svg href="link" class="icon rotate-45"/></a></div><div class="body"><div wicket:id="content"></div></div>- <div wicket:id="foot" class="foot d-flex align-items-center mt-3">+ <div wicket:id="foot" class="foot d-flex align-items-center font-size-sm mt-3"><a wicket:id="edit" class="mr-2 text-muted text-hover-primary">Edit</a><span class="dot mr-2"></span><a wicket:id="delete" class="text-muted text-hover-primary">Delete</a></div></div></wicket:fragment>- <wicket:fragment wicket:id="commentEditFrag">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="feedback" class="feedback"></div>- <div class="form-group mb-3">- <div wicket:id="content"></div>- </div>- <button wicket:id="save" class="btn btn-sm btn-primary dirty-aware mr-1">Save</button>- <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>- </form>+ <wicket:fragment wicket:id="commentOrReplyEditFrag">+ <div class="user-avatar flex-shrink-0"><a wicket:id="userAvatar"></a></div>+ <div class="detail ml-3 flex-grow-1">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback" class="feedback"></div>+ <div wicket:id="content" class="mb-3"></div>+ <button wicket:id="save" class="btn btn-sm btn-primary mr-1"><span wicket:id="label"/></button>+ <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>+ </form>+ </div></wicket:fragment>- <wicket:fragment wicket:id="replyEditFrag">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="feedback" class="feedback"></div>- <div wicket:id="content" class="mb-3"></div>- <button wicket:id="save" class="btn btn-sm btn-primary mr-1"><span wicket:id="label"></span></button>- <button wicket:id="cancel" class="btn btn-sm btn-secondary">Cancel</button>- </form>+ <wicket:fragment wicket:id="actionsFrag">+ <a wicket:id="reply" class="btn btn-sm btn-outline-secondary mr-2">Reply</a>+ <a wicket:id="resolve" class="btn btn-sm btn-outline-secondary mr-2">Resolve</a>+ <a wicket:id="unresolve" class="btn btn-sm btn-outline-secondary">Unresolve</a></wicket:fragment>- <wicket:fragment wicket:id="addReplyFrag">- <a wicket:id="reply" class="btn btn-sm btn-outline-secondary"><wicket:svg href="reply" class="icon mr-2"></wicket:svg> Reply</a>+ <wicket:fragment wicket:id="statusChangeFrag">+ <div class="user-avatar flex-shrink-0"><a wicket:id="userAvatar"></a></div>+ <div class="detail text-muted flex-grow-1 ml-3">+ <span wicket:id="userName" class="user-name"></span>+ <span wicket:id="action" class="action"></span>+ <span wicket:id="date" class="date"></span>+ <a wicket:id="context" class="text-warning"><wicket:svg href="warning-o" class="icon icon-sm"/></a>+ </div></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 90752fd910..9c470baab3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.codecomment;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -10,12 +11,14 @@ import java.util.Set;import javax.annotation.Nullable;+import org.apache.wicket.AttributeModifier;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.behavior.AttributeAppender;+import org.apache.wicket.behavior.Behavior;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;@@ -39,11 +42,13 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -67,7 +72,7 @@ public abstract class CodeCommentPanel extends Panel {private final Long commentId;- private RepeatingView repliesView;+ private RepeatingView activitiesView;/*** We pass comment id instead of comment model as we want to make sure that@@ -88,11 +93,11 @@ public abstract class CodeCommentPanel extends Panel {return OneDev.getInstance(CodeCommentManager.class).load(commentId);}- private WebMarkupContainer newCommentContainer() {- WebMarkupContainer commentContainer = new Fragment("comment", "viewFrag", this);- commentContainer.setOutputMarkupId(true);+ private WebMarkupContainer newCommentOrReplyContainer() {+ WebMarkupContainer viewFragment = new Fragment("comment", "commentOrReplyViewFrag", this);+ viewFragment.setOutputMarkupId(true);- commentContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {+ viewFragment.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {@Overrideprotected String load() {@@ -101,14 +106,14 @@ public abstract class CodeCommentPanel extends Panel {}));- commentContainer.add(new UserIdentPanel("userAvatar", getComment().getUser(), Mode.AVATAR));- commentContainer.add(new Label("userName", getComment().getUser().getDisplayName()));- commentContainer.add(new Label("action", "commented"));- commentContainer.add(new Label("date", DateUtils.formatAge(getComment().getCreateDate()))+ viewFragment.add(new UserIdentPanel("userAvatar", getComment().getUser(), Mode.AVATAR));+ viewFragment.add(new Label("userName", getComment().getUser().getDisplayName()));+ viewFragment.add(new Label("action", "commented"));+ viewFragment.add(new Label("date", DateUtils.formatAge(getComment().getCreateDate())).add(new AttributeAppender("title", DateUtils.formatDateTime(getComment().getCreateDate()))));if (isContextDifferent(getComment().getCompareContext())) {String url = OneDev.getInstance(UrlManager.class).urlFor(getComment());- commentContainer.add(new ExternalLink("context", UrlUtils.makeRelative(url)) {+ viewFragment.add(new ExternalLink("context", UrlUtils.makeRelative(url)) {@Overrideprotected void onComponentTag(ComponentTag tag) {@@ -118,10 +123,10 @@ public abstract class CodeCommentPanel extends Panel {});} else {- commentContainer.add(new WebMarkupContainer("context").setVisible(false));+ viewFragment.add(new WebMarkupContainer("context").setVisible(false));}- commentContainer.add(new MarkdownViewer("content", new IModel<String>() {+ viewFragment.add(new MarkdownViewer("content", new IModel<String>() {@Overridepublic String getObject() {@@ -140,6 +145,8 @@ public abstract class CodeCommentPanel extends Panel {}}, null));++ viewFragment.add(new WebMarkupContainer("anchor").setVisible(false));WebMarkupContainer foot = new WebMarkupContainer("foot");foot.setVisible(SecurityUtils.canModifyOrDelete(getComment()));@@ -147,7 +154,9 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment(commentContainer.getId(), "commentEditFrag", CodeCommentPanel.this);+ Fragment editFragment = new Fragment(viewFragment.getId(), "commentOrReplyEditFrag", CodeCommentPanel.this);+ editFragment.add(new UserIdentPanel("userAvatar", getComment().getUser(), Mode.AVATAR));+Form<?> form = new Form<Void>("form");form.setOutputMarkupId(true);@@ -188,15 +197,22 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- WebMarkupContainer commentContainer = newCommentContainer();- fragment.replaceWith(commentContainer);- target.add(commentContainer);+ WebMarkupContainer commentOrReplyContainer = newCommentOrReplyContainer();+ editFragment.replaceWith(commentOrReplyContainer);+ target.add(commentOrReplyContainer);}});form.add(new AjaxButton("save") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", "Save"));+ add(AttributeAppender.append("class", "dirty-aware"));+ }+@Overrideprotected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);@@ -209,18 +225,18 @@ public abstract class CodeCommentPanel extends Panel {CodeComment comment = getComment();comment.setContent(contentInput.getModelObject());- WebMarkupContainer commentContainer = newCommentContainer();- fragment.replaceWith(commentContainer);- target.add(commentContainer);+ WebMarkupContainer commentOrReplyContainer = newCommentOrReplyContainer();+ editFragment.replaceWith(commentOrReplyContainer);+ target.add(commentOrReplyContainer);onSaveComment(target, comment);}});- fragment.add(form);- fragment.setOutputMarkupId(true);- commentContainer.replaceWith(fragment);- target.add(fragment);+ editFragment.add(form);+ editFragment.setOutputMarkupId(true);+ viewFragment.replaceWith(editFragment);+ target.add(editFragment);}});@@ -248,246 +264,153 @@ public abstract class CodeCommentPanel extends Panel {});- commentContainer.add(foot);- return commentContainer;- }-- private CodeCommentReply getReply(Long replyId) {- return OneDev.getInstance(CodeCommentReplyManager.class).load(replyId);+ viewFragment.add(foot);+ return viewFragment;}- private WebMarkupContainer newReplyContainer(String componentId, CodeCommentReply reply) {- Long replyId = reply.getId();- Fragment replyContainer = new Fragment(componentId, "viewFrag", this, Model.of(replyId));- replyContainer.setOutputMarkupId(true);- replyContainer.setMarkupId(reply.getAnchor());- replyContainer.add(AttributeAppender.append("name", reply.getAnchor()));-- replyContainer.add(new UserIdentPanel("userAvatar", reply.getUser(), Mode.AVATAR));- replyContainer.add(new Label("userName", reply.getUser().getDisplayName()));- replyContainer.add(new Label("action", "replied"));- replyContainer.add(new Label("date", DateUtils.formatAge(reply.getDate()))- .add(new AttributeAppender("title", DateUtils.formatDateTime(reply.getDate()))));- if (isContextDifferent(reply.getCompareContext())) {- String url = OneDev.getInstance(UrlManager.class).urlFor(reply);- replyContainer.add(new ExternalLink("context", UrlUtils.makeRelative(url)) {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.put("title", "Current context is different from the context when this reply is added, click to show the reply context");- }-- });- } else {- replyContainer.add(new WebMarkupContainer("context").setVisible(false));- }-- replyContainer.add(new MarkdownViewer("content", new IModel<String>() {-- @Override- public void detach() {- }+ private WebMarkupContainer newActionsContainer() {+ WebMarkupContainer actionsContainer = new Fragment("actions", "actionsFrag", this) {@Override- public String getObject() {- return getReply(replyId).getContent();- }-- @Override- public void setObject(String object) {- CodeCommentReply reply = getReply(replyId);- reply.setContent(object);- onSaveCommentReply(RequestCycle.get().find(AjaxRequestTarget.class), reply);+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.getUser() != null);}- }, null));-- WebMarkupContainer foot = new WebMarkupContainer("foot");- foot.setVisible(SecurityUtils.canModifyOrDelete(reply));-- foot.add(new AjaxLink<Void>("edit") {+ };+ actionsContainer.setOutputMarkupId(true);+ actionsContainer.add(new AjaxLink<Void>("reply") {@Overridepublic void onClick(AjaxRequestTarget target) {- Fragment fragment = new Fragment(replyContainer.getId(), "replyEditFrag", CodeCommentPanel.this,- Model.of(replyId));- Form<?> form = new Form<Void>("form");- CommentInput contentInput = new CommentInput("content", Model.of(getReply(replyId).getContent()), true) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), getComment().getUUID(),- SecurityUtils.canManageCodeComments(getProject()));- }-- @Override- protected Project getProject() {- return getComment().getProject();- }-- @Override- protected List<User> getMentionables() {- return OneDev.getInstance(UserManager.class).queryAndSort(getComment().getParticipants());- }-- };- contentInput.setRequired(true);- contentInput.setLabel(Model.of("Comment"));- form.add(contentInput);-- FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- form.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) {- WebMarkupContainer replyContainer = newReplyContainer(componentId, getReply(replyId));- fragment.replaceWith(replyContainer);- target.add(replyContainer);- }-- });-- 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) {- super.onSubmit(target, form);-- CodeCommentReply reply = getReply(replyId);- reply.setContent(contentInput.getModelObject());- onSaveCommentReply(target, reply);- reply.setContent(contentInput.getModelObject());- WebMarkupContainer replyContainer = newReplyContainer(componentId, reply);- fragment.replaceWith(replyContainer);- target.add(replyContainer);- }-- }.add(new Label("label", "Save")));-- fragment.add(form);- fragment.setOutputMarkupId(true);- replyContainer.replaceWith(fragment);- target.add(fragment);+ onAddReply(target, null);}});- foot.add(new AjaxLink<Void>("delete") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this reply?"));- }+ actionsContainer.add(new AjaxLink<Void>("resolve") {@Overridepublic void onClick(AjaxRequestTarget target) {- replyContainer.remove();- OneDev.getInstance(CodeCommentReplyManager.class).delete(getReply(replyId));- target.appendJavaScript(String.format("$('#%s').remove();", replyContainer.getMarkupId()));+ onAddReply(target, true);}-- });-- replyContainer.add(foot);- return replyContainer;- }-- private WebMarkupContainer newAddReplyContainer() {- WebMarkupContainer addReplyContainer = new Fragment("addReply", "addReplyFrag", this) {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.getUser() != null);+ setVisible(!getComment().isResolved());}- };- addReplyContainer.setOutputMarkupId(true);- addReplyContainer.add(new AjaxLink<Void>("reply") {+ });+ actionsContainer.add(new AjaxLink<Void>("unresolve") {@Overridepublic void onClick(AjaxRequestTarget target) {- onAddReply(target);+ onAddReply(target, false);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getComment().isResolved());}});- return addReplyContainer;+ return actionsContainer;+ }++ private List<CodeCommentActivity> getActivities() {+ List<CodeCommentActivity> activities = new ArrayList<>();++ for (CodeCommentStatusChange change: getComment().getChanges())+ activities.add(new CodeCommentStatusChangeActivity(change));++ for (CodeCommentReply comment: getComment().getReplies())+ activities.add(new CodeCommentReplyActivity(comment));++ activities.sort((o1, o2) -> {+ if (o1.getDate().getTime()<o2.getDate().getTime())+ return -1;+ else if (o1.getDate().getTime()>o2.getDate().getTime())+ return 1;+ else+ return 0;+ });++ return activities;}@Overrideprotected void onInitialize() {super.onInitialize();- add(newCommentContainer());+ add(newCommentOrReplyContainer());- repliesView = new RepeatingView("replies");+ activitiesView = new RepeatingView("activities");- List<CodeCommentReply> replies = new ArrayList<>();- replies.addAll(getComment().getReplies());+ List<CodeCommentActivity> activities = new ArrayList<>();- replies.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));+ for (CodeCommentStatusChange change: getComment().getChanges())+ activities.add(new CodeCommentStatusChangeActivity(change));++ for (CodeCommentReply comment: getComment().getReplies())+ activities.add(new CodeCommentReplyActivity(comment));++ activities.sort((o1, o2) -> {+ if (o1.getDate().getTime()<o2.getDate().getTime())+ return -1;+ else if (o1.getDate().getTime()>o2.getDate().getTime())+ return 1;+ else+ return 0;+ });- for (CodeCommentReply reply: replies) {- Component replyContainer = newReplyContainer(repliesView.newChildId(), reply);- if (!getComment().isVisitedAfter(reply.getDate()))- replyContainer.add(AttributeAppender.append("class", "new"));- repliesView.add(replyContainer);+ for (CodeCommentActivity activity: activities) {+ Component activityContainer = activity.render(activitiesView.newChildId());+ if (!getComment().isVisitedAfter(activity.getDate()))+ activityContainer.add(AttributeAppender.append("class", "new"));+ activitiesView.add(activityContainer);}- add(repliesView);- add(newAddReplyContainer());+ add(activitiesView);+ add(newActionsContainer());add(new WebSocketObserver() {@Override+ @SuppressWarnings("deprecation")public void onObservableChanged(IPartialPageRequestHandler handler) {- Date lastReplyDate;- String prevReplyMarkupId;- if (repliesView.size() != 0) {- @SuppressWarnings("deprecation")- Component lastReplyContainer = repliesView.get(repliesView.size()-1);-- CodeCommentReply lastReply = getReply((Long) lastReplyContainer.getDefaultModelObject());- lastReplyDate = lastReply.getDate();- prevReplyMarkupId = lastReplyContainer.getMarkupId();- } else {- lastReplyDate = getComment().getCreateDate();- prevReplyMarkupId = get("comment").getMarkupId();- }+ Component prevActivityContainer;+ if (activitiesView.size() > 0)+ prevActivityContainer = activitiesView.get(activitiesView.size()-1);+ else+ prevActivityContainer = null;- List<CodeCommentReply> replies = new ArrayList<>();- for (CodeCommentReply reply: getComment().getReplies()) {- if (reply.getDate().getTime()>lastReplyDate.getTime()) {- replies.add(reply);+ List<CodeCommentActivity> newActivities = new ArrayList<>();+ for (CodeCommentActivity activity: getActivities()) {+ if (prevActivityContainer == null) {+ newActivities.add(activity);+ } else {+ CodeCommentActivity lastActivity = (CodeCommentActivity)prevActivityContainer.getDefaultModelObject();+ if (activity.getDate().getTime() > lastActivity.getDate().getTime())+ newActivities.add(activity);}}- replies.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));-- for (CodeCommentReply reply: replies) {- Component newReplyContainer = newReplyContainer(repliesView.newChildId(), reply);- newReplyContainer.add(AttributeAppender.append("class", "new"));- repliesView.add(newReplyContainer);-- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- newReplyContainer.getMarkupId(), prevReplyMarkupId);++ for (CodeCommentActivity activity: newActivities) {+ Component newActivityContainer = activity.render(activitiesView.newChildId());+ newActivityContainer.add(AttributeAppender.append("class", "new"));+ activitiesView.add(newActivityContainer);++ String script;+ if (prevActivityContainer != null) {+ script = String.format("$(\"<div id='%s'></div>\").insertAfter('#%s');",+ newActivityContainer.getMarkupId(), prevActivityContainer.getMarkupId());+ } else {+ script = String.format("$(\"<div id='%s'></div>\").insertAfter('#%s');",+ newActivityContainer.getMarkupId(), CodeCommentPanel.this.get("comment").getMarkupId());+ }handler.prependJavaScript(script);- handler.add(newReplyContainer);- prevReplyMarkupId = newReplyContainer.getMarkupId();+ handler.add(newActivityContainer);+ prevActivityContainer = newActivityContainer;}OneDev.getInstance(UserInfoManager.class).visitCodeComment(SecurityUtils.getUser(), getComment());@@ -520,8 +443,10 @@ public abstract class CodeCommentPanel extends Panel {response.render(CssHeaderItem.forReference(new CodeCommentCssResourceReference()));}- private void onAddReply(AjaxRequestTarget target) {- Fragment fragment = new Fragment("addReply", "replyEditFrag", CodeCommentPanel.this);+ private void onAddReply(AjaxRequestTarget target, @Nullable Boolean resolved) {+ Fragment editFragment = new Fragment("actions", "commentOrReplyEditFrag", CodeCommentPanel.this);+ editFragment.add(new UserIdentPanel("userAvatar", SecurityUtils.getUser(), Mode.AVATAR));+Form<?> form = new Form<Void>("form");String initialContent = "";@@ -563,14 +488,22 @@ public abstract class CodeCommentPanel extends Panel {return getComment().getProject();}+ @Override+ protected List<Behavior> getInputBehaviors() {+ List<Behavior> behaviors = new ArrayList<>();+ if (resolved != null)+ behaviors.add(AttributeModifier.replace("placeholder", "Leave a note"));+ return behaviors;+ }+@Overrideprotected List<User> getMentionables() {return OneDev.getInstance(UserManager.class).queryAndSort(getComment().getParticipants());}};- contentInput.setRequired(true);- contentInput.setLabel(Model.of("Comment"));+ contentInput.setRequired(resolved == null);+ contentInput.setLabel(Model.of("Content"));form.add(contentInput);FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);@@ -587,15 +520,26 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- WebMarkupContainer addReplyContainer = newAddReplyContainer();- fragment.replaceWith(addReplyContainer);- target.add(addReplyContainer);+ WebMarkupContainer actionsContainer = newActionsContainer();+ editFragment.replaceWith(actionsContainer);+ target.add(actionsContainer);}});AjaxButton saveButton = new AjaxButton("save") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (resolved != null) {+ add(new Label("label", "Ok"));+ } else {+ add(new Label("label", "Save"));+ add(AttributeAppender.append("class", "dirty-aware"));+ }+ }+@Overrideprotected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);@@ -606,39 +550,38 @@ public abstract class CodeCommentPanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- User user = SecurityUtils.getUser();- CodeComment comment = getComment();- Date date = new Date();- CodeCommentReply reply = new CodeCommentReply();- reply.setComment(comment);- reply.setDate(date);- reply.setUser(user);- reply.setContent(contentInput.getModelObject());-- onSaveCommentReply(target, reply);-- WebMarkupContainer replyContainer = newReplyContainer(repliesView.newChildId(), reply);- repliesView.add(replyContainer);-- String script = String.format("$('#%s .add-reply').before('<div id=\"%s\"></div>');",- CodeCommentPanel.this.getMarkupId(), replyContainer.getMarkupId());- target.prependJavaScript(script);- target.add(replyContainer);+ if (resolved == null) {+ CodeCommentReply reply = new CodeCommentReply();+ reply.setComment(getComment());+ reply.setDate(new Date());+ reply.setUser(SecurityUtils.getUser());+ reply.setContent(contentInput.getModelObject());++ onSaveCommentReply(target, reply);+ } else {+ CodeCommentStatusChange change = new CodeCommentStatusChange();+ change.setComment(getComment());+ change.setDate(new Date());+ change.setUser(SecurityUtils.getUser());+ change.setResolved(resolved);++ onSaveCommentStatusChange(target, change, contentInput.getModelObject());+ }- WebMarkupContainer addReplyContainer = newAddReplyContainer();- fragment.replaceWith(addReplyContainer);- target.add(addReplyContainer);+ WebMarkupContainer actionsContainer = newActionsContainer();+ editFragment.replaceWith(actionsContainer);+ target.add(actionsContainer);}};- saveButton.add(new Label("label", "Save"));- saveButton.add(AttributeAppender.append("class", "dirty-aware"));form.add(saveButton);- fragment.add(form);- fragment.setOutputMarkupId(true);- get("addReply").replaceWith(fragment);- target.add(fragment);+ editFragment.add(form);+ editFragment.add(AttributeAppender.append("class", "activity"));++ editFragment.setOutputMarkupId(true);+ get("actions").replaceWith(editFragment);+ target.add(editFragment);String script = String.format("$('#%s textarea').caret(%d);",form.getMarkupId(), initialContent.length());@@ -654,6 +597,284 @@ public abstract class CodeCommentPanel extends Panel {protected abstract void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply);+ protected abstract void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, @Nullable String note);+protected abstract boolean isContextDifferent(CompareContext compareContext);+ private interface CodeCommentActivity extends Serializable {++ Date getDate();++ Component render(String componentId);++ User getUser();++ String getAnchor();+ }++ private class CodeCommentStatusChangeActivity implements CodeCommentActivity {++ private final Long changeId;++ public CodeCommentStatusChangeActivity(CodeCommentStatusChange change) {+ changeId = change.getId();+ }++ @Override+ public Component render(String componentId) {+ Fragment fragment = new Fragment(componentId, "statusChangeFrag", CodeCommentPanel.this, Model.of(this));+ fragment.add(new UserIdentPanel("userAvatar", getChange().getUser(), Mode.AVATAR));+ fragment.add(new Label("userName", getChange().getUser().getDisplayName()));+ if (getChange().isResolved())+ fragment.add(new Label("action", "resolved"));+ else+ fragment.add(new Label("action", "unresolved"));+ fragment.add(new Label("date", DateUtils.formatAge(getComment().getCreateDate()))+ .add(new AttributeAppender("title", DateUtils.formatDateTime(getComment().getCreateDate()))));+ if (isContextDifferent(getComment().getCompareContext())) {+ String url = OneDev.getInstance(UrlManager.class).urlFor(getComment());+ fragment.add(new ExternalLink("context", UrlUtils.makeRelative(url)) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.put("title", "Current context is different from this action, click to show the comment context");+ }++ });+ } else {+ fragment.add(new WebMarkupContainer("context").setVisible(false));+ }+ fragment.add(AttributeAppender.append("class", "status-change"));++ fragment.setOutputMarkupId(true);++ return fragment;+ }++ public CodeCommentStatusChange getChange() {+ return OneDev.getInstance(CodeCommentStatusChangeManager.class).load(changeId);+ }++ @Override+ public Date getDate() {+ return getChange().getDate();+ }++ @Override+ public String getAnchor() {+ return getChange().getAnchor();+ }++ @Override+ public User getUser() {+ return getChange().getUser();+ }++ }++ public class CodeCommentReplyActivity implements CodeCommentActivity {++ private final Long replyId;++ public CodeCommentReplyActivity(CodeCommentReply reply) {+ replyId = reply.getId();+ }++ @Override+ public Component render(String componentId) {+ CodeCommentReply reply = getReply();+ Fragment viewFragment = new Fragment(componentId, "commentOrReplyViewFrag",+ CodeCommentPanel.this, Model.of(this));+ viewFragment.setOutputMarkupId(true);+ viewFragment.setMarkupId(reply.getAnchor());+ viewFragment.add(AttributeAppender.append("name", reply.getAnchor()));++ viewFragment.add(new UserIdentPanel("userAvatar", reply.getUser(), Mode.AVATAR));+ viewFragment.add(new Label("userName", reply.getUser().getDisplayName()));+ viewFragment.add(new Label("action", "replied"));+ viewFragment.add(new Label("date", DateUtils.formatAge(reply.getDate()))+ .add(new AttributeAppender("title", DateUtils.formatDateTime(reply.getDate()))));+ if (isContextDifferent(reply.getCompareContext())) {+ String url = OneDev.getInstance(UrlManager.class).urlFor(reply);+ viewFragment.add(new ExternalLink("context", UrlUtils.makeRelative(url)) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.put("title", "Current context is different from the context when this reply is added, click to show the reply context");+ }++ });+ } else {+ viewFragment.add(new WebMarkupContainer("context").setVisible(false));+ }++ viewFragment.add(new WebMarkupContainer("anchor") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ tag.put("href", "#" + getReply().getAnchor());+ }++ });++ viewFragment.add(new MarkdownViewer("content", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return getReply().getContent();+ }++ @Override+ public void setObject(String object) {+ CodeCommentReply reply = getReply();+ reply.setContent(object);+ onSaveCommentReply(RequestCycle.get().find(AjaxRequestTarget.class), reply);+ }++ }, null));++ WebMarkupContainer foot = new WebMarkupContainer("foot");+ foot.setVisible(SecurityUtils.canModifyOrDelete(reply));++ foot.add(new AjaxLink<Void>("edit") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Fragment editFragment = new Fragment(viewFragment.getId(),+ "commentOrReplyEditFrag", CodeCommentPanel.this,+ Model.of(replyId));+ editFragment.add(new UserIdentPanel("userAvatar", getReply().getUser(), Mode.AVATAR));++ Form<?> form = new Form<Void>("form");+ CommentInput contentInput = new CommentInput("content", Model.of(getReply().getContent()), true) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getComment().getUUID(),+ SecurityUtils.canManageCodeComments(getProject()));+ }++ @Override+ protected Project getProject() {+ return getComment().getProject();+ }++ @Override+ protected List<User> getMentionables() {+ return OneDev.getInstance(UserManager.class).queryAndSort(getComment().getParticipants());+ }++ };+ contentInput.setRequired(true);+ contentInput.setLabel(Model.of("Comment"));+ form.add(contentInput);++ FencedFeedbackPanel feedback = new FencedFeedbackPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.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 activityContainer = new CodeCommentReplyActivity(getReply()).render(componentId);+ editFragment.replaceWith(activityContainer);+ target.add(activityContainer);+ }++ });++ 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) {+ super.onSubmit(target, form);++ CodeCommentReply reply = getReply();+ reply.setContent(contentInput.getModelObject());+ onSaveCommentReply(target, reply);+ reply.setContent(contentInput.getModelObject());++ Component activityContainer = new CodeCommentReplyActivity(reply).render(componentId);+ editFragment.replaceWith(activityContainer);+ target.add(activityContainer);+ }++ }.add(new Label("label", "Save")));++ editFragment.add(form);+ editFragment.setOutputMarkupId(true);+ editFragment.add(AttributeAppender.append("class", "reply"));++ viewFragment.replaceWith(editFragment);+ target.add(editFragment);+ }++ });+ foot.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this reply?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ viewFragment.remove();+ OneDev.getInstance(CodeCommentReplyManager.class).delete(getReply());+ target.appendJavaScript(String.format("$('#%s').remove();", viewFragment.getMarkupId()));+ }++ });++ viewFragment.add(foot);++ viewFragment.add(AttributeAppender.append("class", "reply"));++ return viewFragment;+ }++ public Long getCommentId() {+ return replyId;+ }++ public CodeCommentReply getReply() {+ return OneDev.getInstance(CodeCommentReplyManager.class).load(replyId);+ }++ @Override+ public Date getDate() {+ return getReply().getDate();+ }++ @Override+ public String getAnchor() {+ return getReply().getAnchor();+ }++ @Override+ public User getUser() {+ return getReply().getUser();+ }++ }}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css b/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.cssindex 8afdfee29b..dafcaa78f0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css@@ -10,46 +10,40 @@display: none;}}-.code-comment>.section {- position: relative;- margin-left: -1rem;- padding-left: 1rem;+.code-comment>div {border-left: 4px solid white;-}-.dark-mode .code-comment>.section {- border-left-color: var(--dark-mode-dark);-}-.code-comment>.section>.detail, .code-comment>.section>form {- padding-bottom: 1rem;- padding-top: 1rem;border-bottom: 1px solid var(--light);}-.dark-mode .code-comment>.section>.detail, .dark-mode .code-comment>.section>form {+.code-comment>div:last-child {+ border-bottom: none;+}+.dark-mode .code-comment>div {+ border-left-color: var(--dark-mode-dark);border-bottom-color: var(--dark-mode-light-dark);}-.code-comment>.section.new {- border-left: 4px solid var(--primary);++.code-comment>.status-change>.detail {+ margin-top: 0.25rem;}-.code-comment>.section>.user-avatar {- position: absolute;- left: 1rem;- top: 1rem;+.code-comment>div.new {+ border-left: 4px solid var(--primary);}-.code-comment>.section>.user-avatar img {+.code-comment>div>.user-avatar img {width: 32px;height: 32px;}-.code-comment>.section>.detail {- padding-left: 3rem;-}-.code-comment>.section>.detail>.body {+.code-comment>div>.detail>.body {padding-top: 0.5rem;}-.code-comment>.section>.detail>.body>.feedback .alert {- margin-bottom: 0;+.code-comment>div .reply-anchor {+ display: none;}-.code-comment>.add-reply {- margin-top: 1.2rem;+.code-comment>div:hover .reply-anchor {+ display: inline;+}++.code-comment>div>.detail>.body>.feedback .alert {+ margin-bottom: 0;}.code-comment .markdown-rendered {font-size: inherit;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.htmlindex 8e2a993860..3493d6e5fa 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html@@ -50,8 +50,11 @@<div class="content flex-grow-1 overflow-hidden d-flex flex-column"><div wicket:id="head" class="head d-flex align-items-center px-3 py-2 border-bottom"><h6 class="mb-0 mr-2">Code Comment</h6>- <span wicket:id="outdated" class="mr-3 badge badge-sm badge-warning">outdated</span>- <a wicket:id="locate" title="Show commented code snippet" class="btn btn-xs btn-icon btn-hover-primary btn-light locate mr-3"><wicket:svg href="hand" class="icon"></wicket:svg></a>+ <span wicket:id="outdated" class="mr-2 badge badge-sm badge-warning">outdated</span>+ <span wicket:id="resolved" class="mr-2 text-success" title="Resolved">+ <wicket:svg href="tick-circle-o" class="icon"></wicket:svg>+ </span>+ <a wicket:id="locate" title="Show commented code snippet" class="btn btn-xs btn-icon btn-hover-primary btn-light locate ml-2 mr-3"><wicket:svg href="hand" class="icon"></wicket:svg></a><a wicket:id="close" class="ml-auto" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a></div><div wicket:id="body" class="body overflow-auto flex-grow-1 p-3"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 9d45f70554..f32f24bd36 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -69,6 +69,7 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -968,6 +969,12 @@ public abstract class RevisionDiffPanel extends Panel {annotationSupport.onSaveCommentReply(reply);}+ @Override+ protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {+ change.setCompareContext(getCompareContext());+ annotationSupport.onSaveCommentStatusChange(change, note);+ }+@Overrideprotected boolean isContextDifferent(CompareContext compareContext) {return RevisionDiffPanel.this.isContextDifferent(compareContext);@@ -1176,6 +1183,12 @@ public abstract class RevisionDiffPanel extends Panel {annotationSupport.onSaveCommentReply(reply);}+ @Override+ protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {+ change.setCompareContext(getCompareContext());+ annotationSupport.onSaveCommentStatusChange(change, note);+ }+@Overrideprotected boolean isContextDifferent(CompareContext compareContext) {return RevisionDiffPanel.this.isContextDifferent(compareContext);@@ -1278,6 +1291,40 @@ public abstract class RevisionDiffPanel extends Panel {});+ head.add(new WebMarkupContainer("resolved") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ Set<String> observables = new HashSet<>();+ if (annotationSupport != null && annotationSupport.getOpenComment() != null)+ observables.add(CodeComment.getWebSocketObservable(annotationSupport.getOpenComment().getId()));+ return observables;+ }++ });+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(annotationSupport != null+ && annotationSupport.getOpenComment() != null+ && annotationSupport.getOpenComment().isResolved());+ }++ }.setOutputMarkupPlaceholderTag(true));+head.add(new AjaxLink<Void>("locate") {@Override@@ -1362,6 +1409,12 @@ public abstract class RevisionDiffPanel extends Panel {annotationSupport.onSaveCommentReply(reply);}+ @Override+ protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {+ change.setCompareContext(getCompareContext());+ annotationSupport.onSaveCommentStatusChange(change, note);+ }+@Overrideprotected boolean isContextDifferent(CompareContext compareContext) {return RevisionDiffPanel.this.isContextDifferent(compareContext);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.htmlindex 485d4ee7d3..d8ab99c2fd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html@@ -4,8 +4,11 @@<div class="content flex-grow-1 overflow-hidden d-flex flex-column"><div wicket:id="head" class="head d-flex align-items-center px-3 py-2 flex-shrink-0 border-bottom"><h6 class="mr-2 mb-0">Code Comment</h6>- <span wicket:id="outdated" class="badge badge-sm badge-warning mr-3">outdated</span>- <a wicket:id="locate" class="locate btn btn-light btn-icon btn-xs btn-hover-primary mr-3" title="Show commented code snippet"><wicket:svg href="hand" class="icon"></wicket:svg></a>+ <span wicket:id="outdated" class="badge badge-sm badge-warning mr-2">outdated</span>+ <span wicket:id="resolved" class="mr-2 text-success" title="Resolved">+ <wicket:svg href="tick-circle-o" class="icon"></wicket:svg>+ </span>+ <a wicket:id="locate" class="locate btn btn-light btn-icon btn-xs btn-hover-primary ml-2 mr-3" title="Show commented code snippet"><wicket:svg href="hand" class="icon"></wicket:svg></a><a wicket:id="close" class="ml-auto text-muted text-hover-primary" title="Hide comment"><wicket:svg href="times" class="icon"></wicket:svg></a></div><div wicket:id="body" class="body overflow-auto flex-grow-1 p-3"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex 7489e19079..9551ea9942 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.blob.render.source;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;@@ -23,6 +24,7 @@ import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;@@ -69,6 +71,7 @@ import io.onedev.server.codequality.LineCoverageContribution;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;@@ -77,6 +80,7 @@ import io.onedev.server.git.command.BlameCommand;import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -93,6 +97,7 @@ import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;import io.onedev.server.web.component.codecomment.CodeCommentPanel;import io.onedev.server.web.component.floating.FloatingPanel;@@ -349,6 +354,38 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear}.setOutputMarkupId(true));+ head.add(new WebMarkupContainer("resolved") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ Set<String> observables = new HashSet<>();+ if (context.getOpenComment() != null)+ observables.add(CodeComment.getWebSocketObservable(context.getOpenComment().getId()));+ return observables;+ }++ });+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(context.getOpenComment() != null && context.getOpenComment().isResolved());+ }++ }.setOutputMarkupPlaceholderTag(true));+head.add(new AjaxLink<Void>("close") {@Override@@ -390,6 +427,11 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearSourceViewPanel.this.onSaveCommentReply(reply);}+ @Override+ protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {+ SourceViewPanel.this.onSaveCommentStatusChange(change, note);+ }+@Overrideprotected boolean isContextDifferent(CompareContext compareContext) {return SourceViewPanel.this.isContextDifferent(compareContext);@@ -530,6 +572,11 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearSourceViewPanel.this.onSaveCommentReply(reply);}+ @Override+ protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {+ SourceViewPanel.this.onSaveCommentStatusChange(change, note);+ }+@Overrideprotected boolean isContextDifferent(CompareContext compareContext) {return SourceViewPanel.this.isContextDifferent(compareContext);@@ -582,6 +629,11 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearSourceViewPanel.this.onSaveCommentReply(reply);}+ @Override+ protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {+ SourceViewPanel.this.onSaveCommentStatusChange(change, note);+ }+@Overrideprotected boolean isContextDifferent(CompareContext compareContext) {return SourceViewPanel.this.isContextDifferent(compareContext);@@ -1162,4 +1214,9 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearOneDev.getInstance(CodeCommentReplyManager.class).save(reply);}+ private void onSaveCommentStatusChange(CodeCommentStatusChange change, String note) {+ change.setCompareContext(getCompareContext());+ OneDev.getInstance(CodeCommentStatusChangeManager.class).save(change, note);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 3c13940fcb..fcedb47225 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -54,6 +54,7 @@ import io.onedev.server.codequality.CoverageStatus;import io.onedev.server.codequality.LineCoverageContribution;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;@@ -62,6 +63,7 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.CompareContext;@@ -745,6 +747,11 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.AnnotaOneDev.getInstance(CodeCommentReplyManager.class).save(reply);}+ @Override+ public void onSaveCommentStatusChange(CodeCommentStatusChange change, String note) {+ OneDev.getInstance(CodeCommentStatusChangeManager.class).save(change, note);+ }+@Overrideprotected Component newProjectTitle(String componentId) {Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex fa0043f777..753381187f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -39,11 +39,13 @@ import io.onedev.server.codequality.CoverageStatus;import io.onedev.server.codequality.LineCoverageContribution;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.CompareContext;@@ -860,6 +862,11 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.AnnOneDev.getInstance(CodeCommentReplyManager.class).save(reply);}+ @Override+ public void onSaveCommentStatusChange(CodeCommentStatusChange change, String note) {+ OneDev.getInstance(CodeCommentStatusChangeManager.class).save(change, note);+ }+@Overridepublic String getMarkUrl(Mark mark) {State markState = new State();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 1f7c651457..3786da9468 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -51,6 +51,7 @@ import io.onedev.server.codequality.CoverageStatus;import io.onedev.server.codequality.LineCoverageContribution;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;@@ -58,6 +59,7 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequest.Status;@@ -1022,6 +1024,11 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.AnnoOneDev.getInstance(CodeCommentReplyManager.class).save(reply);}+ @Override+ public void onSaveCommentStatusChange(CodeCommentStatusChange change, String note) {+ OneDev.getInstance(CodeCommentStatusChangeManager.class).save(change, note);+ }+@Overrideprotected boolean isPermitted() {return SecurityUtils.canReadCode(target.getProject()) && SecurityUtils.canReadCode(source.getProject());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 53260890ce..703de2e242 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -52,11 +52,13 @@ import io.onedev.server.codequality.CoverageStatus;import io.onedev.server.codequality.LineCoverageContribution;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;@@ -856,6 +858,16 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements RevOneDev.getInstance(CodeCommentReplyManager.class).save(reply);}+ @Override+ public void onSaveCommentStatusChange(CodeCommentStatusChange change, String note) {+ if (change.isNew()) {+ CompareContext compareContext = change.getCompareContext();+ compareContext.setOldCommitHash(state.oldCommitHash);+ compareContext.setNewCommitHash(state.newCommitHash);+ }+ OneDev.getInstance(CodeCommentStatusChangeManager.class).save(change, note);+ }+@Overridepublic PageParameters getParamsBeforeEdit() {return paramsOf(getPullRequest(), state);diff --git a/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.java b/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.javaindex 016d42783c..02c1aaf7d1 100644--- a/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.java+++ b/server-core/src/main/java/io/onedev/server/web/util/RevisionDiff.java@@ -15,6 +15,7 @@ import io.onedev.server.codequality.CoverageStatus;import io.onedev.server.git.BlobChange;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.support.Mark;public class RevisionDiff {@@ -87,5 +88,7 @@ public class RevisionDiff {void onSaveCommentReply(CodeCommentReply reply);+ void onSaveCommentStatusChange(CodeCommentStatusChange change, @Nullable String note);+}}\ No newline at end of file