The Unified and Autonomous Development Platform
fix issue #138: A more user-friendly way to show field changes of issues
Robin Shenc7725d86e2d3
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.javaindex ccc57e9510..9a7d4fea9f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java@@ -1,5 +1,6 @@package io.onedev.server.entitymanager;+import java.util.Collection;import java.util.Iterator;import java.util.Map;@@ -22,7 +23,8 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {void changeFields(Issue issue, Map<String, Object> fieldValues);- void changeState(Issue issue, String state, Map<String, Object> fieldValues, @Nullable String comment);+ void changeState(Issue issue, String state, Map<String, Object> fieldValues,+ Collection<String> removeFields, @Nullable String comment);void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state,@Nullable Optional<Milestone> milestone, Map<String, Object> fieldValues,diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex 94448d7f2b..25a5921b22 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -197,11 +197,13 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Override- public void changeState(Issue issue, String state, Map<String, Object> fieldValues, @Nullable String comment) {+ public void changeState(Issue issue, String state, Map<String, Object> fieldValues,+ Collection<String> removeFields, @Nullable String comment) {String prevState = issue.getState();Map<String, Input> prevFields = issue.getFieldInputs();+issue.setState(state);-+ issue.removeFields(removeFields);issue.setFieldValues(fieldValues);issueFieldManager.saveFields(issue);@@ -294,8 +296,8 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeBuild.push(build);try {for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE, true)) {- issue.removeFields(transition.getRemoveFields());- changeState(issue, transition.getToState(), new HashMap<>(), null);+ changeState(issue, transition.getToState(), new HashMap<>(),+ transition.getRemoveFields(), null);}} finally {Build.pop();@@ -358,8 +360,8 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangePullRequest.push(request);try {for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE, true)) {- issue.removeFields(transition.getRemoveFields());- changeState(issue, transition.getToState(), new HashMap<>(), null);+ changeState(issue, transition.getToState(), new HashMap<>(),+ transition.getRemoveFields(), null);}} finally {PullRequest.pop();@@ -492,8 +494,8 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange});try {for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE, true)) {- issue.removeFields(transition.getRemoveFields());- changeState(issue, transition.getToState(), new HashMap<>(), null);+ changeState(issue, transition.getToState(), new HashMap<>(),+ transition.getRemoveFields(), null);}} finally {ProjectScopedCommit.pop();diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.javaindex 44b33a9339..721539f853 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java@@ -23,8 +23,8 @@ public class IssueChangeEvent extends IssueEvent implements MarkdownAware {@Overridepublic String getMarkdown() {- if (change.getData().getCommentSupport() != null)- return change.getData().getCommentSupport().getComment();+ if (change.getData().getCommentAware() != null)+ return change.getData().getCommentAware().getComment();elsereturn null;}diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.javaindex de7bb1368f..20f02d841b 100644--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java@@ -18,8 +18,8 @@ public class PullRequestChangeEvent extends PullRequestEvent implements Markdown@Overridepublic String getMarkdown() {- if (change.getData().getCommentSupport() != null)- return change.getData().getCommentSupport().getComment();+ if (change.getData().getCommentAware() != null)+ return change.getData().getCommentAware().getComment();elsereturn null;}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 1f4f33020c..b72d87d762 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -517,6 +517,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStif (fieldNames.contains(it.next().getName()))it.remove();}+ fieldInputs = null;}public void setFieldValues(Map<String, Object> fieldValues) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.javaindex 7444b5a36e..6d4535679c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java@@ -1,23 +1,20 @@package io.onedev.server.model.support.issue.changedata;-import java.util.List;+import java.util.LinkedHashMap;import java.util.Map;import javax.annotation.Nullable;import org.apache.wicket.Component;-import com.google.common.base.Objects;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.Milestone;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.util.Input;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.component.issue.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.web.component.issue.activities.activity.IssueFieldChangePanel;public class IssueBatchUpdateData extends IssueFieldChangeData {@@ -33,8 +30,10 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {private String comment;- public IssueBatchUpdateData(String oldState, String newState, @Nullable Milestone oldMilestone, @Nullable Milestone newMilestone,- Map<String, Input> oldFields, Map<String, Input> newFields, @Nullable String comment) {+ public IssueBatchUpdateData(String oldState, String newState,+ @Nullable Milestone oldMilestone, @Nullable Milestone newMilestone,+ Map<String, Input> oldFields, Map<String, Input> newFields,+ @Nullable String comment) {super(oldFields, newFields);this.oldState = oldState;this.newState = newState;@@ -44,33 +43,23 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {}@Override- protected List<String> getOldLines() {- List<String> oldLines = super.getOldLines();- if (!Objects.equal(oldMilestone, newMilestone)) {- if (oldMilestone != null)- oldLines.add(0, "Milestone: " + oldMilestone);- else- oldLines.add(0, "Milestone: ");- }- if (!Objects.equal(oldState, newState)) {- oldLines.add(0, "State: " + oldState);- }- return oldLines;+ public Map<String, String> getOldFieldValues() {+ Map<String, String> oldFieldValues = new LinkedHashMap<>();+ oldFieldValues.put("State", oldState);+ if (oldMilestone != null)+ oldFieldValues.put("Milestone", oldMilestone);+ oldFieldValues.putAll(super.getOldFieldValues());+ return oldFieldValues;}@Override- protected List<String> getNewLines() {- List<String> newLines = super.getNewLines();- if (!Objects.equal(oldMilestone, newMilestone)) {- if (newMilestone != null)- newLines.add(0, "Milestone: " + newMilestone);- else- newLines.add(0, "Milestone: ");- }- if (!Objects.equal(oldState, newState)) {- newLines.add(0, "State: " + newState);- }- return newLines;+ public Map<String, String> getNewFieldValues() {+ Map<String, String> newFieldValues = new LinkedHashMap<>();+ newFieldValues.put("State", newState);+ if (newMilestone != null)+ newFieldValues.put("Milestone", newMilestone);+ newFieldValues.putAll(super.getNewFieldValues());+ return newFieldValues;}public String getNewState() {@@ -90,8 +79,8 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {}@Override- public CommentSupport getCommentSupport() {- return new CommentSupport() {+ public CommentAware getCommentAware() {+ return new CommentAware() {private static final long serialVersionUID = 1L;@@ -111,7 +100,7 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {@Overridepublic Component render(String componentId, IssueChange change) {Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {+ return new IssueFieldChangePanel(componentId, true) {private static final long serialVersionUID = 1L;@@ -120,34 +109,6 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {return OneDev.getInstance(IssueChangeManager.class).load(changeId);}- @Override- protected DiffSupport getDiffSupport() {- return new DiffSupport() {-- private static final long serialVersionUID = 1L;-- @Override- public List<String> getOldLines() {- return IssueBatchUpdateData.this.getOldLines();- }-- @Override- public List<String> getNewLines() {- return IssueBatchUpdateData.this.getNewLines();- }-- @Override- public String getOldFileName() {- return "a.txt";- }-- @Override- public String getNewFileName() {- return "b.txt";- }-- };- }};}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.javaindex 10ebe410fc..b01fc78908 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java@@ -12,7 +12,7 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;public interface IssueChangeData extends Serializable {@@ -21,7 +21,7 @@ public interface IssueChangeData extends Serializable {String getActivity(@Nullable Issue withIssue);@Nullable- CommentSupport getCommentSupport();+ CommentAware getCommentAware();Map<String, Collection<User>> getNewUsers();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.javaindex f1168ad74e..5cad8e2978 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java@@ -2,18 +2,15 @@ package io.onedev.server.model.support.issue.changedata;import java.util.Collection;import java.util.HashMap;-import java.util.List;import java.util.Map;import org.apache.wicket.Component;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;+import io.onedev.server.util.CommentAware;public class IssueDescriptionChangeData implements IssueChangeData {@@ -28,11 +25,17 @@ public class IssueDescriptionChangeData implements IssueChangeData {this.newDescription = newDescription;}+ public String getOldDescription() {+ return oldDescription;+ }++ public String getNewDescription() {+ return newDescription;+ }+@Overridepublic Component render(String componentId, IssueChange change) {- List<String> oldLines = StringUtils.splitAndTrim(oldDescription, "\n");- List<String> newLines = StringUtils.splitAndTrim(newDescription, "\n");- return new PlainDiffPanel(componentId, oldLines, "a.txt", newLines, "b.txt", true);+ throw new UnsupportedOperationException();}@Override@@ -44,7 +47,7 @@ public class IssueDescriptionChangeData implements IssueChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.javaindex 1c06a57bb8..2b0bff84e6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java@@ -20,9 +20,9 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.util.Input;-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;+import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;public class IssueFieldChangeData implements IssueChangeData {@@ -37,37 +37,18 @@ public class IssueFieldChangeData implements IssueChangeData {this.newFields = copyNonEmptyFields(newFields);}- protected List<String> getOldLines() {- List<String> oldLines = new ArrayList<>();- for (Input oldField: oldFields.values()) {- Input newField = newFields.get(oldField.getName());- if (newField == null || !describe(oldField).equals(describe(newField)))- oldLines.add(describe(oldField));- }- for (Input newField: newFields.values()) {- if (!oldFields.containsKey(newField.getName()))- oldLines.add("");- }- return oldLines;+ public Map<String, String> getOldFieldValues() {+ Map<String, String> oldFieldValues = new LinkedHashMap<>();+ for (Map.Entry<String, Input> entry: oldFields.entrySet())+ oldFieldValues.put(entry.getKey(), StringUtils.join(entry.getValue().getValues()));+ return oldFieldValues;}- protected List<String> getNewLines() {- List<String> newLines = new ArrayList<>();- for (Input oldField: oldFields.values()) {- Input newField = newFields.get(oldField.getName());- if (newField != null) {- if (!describe(oldField).equals(describe(newField))) {- newLines.add(describe(newField));- }- } else {- newLines.add("");- }- }- for (Input newField: newFields.values()) {- if (!oldFields.containsKey(newField.getName()))- newLines.add(describe(newField));- }- return newLines;+ public Map<String, String> getNewFieldValues() {+ Map<String, String> newFieldValues = new LinkedHashMap<>();+ for (Map.Entry<String, Input> entry: newFields.entrySet())+ newFieldValues.put(entry.getKey(), StringUtils.join(entry.getValue().getValues()));+ return newFieldValues;}private Map<String, Input> copyNonEmptyFields(Map<String, Input> fields) {@@ -85,7 +66,7 @@ public class IssueFieldChangeData implements IssueChangeData {@Overridepublic Component render(String componentId, IssueChange change) {- return new PlainDiffPanel(componentId, getOldLines(), "a.txt", getNewLines(), "b.txt", true);+ return new PropertyChangePanel(componentId, getOldFieldValues(), getNewFieldValues(), true);}@Override@@ -104,7 +85,7 @@ public class IssueFieldChangeData implements IssueChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.javaindex 49ef47863c..a9708a9763 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java@@ -1,9 +1,7 @@package io.onedev.server.model.support.issue.changedata;-import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;-import java.util.List;import java.util.Map;import javax.annotation.Nullable;@@ -15,8 +13,9 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.Milestone;import io.onedev.server.model.User;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;+import io.onedev.server.util.CollectionUtils;+import io.onedev.server.util.CommentAware;+import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;public class IssueMilestoneChangeData implements IssueChangeData {@@ -33,25 +32,10 @@ public class IssueMilestoneChangeData implements IssueChangeData {@Overridepublic Component render(String componentId, IssueChange change) {- return new PlainDiffPanel(componentId, getOldLines(), "a.txt", getNewLines(), "b.txt", true);- }-- private List<String> getOldLines() {- List<String> oldLines = new ArrayList<>();- if (oldMilestone != null)- oldLines.add("Milestone: " + oldMilestone);- else- oldLines.add("Milestone: ");- return oldLines;- }-- private List<String> getNewLines() {- List<String> newLines = new ArrayList<>();- if (newMilestone != null)- newLines.add("Milestone: " + newMilestone);- else- newLines.add("Milestone: ");- return newLines;+ return new PropertyChangePanel(componentId,+ CollectionUtils.newHashMap("Milestone", oldMilestone),+ CollectionUtils.newHashMap("Milestone", newMilestone),+ true);}public String getOldMilestone() {@@ -71,7 +55,7 @@ public class IssueMilestoneChangeData implements IssueChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.javaindex 518767bb96..c8657feb85 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;public class IssueReferencedFromCodeCommentData implements IssueChangeData {@@ -42,7 +42,7 @@ public class IssueReferencedFromCodeCommentData implements IssueChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.javaindex eff68be1f3..af4b6d8cda 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java@@ -10,7 +10,7 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;public class IssueReferencedFromIssueData implements IssueChangeData {@@ -41,7 +41,7 @@ public class IssueReferencedFromIssueData implements IssueChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.javaindex 4f119d6bc7..479700aeb4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;public class IssueReferencedFromPullRequestData implements IssueChangeData {@@ -42,7 +42,7 @@ public class IssueReferencedFromPullRequestData implements IssueChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.javaindex 468e5aca41..b3678f080f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java@@ -1,6 +1,6 @@package io.onedev.server.model.support.issue.changedata;-import java.util.List;+import java.util.LinkedHashMap;import java.util.Map;import javax.annotation.Nullable;@@ -11,10 +11,9 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.util.Input;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.component.issue.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.web.component.issue.activities.activity.IssueFieldChangePanel;public class IssueStateChangeData extends IssueFieldChangeData {@@ -26,8 +25,9 @@ public class IssueStateChangeData extends IssueFieldChangeData {private String comment;- public IssueStateChangeData(String oldState, String newState, Map<String, Input> oldFields,- Map<String, Input> newFields, @Nullable String comment) {+ public IssueStateChangeData(String oldState, String newState,+ Map<String, Input> oldFields, Map<String, Input> newFields,+ @Nullable String comment) {super(oldFields, newFields);this.oldState = oldState;this.newState = newState;@@ -35,17 +35,19 @@ public class IssueStateChangeData extends IssueFieldChangeData {}@Override- protected List<String> getOldLines() {- List<String> oldLines = super.getOldLines();- oldLines.add(0, "State: " + oldState);- return oldLines;+ public Map<String, String> getOldFieldValues() {+ Map<String, String> oldFieldValues = new LinkedHashMap<>();+ oldFieldValues.put("State", oldState);+ oldFieldValues.putAll(super.getOldFieldValues());+ return oldFieldValues;}@Override- protected List<String> getNewLines() {- List<String> newLines = super.getNewLines();- newLines.add(0, "State: " + newState);- return newLines;+ public Map<String, String> getNewFieldValues() {+ Map<String, String> newFieldValues = new LinkedHashMap<>();+ newFieldValues.put("State", newState);+ newFieldValues.putAll(super.getNewFieldValues());+ return newFieldValues;}public String getNewState() {@@ -57,8 +59,8 @@ public class IssueStateChangeData extends IssueFieldChangeData {}@Override- public CommentSupport getCommentSupport() {- return new CommentSupport() {+ public CommentAware getCommentAware() {+ return new CommentAware() {private static final long serialVersionUID = 1L;@@ -78,7 +80,8 @@ public class IssueStateChangeData extends IssueFieldChangeData {@Overridepublic Component render(String componentId, IssueChange change) {Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {++ return new IssueFieldChangePanel(componentId, true) {private static final long serialVersionUID = 1L;@@ -87,34 +90,6 @@ public class IssueStateChangeData extends IssueFieldChangeData {return OneDev.getInstance(IssueChangeManager.class).load(changeId);}- @Override- protected DiffSupport getDiffSupport() {- return new DiffSupport() {-- private static final long serialVersionUID = 1L;-- @Override- public List<String> getOldLines() {- return IssueStateChangeData.this.getOldLines();- }-- @Override- public List<String> getNewLines() {- return IssueStateChangeData.this.getNewLines();- }-- @Override- public String getOldFileName() {- return "a.txt";- }-- @Override- public String getNewFileName() {- return "b.txt";- }-- };- }};}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.javaindex ae217de814..2dad300ecb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java@@ -6,14 +6,13 @@ import java.util.Map;import org.apache.wicket.Component;-import com.google.common.collect.Lists;-import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;+import io.onedev.server.util.CollectionUtils;+import io.onedev.server.util.CommentAware;+import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;public class IssueTitleChangeData implements IssueChangeData {@@ -30,7 +29,10 @@ public class IssueTitleChangeData implements IssueChangeData {@Overridepublic Component render(String componentId, IssueChange change) {- return new PlainDiffPanel(componentId, Lists.newArrayList(oldTitle), "a.txt", Lists.newArrayList(newTitle), "b.txt", true);+ return new PropertyChangePanel(componentId,+ CollectionUtils.newHashMap("Title", oldTitle),+ CollectionUtils.newHashMap("Title", newTitle),+ true);}@Override@@ -42,7 +44,7 @@ public class IssueTitleChangeData implements IssueChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.javaindex 37148a3b55..32c6ea62ee 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java@@ -8,9 +8,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.util.CommentAware;public class PullRequestApproveData implements PullRequestChangeData {@@ -33,25 +31,21 @@ public class PullRequestApproveData implements PullRequestChangeData {@Overridepublic Component render(String componentId, PullRequestChange change) {Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {-+ return new PullRequestChangeCommentPanel(componentId) {+private static final long serialVersionUID = 1L;@Overrideprotected PullRequestChange getChange() {return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);}-- @Override- protected DiffSupport getDiffSupport() {- return null;- }- };++ };}-+@Override- public CommentSupport getCommentSupport() {- return new CommentSupport() {+ public CommentAware getCommentAware() {+ return new CommentAware() {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.javaindex 651d39aeff..495cb60665 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java@@ -4,7 +4,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;public class PullRequestAssigneeAddData implements PullRequestChangeData {@@ -25,7 +25,7 @@ public class PullRequestAssigneeAddData implements PullRequestChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.javaindex 5d198d241d..c15f27252a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java@@ -4,7 +4,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;public class PullRequestAssigneeRemoveData implements PullRequestChangeData {@@ -25,7 +25,7 @@ public class PullRequestAssigneeRemoveData implements PullRequestChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeCommentPanel.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeCommentPanel.javanew file mode 100644index 0000000000..ed1740ba82--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeCommentPanel.java@@ -0,0 +1,74 @@+package io.onedev.server.model.support.pullrequest.changedata;++import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequestChange;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.markdown.ContentVersionSupport;+import io.onedev.server.web.component.project.comment.ProjectCommentPanel;+import io.onedev.server.web.util.DeleteCallback;+import io.onedev.server.web.util.ProjectAttachmentSupport;++@SuppressWarnings("serial")+public abstract class PullRequestChangeCommentPanel extends ProjectCommentPanel {++ public PullRequestChangeCommentPanel(String id) {+ super(id);+ }++ @Override+ protected String getComment() {+ return getChange().getData().getCommentAware().getComment();+ }++ @Override+ protected List<User> getMentionables() {+ return OneDev.getInstance(UserManager.class).queryAndSort(getChange().getRequest().getParticipants());+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, String comment) {+ getChange().getData().getCommentAware().setComment(comment);+ OneDev.getInstance(PullRequestChangeManager.class).save(getChange());+ }++ @Override+ protected Project getProject() {+ return getChange().getRequest().getTargetProject();+ }++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getChange().getRequest().getUUID());+ }++ @Override+ protected boolean canModifyOrDeleteComment() {+ return SecurityUtils.canModifyOrDelete(getChange());+ }++ @Override+ protected String getRequiredLabel() {+ return null;+ }++ @Override+ protected ContentVersionSupport getContentVersionSupport() {+ return null;+ }++ @Override+ protected DeleteCallback getDeleteCallback() {+ return null;+ }++ protected abstract PullRequestChange getChange();+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.javaindex 2732304e03..553895cdf7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java@@ -8,7 +8,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;public interface PullRequestChangeData extends Serializable {@@ -17,6 +17,6 @@ public interface PullRequestChangeData extends Serializable {abstract String getActivity(@Nullable PullRequest withRequest);@Nullable- abstract CommentSupport getCommentSupport();+ abstract CommentAware getCommentAware();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.javaindex c09000855a..cea558ddb1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java@@ -1,14 +1,10 @@package io.onedev.server.model.support.pullrequest.changedata;-import java.util.List;-import org.apache.wicket.Component;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;+import io.onedev.server.util.CommentAware;public class PullRequestDescriptionChangeData implements PullRequestChangeData {@@ -23,6 +19,14 @@ public class PullRequestDescriptionChangeData implements PullRequestChangeData {this.newDescription = newDescription;}+ public String getOldDescription() {+ return oldDescription;+ }++ public String getNewDescription() {+ return newDescription;+ }+@Overridepublic String getActivity(PullRequest withRequest) {String activity = "changed description";@@ -33,13 +37,11 @@ public class PullRequestDescriptionChangeData implements PullRequestChangeData {@Overridepublic Component render(String componentId, PullRequestChange change) {- List<String> oldLines = StringUtils.splitAndTrim(oldDescription, "\n");- List<String> newLines = StringUtils.splitAndTrim(newDescription, "\n");- return new PlainDiffPanel(componentId, oldLines, "a.txt", newLines, "b.txt", true);+ throw new UnsupportedOperationException();}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.javaindex 11187e2587..aeaefe1d95 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java@@ -8,9 +8,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.util.CommentAware;public class PullRequestDiscardData implements PullRequestChangeData {@@ -31,8 +29,8 @@ public class PullRequestDiscardData implements PullRequestChangeData {}@Override- public CommentSupport getCommentSupport() {- return new CommentSupport() {+ public CommentAware getCommentAware() {+ return new CommentAware() {private static final long serialVersionUID = 1L;@@ -52,20 +50,16 @@ public class PullRequestDiscardData implements PullRequestChangeData {@Overridepublic Component render(String componentId, PullRequestChange change) {Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {-+ return new PullRequestChangeCommentPanel(componentId) {+private static final long serialVersionUID = 1L;@Overrideprotected PullRequestChange getChange() {return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);}-- @Override- protected DiffSupport getDiffSupport() {- return null;- }- };++ };}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.javaindex 858195438e..3e464a07dc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java@@ -6,7 +6,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;public class PullRequestMergeData implements PullRequestChangeData {@@ -36,7 +36,7 @@ public class PullRequestMergeData implements PullRequestChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.javaindex a650832616..f51d25dbeb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java@@ -1,19 +1,13 @@package io.onedev.server.model.support.pullrequest.changedata;-import java.util.List;-import org.apache.wicket.Component;-import com.google.common.collect.Lists;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.util.CollectionUtils;+import io.onedev.server.util.CommentAware;+import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;public class PullRequestMergeStrategyChangeData implements PullRequestChangeData {@@ -38,49 +32,14 @@ public class PullRequestMergeStrategyChangeData implements PullRequestChangeData@Overridepublic Component render(String componentId, PullRequestChange change) {- Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {-- private static final long serialVersionUID = 1L;-- @Override- protected PullRequestChange getChange() {- return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);- }-- @Override- protected DiffSupport getDiffSupport() {- return new DiffSupport() {-- private static final long serialVersionUID = 1L;-- @Override- public List<String> getOldLines() {- return Lists.newArrayList(oldStrategy.toString());- }-- @Override- public List<String> getNewLines() {- return Lists.newArrayList(newStrategy.toString());- }-- @Override- public String getOldFileName() {- return null;- }-- @Override- public String getNewFileName() {- return null;- }-- };- }- };+ return new PropertyChangePanel(componentId,+ CollectionUtils.newHashMap("Merge Strategy", oldStrategy.toString()),+ CollectionUtils.newHashMap("Merge Strategy", newStrategy.toString()),+ true);}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.javaindex 6c45c30589..359c668a0a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java@@ -5,7 +5,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.CodeComment;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;public class PullRequestReferencedFromCodeCommentData implements PullRequestChangeData {@@ -36,7 +36,7 @@ public class PullRequestReferencedFromCodeCommentData implements PullRequestChan}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.javaindex 4a61d5bc4f..1ebfd5e9da 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java@@ -5,7 +5,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;public class PullRequestReferencedFromIssueData implements PullRequestChangeData {@@ -36,7 +36,7 @@ public class PullRequestReferencedFromIssueData implements PullRequestChangeData}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.javaindex 74865e2bc0..e0c03904fa 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java@@ -4,7 +4,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;public class PullRequestReferencedFromPullRequestData implements PullRequestChangeData {@@ -35,7 +35,7 @@ public class PullRequestReferencedFromPullRequestData implements PullRequestChan}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.javaindex d07dcadc52..4c52e2bc04 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java@@ -8,9 +8,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.util.CommentAware;public class PullRequestReopenData implements PullRequestChangeData {@@ -31,8 +29,8 @@ public class PullRequestReopenData implements PullRequestChangeData {}@Override- public CommentSupport getCommentSupport() {- return new CommentSupport() {+ public CommentAware getCommentAware() {+ return new CommentAware() {private static final long serialVersionUID = 1L;@@ -52,21 +50,16 @@ public class PullRequestReopenData implements PullRequestChangeData {@Overridepublic Component render(String componentId, PullRequestChange change) {Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {-+ return new PullRequestChangeCommentPanel(componentId) {+private static final long serialVersionUID = 1L;@Overrideprotected PullRequestChange getChange() {return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);}-- @Override- protected DiffSupport getDiffSupport() {- return null;- }- };+ };}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.javaindex 112a3c5ea5..75433bf64c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java@@ -8,9 +8,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.util.CommentAware;public class PullRequestRequestedForChangesData implements PullRequestChangeData {@@ -31,8 +29,8 @@ public class PullRequestRequestedForChangesData implements PullRequestChangeData}@Override- public CommentSupport getCommentSupport() {- return new CommentSupport() {+ public CommentAware getCommentAware() {+ return new CommentAware() {private static final long serialVersionUID = 1L;@@ -52,20 +50,16 @@ public class PullRequestRequestedForChangesData implements PullRequestChangeData@Overridepublic Component render(String componentId, PullRequestChange change) {Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {-+ return new PullRequestChangeCommentPanel(componentId) {+private static final long serialVersionUID = 1L;@Overrideprotected PullRequestChange getChange() {return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);}-- @Override- protected DiffSupport getDiffSupport() {- return null;- }- };++ };}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.javaindex c0b2e7a828..cd7e73a80b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java@@ -4,7 +4,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;public class PullRequestReviewerAddData implements PullRequestChangeData {@@ -25,7 +25,7 @@ public class PullRequestReviewerAddData implements PullRequestChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.javaindex bc5ddc97c1..ddd76b23de 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java@@ -4,7 +4,7 @@ import org.apache.wicket.Component;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;+import io.onedev.server.util.CommentAware;public class PullRequestReviewerRemoveData implements PullRequestChangeData {@@ -25,7 +25,7 @@ public class PullRequestReviewerRemoveData implements PullRequestChangeData {}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.javaindex 30a8a06bb1..2e9868cc10 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java@@ -8,9 +8,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.util.CommentAware;public class PullRequestSourceBranchDeleteData implements PullRequestChangeData {@@ -31,8 +29,8 @@ public class PullRequestSourceBranchDeleteData implements PullRequestChangeData}@Override- public CommentSupport getCommentSupport() {- return new CommentSupport() {+ public CommentAware getCommentAware() {+ return new CommentAware() {private static final long serialVersionUID = 1L;@@ -52,20 +50,16 @@ public class PullRequestSourceBranchDeleteData implements PullRequestChangeData@Overridepublic Component render(String componentId, PullRequestChange change) {Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {-+ return new PullRequestChangeCommentPanel(componentId) {+private static final long serialVersionUID = 1L;@Overrideprotected PullRequestChange getChange() {return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);}-- @Override- protected DiffSupport getDiffSupport() {- return null;- }- };++ };}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.javaindex 9e79d5c634..33cd7963fc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java@@ -8,9 +8,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.util.CommentAware;public class PullRequestSourceBranchRestoreData implements PullRequestChangeData {@@ -31,8 +29,8 @@ public class PullRequestSourceBranchRestoreData implements PullRequestChangeData}@Override- public CommentSupport getCommentSupport() {- return new CommentSupport() {+ public CommentAware getCommentAware() {+ return new CommentAware() {private static final long serialVersionUID = 1L;@@ -52,21 +50,16 @@ public class PullRequestSourceBranchRestoreData implements PullRequestChangeData@Overridepublic Component render(String componentId, PullRequestChange change) {Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {-+ return new PullRequestChangeCommentPanel(componentId) {+private static final long serialVersionUID = 1L;@Overrideprotected PullRequestChange getChange() {return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);}-- @Override- protected DiffSupport getDiffSupport() {- return null;- }- };+ };}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.javaindex c2e42fa3a3..6004aa2466 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java@@ -1,18 +1,12 @@package io.onedev.server.model.support.pullrequest.changedata;-import java.util.List;-import org.apache.wicket.Component;-import com.google.common.collect.Lists;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.util.CommentSupport;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;+import io.onedev.server.util.CollectionUtils;+import io.onedev.server.util.CommentAware;+import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;public class PullRequestTitleChangeData implements PullRequestChangeData {@@ -37,49 +31,14 @@ public class PullRequestTitleChangeData implements PullRequestChangeData {@Overridepublic Component render(String componentId, PullRequestChange change) {- Long changeId = change.getId();- return new DiffAndCommentAwarePanel(componentId) {-- private static final long serialVersionUID = 1L;-- @Override- protected PullRequestChange getChange() {- return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);- }-- @Override- protected DiffSupport getDiffSupport() {- return new DiffSupport() {-- private static final long serialVersionUID = 1L;-- @Override- public List<String> getOldLines() {- return Lists.newArrayList(oldTitle);- }-- @Override- public List<String> getNewLines() {- return Lists.newArrayList(newTitle);- }-- @Override- public String getOldFileName() {- return "a.txt";- }-- @Override- public String getNewFileName() {- return "b.txt";- }-- };- }- };+ return new PropertyChangePanel(componentId,+ CollectionUtils.newHashMap("Title", oldTitle),+ CollectionUtils.newHashMap("Title", newTitle),+ true);}@Override- public CommentSupport getCommentSupport() {+ public CommentAware getCommentAware() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/util/CommentSupport.java b/server-core/src/main/java/io/onedev/server/util/CommentAware.javasimilarity index 69%rename from server-core/src/main/java/io/onedev/server/util/CommentSupport.javarename to server-core/src/main/java/io/onedev/server/util/CommentAware.javaindex 7d08eda88b..140c9de1b0 100644--- a/server-core/src/main/java/io/onedev/server/util/CommentSupport.java+++ b/server-core/src/main/java/io/onedev/server/util/CommentAware.java@@ -2,7 +2,7 @@ package io.onedev.server.util;import java.io.Serializable;-public interface CommentSupport extends Serializable {+public interface CommentAware extends Serializable {String getComment();diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.javaindex 029f68121b..d2ed255e11 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java@@ -235,15 +235,15 @@ public class EntityReferenceManager {addReferenceChange(comment.getIssue(), comment.getContent());} else if (event.getEntity() instanceof IssueChange) {IssueChange change = (IssueChange) event.getEntity();- if (change.getData().getCommentSupport() != null)- addReferenceChange(change.getIssue(), change.getData().getCommentSupport().getComment());+ if (change.getData().getCommentAware() != null)+ addReferenceChange(change.getIssue(), change.getData().getCommentAware().getComment());} else if (event.getEntity() instanceof PullRequestComment) {PullRequestComment comment = (PullRequestComment) event.getEntity();addReferenceChange(comment.getRequest(), comment.getContent());} else if (event.getEntity() instanceof PullRequestChange) {PullRequestChange change = (PullRequestChange) event.getEntity();- if (change.getData().getCommentSupport() != null)- addReferenceChange(change.getRequest(), change.getData().getCommentSupport().getComment());+ if (change.getData().getCommentAware() != null)+ addReferenceChange(change.getRequest(), change.getData().getCommentAware().getComment());} else if (event.getEntity() instanceof CodeCommentReply) {CodeCommentReply reply = (CodeCommentReply) event.getEntity();addReferenceChange(reply.getComment(), reply.getContent());diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.javaindex 98682cc43f..2380bd30e0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java@@ -12,7 +12,6 @@ import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;-import io.onedev.server.web.component.diff.table.DiffTableResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;public class TextDiffResourceReference extends BaseDependentResourceReference {@@ -31,7 +30,6 @@ public class TextDiffResourceReference extends BaseDependentResourceReference {dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/theme/eclipse.css")));- dependencies.add(CssHeaderItem.forReference(new DiffTableResourceReference()));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(TextDiffPanel.class, "text-diff.css")));return dependencies;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.cssindex 5912b9baf6..e7b2f80e46 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css@@ -2,10 +2,6 @@border: 1px solid #E0E0E0;position: relative;}-.text-diff table.diff {- border: none;- position: inherit;-}.text-diff>.head {padding: 8px;border-bottom: 1px solid #E0E0E0;@@ -22,6 +18,121 @@.text-diff>.head>div:last-child {margin-right: 0;}++.text-diff>.body {+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+ font-size: 12px;+ table-layout: fixed;+ border-collapse: separate;+}++/*+ * have to use relative here as otherwise the last table row will have problem+ * focusing on expander link. This relates to negative margin top+ * specified for change class in revision diff panel+ */+.text-diff>.body>tbody>tr>td {+ position: relative;+}+.text-diff>.body>tbody>tr>td.number {+ padding: 0 4px;+ border-left: 1px solid #E0E0E0;+ text-align: right;+ font-size: 12px;+ color: #9E9E9E;+}+.text-diff>.body>tbody>tr>td.operation {+ border-left: 1px solid #E0E0E0;+}+.text-diff>.body>tbody>tr>td:FIRST-CHILD {+ border-left: none !important;+}+.text-diff>.body>tbody>tr:FIRST-CHILD>td {+ border-top: none !important;+}+.text-diff>.body>tbody>tr:LAST-CHILD>td {+ border-bottom: none !important;+}+.text-diff>.body>tbody>tr.expander>td.skipped {+ padding: 6px 16px;+ border-left: 1px solid #D8E2F2;+ background: #f4f7fb;+ color: #999;+}+.text-diff>.body>tbody>tr.expander>td.expander {+ border-left: 1px solid #D8E2F2;+ text-align: center;+}+.text-diff>.body>tbody>tr.expander>td.expander a {+ display: block;+ background: #edf2f9;+ padding: 6px 0;+ color: #888;+}+.text-diff>.body>tbody>tr.expander>td.expander>a:hover {+ background: #4078c0;+ color: white;+}+.text-diff>.body>tbody>tr>td.old.number {+ background: #ffdddd;+ border-left: 1px solid #f1c0c0;+}+.text-diff>.body>tbody>tr>td.old.content {+ background: #ffecec;+}+.text-diff>.body>tbody>tr>td.old.operation {+ border-left: 1px solid #f1c0c0;+ background: #ffecec;+}+.text-diff>.body>tbody>tr>td.old .delete {+ background-color: #F8B8B8;+ text-decoration: line-through;+}+.text-diff>.body>tbody>tr>td.new.number {+ background: #dbffdb;+ border-left: 1px solid #c1e9c1;+}+.text-diff>.body>tbody>tr>td.new.content {+ background: #eaffea;+}+.text-diff>.body>tbody>tr>td.new.operation {+ border-left: 1px solid #c1e9c1;+ background: #eaffea;+}+.text-diff>.body>tbody>tr>td.new .insert {+ background-color: #94F094;+}+.text-diff>.body>tbody>tr>td.old.new.number {+ background: #FAF3D0;+ border-left: 1px solid #EBD049;+}+.text-diff>.body>tbody>tr>td.old.new.content {+ background: #FCF8E4;+}+.text-diff>.body>tbody>tr>td.old.new.operation {+ border-left: 1px solid #EBD049;+ background: #FCF8E4;+}+.text-diff>.body>tbody>tr>td.content {+ white-space: pre-wrap;+ word-wrap: break-word;+}+.text-diff>.body>tbody>tr>td.operation {+ font-weight: bold;+ padding: 0 4px 0 4px;+}+.text-diff>.body>tbody>tr.original+.expanded>td {+ border-top: 1px solid #E8E8E8;+}+.text-diff>.body>tbody>tr.expanded+.original>td {+ border-top: 1px solid #E8E8E8;+}+.text-diff>.body>tbody>tr.expanded>td {+ background: #F9F9F9;+}+.text-diff>.body>tbody>tr:hover>td {+ background: #E8F2FE !important;+}.text-diff>.body>tbody>tr.code {background: inherit;border: inherit;diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.htmldeleted file mode 100644index 7aaa3c343e..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <table class="plain diff"><wicket:container wicket:id="diffLines"></wicket:container></table>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.javadeleted file mode 100644index fbe088c4d2..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.java+++ /dev/null@@ -1,311 +0,0 @@-package io.onedev.server.web.component.diff.plain;--import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;--import java.util.HashMap;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;--import io.onedev.commons.jsyntax.TextToken;-import io.onedev.commons.jsyntax.TokenUtils;-import io.onedev.commons.jsyntax.Tokenized;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.util.diff.DiffBlock;-import io.onedev.server.util.diff.DiffMatchPatch.Operation;-import io.onedev.server.util.diff.DiffUtils;-import io.onedev.server.util.diff.LineDiff;-import io.onedev.server.util.diff.WhitespaceOption;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;--@SuppressWarnings("serial")-public class PlainDiffPanel extends Panel {-- private final Map<Integer, Integer> contextSizes = new HashMap<>();-- private final boolean forceAlign;-- private AbstractPostAjaxBehavior callbackBehavior;-- private List<DiffBlock<Tokenized>> diffBlocks;-- public PlainDiffPanel(String id, List<String> oldLines, @Nullable String oldFileName,- List<String> newLines, @Nullable String newFileName, boolean forceAlign) {- super(id);- this.forceAlign = forceAlign;- diffBlocks = DiffUtils.diff(oldLines, oldFileName, newLines, newFileName, WhitespaceOption.DO_NOT_IGNORE);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("diffLines", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- return renderDiffs();- }-- }).setEscapeModelStrings(false));-- add(callbackBehavior = new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- int index = params.getParameterValue("index").toInt();- Integer lastContextSize = contextSizes.get(index);- if (lastContextSize == null)- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;- int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;- contextSizes.put(index, contextSize);-- StringBuilder builder = new StringBuilder();- appendEquals(builder, index, lastContextSize, contextSize);-- String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");- expanded = StringUtils.replace(expanded, "\n", "");- String script = String.format("onedev.server.plainDiff.expand('%s', %d, \"%s\");",- getMarkupId(), index, expanded);- target.appendJavaScript(script);- }-- });- }-- private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {- DiffBlock<Tokenized> block = diffBlocks.get(index);- if (index == 0) {- int start = block.getUnits().size()-contextSize;- if (start < 0)- start=0;- else if (start > 0)- appendExpander(builder, index, start);- for (int j=start; j<block.getUnits().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- } else if (index == diffBlocks.size()-1) {- int end = block.getUnits().size();- int skipped = 0;- if (end > contextSize) {- skipped = end-contextSize;- end = contextSize;- }- for (int j=lastContextSize; j<end; j++)- appendEqual(builder, block, j, lastContextSize);- if (skipped != 0)- appendExpander(builder, index, skipped);- } else if (2*contextSize < block.getUnits().size()) {- for (int j=lastContextSize; j<contextSize; j++)- appendEqual(builder, block, j, lastContextSize);- appendExpander(builder, index, block.getUnits().size() - 2*contextSize);- for (int j=block.getUnits().size()-contextSize; j<block.getUnits().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- } else {- for (int j=lastContextSize; j<block.getUnits().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- }- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new PlainDiffResourceReference()));-- CharSequence callback = callbackBehavior.getCallbackFunction(explicit("index"));- String script = String.format("onedev.server.plainDiff.onDomReady('%s', %s);", getMarkupId(), callback);- response.render(OnDomReadyHeaderItem.forScript(script));- }-- private String renderDiffs() {- StringBuilder builder = new StringBuilder();- for (int i=0; i<diffBlocks.size(); i++) {- DiffBlock<Tokenized> block = diffBlocks.get(i);- if (block.getOperation() == Operation.EQUAL) {- Integer lastContextSize = contextSizes.get(i);- if (lastContextSize == null)- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;- appendEquals(builder, i, 0, lastContextSize);- } else if (block.getOperation() == Operation.DELETE) {- if (i+1<diffBlocks.size()) {- DiffBlock<Tokenized> nextBlock = diffBlocks.get(i+1);- if (nextBlock.getOperation() == Operation.INSERT) {- LinkedHashMap<Integer, LineDiff> lineChanges =- DiffUtils.align(block.getUnits(), nextBlock.getUnits(), forceAlign);- int prevDeleteLineIndex = 0;- int prevInsertLineIndex = 0;- for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {- int deleteLineIndex = entry.getKey();- LineDiff lineChange = entry.getValue();- int insertLineIndex = lineChange.getCompareLine();-- appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,- prevInsertLineIndex, insertLineIndex);-- appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,- lineChange.getTokenDiffs());-- prevDeleteLineIndex = deleteLineIndex+1;- prevInsertLineIndex = insertLineIndex+1;- }- appendDeletesAndInserts(builder, block, nextBlock,- prevDeleteLineIndex, block.getUnits().size(),- prevInsertLineIndex, nextBlock.getUnits().size());- i++;- } else {- for (int j=0; j<block.getUnits().size(); j++)- appendDelete(builder, block, j, null);- }- } else {- for (int j=0; j<block.getUnits().size(); j++)- appendDelete(builder, block, j, null);- }- } else {- for (int j=0; j<block.getUnits().size(); j++)- appendInsert(builder, block, j, null);- }- }- return builder.toString();- }-- private void appendDeletesAndInserts(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,- DiffBlock<Tokenized> insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,- int fromInsertLineIndex, int toInsertLineIndex) {- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)- appendDelete(builder, deleteBlock, i, null);- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)- appendInsert(builder, insertBlock, i, null);- }-- private String getOperationClass(Operation operation) {- if (operation == Operation.INSERT)- return "insert";- else if (operation == Operation.DELETE)- return "delete";- else- return null;- }-- private void appendTokenized(StringBuilder builder, Tokenized tokenized) {- if (tokenized.getTokens().length == 0) {- builder.append(" ");- } else {- for (long token: tokenized.getTokens()) {- builder.append(TokenUtils.toHtml(tokenized.getText(), token, null, null));- }- }- }-- private void appendEqual(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex, int lastContextSize) {- if (lastContextSize != 0)- builder.append("<tr class='code expanded'>");- else- builder.append("<tr class='code original'>");-- int oldLineNo = block.getOldStart() + lineIndex;- int newLineNo = block.getNewStart() + lineIndex;-- builder.append("<td class='operation'> </td>");- builder.append("<td colspan='2' class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- appendTokenized(builder, block.getUnits().get(lineIndex));- builder.append("</td>");- builder.append("</tr>");- }-- private void appendInsert(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex,- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int newLineNo = block.getNewStart() + lineIndex;- builder.append("<td class='operation new'>+</td>");- builder.append("<td colspan='2' class='content new' data-new='").append(newLineNo).append("'>");- if (tokenDiffs != null) {- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {- for (TextToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.DELETE)- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));- }- }- }- } else {- appendTokenized(builder, block.getUnits().get(lineIndex));- }- builder.append("</td>");- builder.append("</tr>");- }-- private void appendDelete(StringBuilder builder, DiffBlock<Tokenized> block, int lineIndex,- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int oldLineNo = block.getOldStart() + lineIndex;- builder.append("<td class='operation old'>-</td>");- builder.append("<td colspan='2' class='content old' data-old='").append(oldLineNo).append("'>");- if (tokenDiffs != null) {- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {- for (TextToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.INSERT)- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));- }- }- }- } else {- appendTokenized(builder, block.getUnits().get(lineIndex));- }- builder.append("</td>");- builder.append("</tr>");- }-- private void appendModification(StringBuilder builder, DiffBlock<Tokenized> deleteBlock,- DiffBlock<Tokenized> insertBlock, int deleteLineIndex, int insertLineIndex,- List<DiffBlock<TextToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;- int newLineNo = insertBlock.getNewStart() + insertLineIndex;- builder.append("<td class='operation old new'>*</td>");- builder.append("<td colspan='2' class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {- for (TextToken token: tokenBlock.getUnits())- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));- }- }- builder.append("</td>");- builder.append("</tr>");- }-- private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {- builder.append("<tr class='expander expander").append(blockIndex).append("'>");-- String script = String.format("javascript:$('#%s').data('callback')(%d);", getMarkupId(), blockIndex);- builder.append("<td class='expander noselect'><a title='Show more lines' href=\"")- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");- builder.append("<td class='skipped noselect' colspan='2'><i class='fa fa-ellipsis-h'></i> skipped ")- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");- builder.append("</tr>");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffResourceReference.javadeleted file mode 100644index 9cdbc75669..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffResourceReference.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.web.component.diff.plain;--import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;--import io.onedev.server.web.component.diff.table.DiffTableResourceReference;-import io.onedev.server.web.page.base.BaseDependentResourceReference;--public class PlainDiffResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public PlainDiffResourceReference() {- super(PlainDiffResourceReference.class, "plain-diff.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(CssHeaderItem.forReference(new DiffTableResourceReference()));- return dependencies;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/plain/plain-diff.js b/server-core/src/main/java/io/onedev/server/web/component/diff/plain/plain-diff.jsdeleted file mode 100644index 2eff1b1fe2..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/plain/plain-diff.js+++ /dev/null@@ -1,10 +0,0 @@-onedev.server.plainDiff = {- onDomReady: function(containerId, callback) {- $("#" + containerId).data("callback", callback);- },- expand: function(containerId, blockIndex, expandedHtml) {- var $container = $("#" + containerId);- var $expanderTr = $container.find(".expander" + blockIndex);- $expanderTr.replaceWith(expandedHtml);- }-};diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/table/DiffTableResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/diff/table/DiffTableResourceReference.javadeleted file mode 100644index 3630886731..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/table/DiffTableResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.diff.table;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class DiffTableResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public DiffTableResourceReference() {- super(DiffTableResourceReference.class, "diff-table.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css b/server-core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.cssdeleted file mode 100644index 682a1db221..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css+++ /dev/null@@ -1,129 +0,0 @@-table.diff {- border: 1px solid #E0E0E0;- position: relative;- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;- font-size: 12px;- table-layout: fixed;- border-collapse: separate;-}--/*- * have to use relative here as otherwise the last table row will have problem- * focusing on expander link. This relates to negative margin top- * specified for change class in revision diff panel- */-table.diff>tbody>tr>td {- position: relative;-}-table.diff>tbody>tr>td.number {- padding: 0 4px;- border-left: 1px solid #E0E0E0;- text-align: right;- font-size: 12px;- color: #9E9E9E;-}-table.diff>tbody>tr>td.operation {- border-left: 1px solid #E0E0E0;-}-table.diff>tbody>tr>td:FIRST-CHILD {- border-left: none !important;-}-table.diff>tbody>tr:FIRST-CHILD>td {- border-top: none !important;-}-table.diff>tbody>tr:LAST-CHILD>td {- border-bottom: none !important;-}-table.diff>tbody>tr.expander>td.skipped {- padding: 6px 16px;- border-left: 1px solid #D8E2F2;- background: #f4f7fb;- color: #999;-}-table.diff>tbody>tr.expander>td.expander {- border-left: 1px solid #D8E2F2;- text-align: center;-}-table.diff>tbody>tr.expander>td.expander a {- display: block;- background: #edf2f9;- padding: 6px 0;- color: #888;-}-table.diff>tbody>tr.expander>td.expander>a:hover {- background: #4078c0;- color: white;-}-table.diff>tbody>tr>td.old.number {- background: #ffdddd;- border-left: 1px solid #f1c0c0;-}-table.diff>tbody>tr>td.old.content {- background: #ffecec;-}-table.diff>tbody>tr>td.old.operation {- border-left: 1px solid #f1c0c0;- background: #ffecec;-}-table.diff>tbody>tr>td.old .delete {- background-color: #F8B8B8;- text-decoration: line-through;-}-table.diff>tbody>tr>td.new.number {- background: #dbffdb;- border-left: 1px solid #c1e9c1;-}-table.diff>tbody>tr>td.new.content {- background: #eaffea;-}-table.diff>tbody>tr>td.new.operation {- border-left: 1px solid #c1e9c1;- background: #eaffea;-}-table.diff>tbody>tr>td.new .insert {- background-color: #94F094;-}-table.diff>tbody>tr>td.old.new.number {- background: #FAF3D0;- border-left: 1px solid #EBD049;-}-table.diff>tbody>tr>td.old.new.content {- background: #FCF8E4;-}-table.diff>tbody>tr>td.old.new.operation {- border-left: 1px solid #EBD049;- background: #FCF8E4;-}-table.diff>tbody>tr>td.content {- white-space: pre-wrap;- word-wrap: break-word;-}-table.diff>tbody>tr>td.operation {- font-weight: bold;- padding: 0 4px 0 4px;-}-table.diff>tbody>tr.original+.expanded>td {- border-top: 1px solid #E8E8E8;-}-table.diff>tbody>tr.expanded+.original>td {- border-top: 1px solid #E8E8E8;-}-table.diff>tbody>tr.expanded>td {- background: #F9F9F9;-}-table.diff>tbody>tr:hover>td {- background: #E8F2FE !important;-}-table.plain.diff {- border: none;-}-table.plain.diff>tbody>tr>td.expander {- width: 20px;-}-table.plain.diff>tbody>tr>td.skipped {- border-left: none;-}-table.plain.diff>tbody>tr>td.operation {- width: 20px;- padding: 0 4px 0 6px;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.jsindex ddf1f522d3..219717b10e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js+++ b/server-core/src/main/java/io/onedev/server/web/component/floating/floating.js@@ -49,7 +49,8 @@ onedev.server.floating = {&& !document.body.contains(alignment.target.element)) {onedev.server.floating.close($floating, true);} else {- $floating.align(alignment);+ if (alignment)+ $floating.align(alignment);if (!openTriggered) {$floating.trigger("open");openTriggered = true;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.htmldeleted file mode 100644index 760ff915fe..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:panel>- <div class="diff-and-comment-aware">- <div wicket:id="diff"></div>- <div wicket:id="comment"></div>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.htmlnew file mode 100644index 0000000000..2d8fd167de--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.html@@ -0,0 +1,6 @@+<wicket:panel>+ <div class="field-change">+ <div wicket:id="change" class="change"></div>+ <div wicket:id="comment" class="comment"></div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.javasimilarity index 68%rename from server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.javaindex 5135e86faf..9c5073b8ea 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.java@@ -12,41 +12,39 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.IssueChange;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.project.comment.ProjectCommentPanel;+import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;import io.onedev.server.web.util.DeleteCallback;import io.onedev.server.web.util.ProjectAttachmentSupport;@SuppressWarnings("serial")-public abstract class DiffAndCommentAwarePanel extends Panel {+public abstract class IssueFieldChangePanel extends Panel {- private static final String DIFF_ID = "diff";+ private final boolean hideNameIfOnlyOneRow;- private static final String COMMENT_ID = "comment";-- public DiffAndCommentAwarePanel(String id) {+ public IssueFieldChangePanel(String id, boolean hideNameIfOnlyOneRow) {super(id);+ this.hideNameIfOnlyOneRow = hideNameIfOnlyOneRow;}@Overrideprotected void onInitialize() {super.onInitialize();- DiffSupport diffSupport = getDiffSupport();- if (diffSupport != null)- add(new PlainDiffPanel(DIFF_ID, diffSupport.getOldLines(), diffSupport.getOldFileName(), diffSupport.getNewLines(), diffSupport.getNewFileName(), true));- else- add(new WebMarkupContainer(DIFF_ID).setVisible(false));+ IssueFieldChangeData changeData = (IssueFieldChangeData) getChange().getData();++ add(new PropertyChangePanel("change", changeData.getOldFieldValues(), changeData.getNewFieldValues(),+ hideNameIfOnlyOneRow));- if (getChange().getData().getCommentSupport() != null) {- add(new ProjectCommentPanel(COMMENT_ID) {+ if (changeData.getCommentAware() != null) {+ add(new ProjectCommentPanel("comment") {@Overrideprotected String getComment() {- return getChange().getData().getCommentSupport().getComment();+ return getChange().getData().getCommentAware().getComment();}@Override@@ -56,7 +54,7 @@ public abstract class DiffAndCommentAwarePanel extends Panel {@Overrideprotected void onSaveComment(AjaxRequestTarget target, String comment) {- getChange().getData().getCommentSupport().setComment(comment);+ getChange().getData().getCommentAware().setComment(comment);OneDev.getInstance(IssueChangeManager.class).save(getChange());}@@ -92,12 +90,11 @@ public abstract class DiffAndCommentAwarePanel extends Panel {});} else {- add(new WebMarkupContainer(COMMENT_ID).setVisible(false));+ add(new WebMarkupContainer("comment").setVisible(false));}+}-- protected abstract IssueChange getChange();- protected abstract DiffSupport getDiffSupport();+ protected abstract IssueChange getChange();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.cssindex 48d1012b76..d860d7ed66 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css@@ -53,9 +53,10 @@.issue-activities .activity>.content>.body .actions .middot {margin: 0 4px;}-.issue-activities .activity>.content>.body .plain.diff {+.issue-activities .activity>.content>.body .field-change>.change {margin-bottom: 12px;}+.issue-activities .activity>.content>.head a {color: #999;margin-left: 8px;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex ee973cbc0b..ece12a437e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -161,11 +161,11 @@ public abstract class IssueOperationsPanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- getIssue().removeFields(transition.getRemoveFields());Map<String, Object> fieldValues = IssueUtils.getFieldValues(editor.newComponentContext(), fieldBean, trigger.getPromptFields());IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);- manager.changeState(getIssue(), transition.getToState(), fieldValues, comment);+ manager.changeState(getIssue(), transition.getToState(), fieldValues,+ transition.getRemoveFields(), comment);target.add(IssueOperationsPanel.this);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangeCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangeCssResourceReference.javanew file mode 100644index 0000000000..04123b2560--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangeCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.propertychangepanel;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class PropertyChangeCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public PropertyChangeCssResourceReference() {+ super(PropertyChangeCssResourceReference.class, "property-change.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.html b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.htmlnew file mode 100644index 0000000000..cb46ae7496--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.html@@ -0,0 +1,22 @@+<wicket:panel>+<table class="property-change">+ <thead>+ <th wicket:id="nameHeader" class="name">Name</th>+ <th class="old-value value">Previous Value</th>+ <th class="new-value value">Current Value</th>+ </thead>+ <tr wicket:id="properties">+ <wicket:enclosure>+ <td class="name">+ <span wicket:id="name"></span>+ </td>+ </wicket:enclosure>+ <td class="old-value value">+ <span wicket:id="oldValue"></span>+ </td>+ <td class="new-value value">+ <span wicket:id="newValue"></span>+ </td>+ </tr>+</table>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.javanew file mode 100644index 0000000000..06d342e10e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.java@@ -0,0 +1,90 @@+package io.onedev.server.web.component.propertychangepanel;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.Map;++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.basic.Label;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;++import com.google.common.collect.MapDifference;+import com.google.common.collect.MapDifference.ValueDifference;+import com.google.common.collect.Maps;++@SuppressWarnings("serial")+public class PropertyChangePanel extends Panel {++ private final List<PropertyChange> changes = new ArrayList<>();++ private final boolean showName;++ public PropertyChangePanel(String id, Map<String, String> oldProperties, Map<String, String> newProperties,+ boolean hideNameIfOnlyOneChange) {+ super(id);++ MapDifference<String, String> diff = Maps.difference(oldProperties, newProperties);+ for (Map.Entry<String, ValueDifference<String>> entry: diff.entriesDiffering().entrySet()) {+ changes.add(new PropertyChange(entry.getKey(),+ entry.getValue().leftValue(), entry.getValue().rightValue()));+ }+ for (Map.Entry<String, String> entry: diff.entriesOnlyOnLeft().entrySet())+ changes.add(new PropertyChange(entry.getKey(), entry.getValue(), null));+ for (Map.Entry<String, String> entry: diff.entriesOnlyOnRight().entrySet())+ changes.add(new PropertyChange(entry.getKey(), null, entry.getValue()));++ showName = !hideNameIfOnlyOneChange || changes.size() > 1;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new WebMarkupContainer("nameHeader").setVisible(showName));++ add(new ListView<PropertyChange>("properties", changes) {++ @Override+ protected void populateItem(ListItem<PropertyChange> item) {+ PropertyChange change = item.getModelObject();+ item.add(new Label("name", change.name).setVisible(showName));+ if (change.oldValue != null)+ item.add(new Label("oldValue", change.oldValue));+ else+ item.add(new Label("oldValue", "<i>empty</i>").setEscapeModelStrings(false));+ if (change.newValue != null)+ item.add(new Label("newValue", change.newValue));+ else+ item.add(new Label("newValue", "<i>empty</i>").setEscapeModelStrings(false));+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new PropertyChangeCssResourceReference()));+ }++ private static class PropertyChange implements Serializable {++ private String name;++ private String oldValue;++ private String newValue;++ PropertyChange(String name, String oldValue, String newValue) {+ this.name = name;+ this.oldValue = oldValue;+ this.newValue = newValue;+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.cssnew file mode 100644index 0000000000..cd7805c080--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css@@ -0,0 +1,12 @@+.property-change {+ width: auto;+ border: 1px dotted #BBB;+ font-size: 13px;+}+.property-change td.name {+ white-space: nowrap;+}+.property-change th, .property-change td {+ padding: 4px 8px;+ border-bottom: 1px dotted #BBB;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex fef9811826..051aa729f0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -392,8 +392,8 @@ abstract class BoardColumnPanel extends Panel implements EditContext {};} else {- issue.removeFields(transitionRef.get().getRemoveFields());- OneDev.getInstance(IssueChangeManager.class).changeState(issue, getColumn(), new HashMap<>(), null);+ OneDev.getInstance(IssueChangeManager.class).changeState(issue, getColumn(),+ new HashMap<>(), transitionRef.get().getRemoveFields(), null);markAccepted(target, issue, true);}} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex 3998aa9c84..e082637239 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -55,11 +55,10 @@ abstract class StateTransitionPanel extends Panel implements InputContext {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- getIssue().removeFields(getTransition().getRemoveFields());Map<String, Object> fieldValues = IssueUtils.getFieldValues(editor.newComponentContext(), fieldBean, trigger.getPromptFields());- OneDev.getInstance(IssueChangeManager.class).changeState(- getIssue(), getTransition().getToState(), fieldValues, null);+ OneDev.getInstance(IssueChangeManager.class).changeState(getIssue(),+ getTransition().getToState(), fieldValues, getTransition().getRemoveFields(), null);onSaved(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.htmldeleted file mode 100644index 760ff915fe..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:panel>- <div class="diff-and-comment-aware">- <div wicket:id="diff"></div>- <div wicket:id="comment"></div>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.javadeleted file mode 100644index 311347bf65..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java+++ /dev/null@@ -1,104 +0,0 @@-package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;--import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.panel.Panel;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.diff.DiffSupport;-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;-import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.component.markdown.ContentVersionSupport;-import io.onedev.server.web.component.project.comment.ProjectCommentPanel;-import io.onedev.server.web.util.DeleteCallback;-import io.onedev.server.web.util.ProjectAttachmentSupport;--@SuppressWarnings("serial")-public abstract class DiffAndCommentAwarePanel extends Panel {-- private static final String DIFF_ID = "diff";-- private static final String COMMENT_ID = "comment";-- public DiffAndCommentAwarePanel(String id) {- super(id);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- DiffSupport diffSupport = getDiffSupport();- if (diffSupport != null)- add(new PlainDiffPanel(DIFF_ID, diffSupport.getOldLines(), diffSupport.getOldFileName(), diffSupport.getNewLines(), diffSupport.getNewFileName(), true));- else- add(new WebMarkupContainer(DIFF_ID).setVisible(false));-- if (getChange().getData().getCommentSupport() != null) {- add(new ProjectCommentPanel(COMMENT_ID) {-- @Override- protected String getComment() {- return getChange().getData().getCommentSupport().getComment();- }-- @Override- protected void onSaveComment(AjaxRequestTarget target, String comment) {- getChange().getData().getCommentSupport().setComment(comment);- OneDev.getInstance(PullRequestChangeManager.class).save(getChange());- }-- @Override- protected Project getProject() {- return getChange().getRequest().getTargetProject();- }-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), getChange().getRequest().getUUID());- }-- @Override- protected boolean canModifyOrDeleteComment() {- return SecurityUtils.canModifyOrDelete(getChange());- }-- @Override- protected List<User> getMentionables() {- return OneDev.getInstance(UserManager.class).queryAndSort(getChange().getRequest().getParticipants());- }-- @Override- protected String getRequiredLabel() {- return null;- }-- @Override- protected ContentVersionSupport getContentVersionSupport() {- return null;- }-- @Override- protected DeleteCallback getDeleteCallback() {- return null;- }-- });- } else {- add(new WebMarkupContainer(COMMENT_ID).setVisible(false));- }- }-- protected abstract PullRequestChange getChange();-- protected abstract DiffSupport getDiffSupport();--}