Skip to content

The Unified and Autonomous Development Platform

feat: Display issue and pull request description below title (OD-2310)

Robin Shenb2e9cd3e1e02
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index a95ffbece7..d3e21a4769 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -61,6 +61,7 @@ import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueStateHistory;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.TimeGroups;
import io.onedev.server.ssh.SshKeyUtils;
import io.onedev.server.util.CryptoUtils;
@@ -7658,4 +7659,31 @@ public class DataMigrator {
}
}
+ private void migrate192(File dataDir, Stack<Integer> versions) {
+ var updateIds = new HashSet<>();
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("IssueChanges.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ Element dataElement = element.element("data");
+ if (dataElement.attributeValue("class").contains("IssueReferencedFromCommitData"))
+ element.detach();
+ else if (element.element("user") == null)
+ element.addElement("user").setText(String.valueOf(User.SYSTEM_ID));
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PullRequestChanges.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ Element dataElement = element.element("data");
+ if (dataElement.attributeValue("class").contains("PullRequestReferencedFromCommitData"))
+ element.detach();
+ else if (element.element("user") == null)
+ element.addElement("user").setText(String.valueOf(User.SYSTEM_ID));
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/DefaultReferenceChangeManager.java b/server-core/src/main/java/io/onedev/server/entityreference/DefaultReferenceChangeManager.java
index 1aa0787e22..f3df9e2768 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/DefaultReferenceChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/DefaultReferenceChangeManager.java
@@ -1,11 +1,25 @@
package io.onedev.server.entityreference;
+import static io.onedev.server.entityreference.ReferenceUtils.extractReferences;
+
+import java.util.Date;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.event.Listen;
-import io.onedev.server.event.project.codecomment.*;
+import io.onedev.server.event.project.codecomment.CodeCommentCreated;
+import io.onedev.server.event.project.codecomment.CodeCommentEdited;
+import io.onedev.server.event.project.codecomment.CodeCommentReplyCreated;
+import io.onedev.server.event.project.codecomment.CodeCommentReplyEdited;
+import io.onedev.server.event.project.codecomment.CodeCommentStatusChanged;
import io.onedev.server.event.project.issue.IssueChanged;
import io.onedev.server.event.project.issue.IssueCommentCreated;
import io.onedev.server.event.project.issue.IssueCommentEdited;
@@ -15,25 +29,19 @@ import io.onedev.server.event.project.pullrequest.PullRequestCommentCreated;
import io.onedev.server.event.project.pullrequest.PullRequestCommentEdited;
import io.onedev.server.event.project.pullrequest.PullRequestOpened;
import io.onedev.server.markdown.MarkdownManager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCommitData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCommitData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.util.ProjectScopedCommit;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.Date;
-
-import static io.onedev.server.entityreference.ReferenceUtils.extractReferences;
@Singleton
public class DefaultReferenceChangeManager implements ReferenceChangeManager {
@@ -49,7 +57,7 @@ public class DefaultReferenceChangeManager implements ReferenceChangeManager {
private final MarkdownManager markdownManager;
@Inject
- public DefaultReferenceChangeManager(IssueManager issueManager,
+ public DefaultReferenceChangeManager(IssueManager issueManager,
PullRequestManager pullRequestManager, IssueChangeManager issueChangeManager,
PullRequestChangeManager pullRequestChangeManager, MarkdownManager markdownManager) {
this.issueManager = issueManager;
@@ -117,58 +125,6 @@ public class DefaultReferenceChangeManager implements ReferenceChangeManager {
}
}
- public void addReferenceChange(ProjectScopedCommit commit) {
- String commitMessage = commit.getRevCommit().getFullMessage();
- for (var reference: extractReferences(commitMessage, commit.getProject())) {
- if (reference instanceof IssueReference) {
- var referencedIssue = issueManager.find(reference.getProject(), reference.getNumber());
- if (referencedIssue != null) {
- boolean found = false;
- for (var change : referencedIssue.getChanges()) {
- if (change.getData() instanceof IssueReferencedFromCommitData) {
- var referencedFromCommitData = (IssueReferencedFromCommitData) change.getData();
- if (referencedFromCommitData.getCommit().getCommitId().equals(commit.getCommitId())) {
- found = true;
- break;
- }
- }
- }
- if (!found) {
- var referencedFromCommitData = new IssueReferencedFromCommitData(commit);
- var change = new IssueChange();
- change.setData(referencedFromCommitData);
- change.setDate(new Date());
- change.setIssue(referencedIssue);
- referencedIssue.getChanges().add(change);
- issueChangeManager.create(change, null);
- }
- }
- } else if (reference instanceof PullRequestReference) {
- var referencedPullRequest = pullRequestManager.find(reference.getProject(), reference.getNumber());
- if (referencedPullRequest != null) {
- boolean found = false;
- for (var change: referencedPullRequest.getChanges()) {
- if (change.getData() instanceof PullRequestReferencedFromCommitData) {
- var referencedFromCommitData = (PullRequestReferencedFromCommitData) change.getData();
- if (referencedFromCommitData.getCommit().getCommitId().equals(commit.getCommitId())) {
- found = true;
- break;
- }
- }
- }
- if (!found) {
- var referencedFromCommitData = new PullRequestReferencedFromCommitData(commit);
- var change = new PullRequestChange();
- change.setData(referencedFromCommitData);
- change.setDate(new Date());
- change.setRequest(referencedPullRequest);
- referencedPullRequest.getChanges().add(change);
- pullRequestChangeManager.create(change, null);
- }
- }
- }
- }
- }
@Override
public void addReferenceChange(User user, PullRequest request, String markdown) {
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceChangeManager.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceChangeManager.java
index a047713ea3..1bfa08306d 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceChangeManager.java
@@ -1,12 +1,11 @@
package io.onedev.server.entityreference;
+import javax.annotation.Nullable;
+
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.util.ProjectScopedCommit;
-
-import javax.annotation.Nullable;
public interface ReferenceChangeManager {
@@ -15,7 +14,5 @@ public interface ReferenceChangeManager {
void addReferenceChange(User user, PullRequest request, @Nullable String markdown);
void addReferenceChange(User user, CodeComment comment, @Nullable String markdown);
-
- void addReferenceChange(ProjectScopedCommit commit);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueChange.java b/server-core/src/main/java/io/onedev/server/model/IssueChange.java
index 9a368789ac..93c7da8b61 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueChange.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueChange.java
@@ -1,11 +1,18 @@
package io.onedev.server.model;
-import io.onedev.server.model.support.issue.changedata.IssueChangeData;
-
-import javax.annotation.Nullable;
-import javax.persistence.*;
import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import io.onedev.server.model.support.issue.changedata.IssueChangeData;
+
@Entity
@Table(indexes={
@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")})
@@ -18,6 +25,7 @@ public class IssueChange extends AbstractEntity {
private Issue issue;
@ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
private User user;
@Column(nullable=false)
@@ -35,12 +43,11 @@ public class IssueChange extends AbstractEntity {
this.issue = issue;
}
- @Nullable
public User getUser() {
return user;
}
- public void setUser(@Nullable User user) {
+ public void setUser(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueWork.java b/server-core/src/main/java/io/onedev/server/model/IssueWork.java
index 5cea5ab86b..3d1f95139e 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueWork.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueWork.java
@@ -102,4 +102,9 @@ public class IssueWork extends AbstractEntity {
public void setNote(String note) {
this.note = StringUtils.abbreviate(note, MAX_CONTENT_LEN);
}
+
+ public String getAnchor() {
+ return getClass().getSimpleName() + "-" + getId();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java
index 7a8975192e..a695d490f0 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java
@@ -1,11 +1,18 @@
package io.onedev.server.model;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
-
-import javax.annotation.Nullable;
-import javax.persistence.*;
import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
+
@Entity
@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")})
public class PullRequestChange extends AbstractEntity {
@@ -17,6 +24,7 @@ public class PullRequestChange extends AbstractEntity {
private PullRequest request;
@ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
private User user;
@Column(nullable=false)
@@ -42,12 +50,11 @@ public class PullRequestChange extends AbstractEntity {
this.data = data;
}
- @Nullable
public User getUser() {
return user;
}
- public void setUser(@Nullable User user) {
+ public void setUser(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCommitData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCommitData.java
deleted file mode 100644
index 7d80c4625a..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCommitData.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import io.onedev.server.model.Group;
-import io.onedev.server.model.User;
-import io.onedev.server.notification.ActivityDetail;
-import io.onedev.server.util.ProjectScopedCommit;
-import org.eclipse.jgit.lib.ObjectId;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public class IssueReferencedFromCommitData extends IssueChangeData {
-
- private static final long serialVersionUID = 1L;
-
- private final Long projectId;
-
- private final String commitHash;
-
- public IssueReferencedFromCommitData(ProjectScopedCommit commit) {
- this.projectId = commit.getProjectId();
- this.commitHash = commit.getCommitId().name();
- }
-
- public ProjectScopedCommit getCommit() {
- return new ProjectScopedCommit(projectId, ObjectId.fromString(commitHash));
- }
-
- @Override
- public String getActivity() {
- return "referenced from commit";
- }
-
- @Override
- public Map<String, Collection<User>> getNewUsers() {
- return new HashMap<>();
- }
-
- @Override
- public Map<String, Group> getNewGroups() {
- return new HashMap<>();
- }
-
- @Override
- public boolean affectsListing() {
- return false;
- }
-
- @Override
- public boolean isMinor() {
- return true;
- }
-
- @Override
- public ActivityDetail getActivityDetail() {
- return ActivityDetail.referencedFrom(getCommit());
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCommitData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCommitData.java
deleted file mode 100644
index e2d15d4448..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCommitData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.onedev.server.model.support.pullrequest.changedata;
-
-import io.onedev.server.notification.ActivityDetail;
-import io.onedev.server.util.ProjectScopedCommit;
-import org.eclipse.jgit.lib.ObjectId;
-
-public class PullRequestReferencedFromCommitData extends PullRequestChangeData {
-
- private static final long serialVersionUID = 1L;
-
- private final Long projectId;
-
- private final String commitHash;
-
- public PullRequestReferencedFromCommitData(ProjectScopedCommit commit) {
- this.projectId = commit.getProjectId();
- this.commitHash = commit.getCommitId().name();
- }
-
- public ProjectScopedCommit getCommit() {
- return new ProjectScopedCommit(projectId, ObjectId.fromString(commitHash));
- }
-
- @Override
- public String getActivity() {
- return "referenced from commit";
- }
-
- @Override
- public boolean isMinor() {
- return true;
- }
-
- @Override
- public ActivityDetail getActivityDetail() {
- return ActivityDetail.referencedFrom(getCommit());
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/exception/EntityNotFoundExceptionHandler.java b/server-core/src/main/java/io/onedev/server/persistence/exception/EntityNotFoundExceptionHandler.java
index 5563bd5660..5bae99d45b 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/exception/EntityNotFoundExceptionHandler.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/exception/EntityNotFoundExceptionHandler.java
@@ -1,11 +1,11 @@
package io.onedev.server.persistence.exception;
-import io.onedev.server.exception.HttpResponse;
-import io.onedev.server.exception.handler.AbstractExceptionHandler;
-
import javax.persistence.EntityNotFoundException;
import javax.servlet.http.HttpServletResponse;
+import io.onedev.server.exception.HttpResponse;
+import io.onedev.server.exception.handler.AbstractExceptionHandler;
+
public class EntityNotFoundExceptionHandler extends AbstractExceptionHandler<EntityNotFoundException> {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
index bd63ad5bfa..898be35aab 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
@@ -2266,6 +2266,9 @@ input[type="radio"], input[type="checkbox"] {
.border-bottom-0 {
border-bottom: 0 !important;
}
+.border-2 {
+ border-width: 2px !important;
+}
.rounded {
border-radius: 0.42rem !important;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java b/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
index 8a7c87dc92..9a72f5efb4 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
@@ -1,12 +1,12 @@
package io.onedev.server.web.behavior;
+import java.util.Collection;
+import java.util.HashSet;
+
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import java.util.Collection;
-import java.util.HashSet;
-
public abstract class ChangeObserver extends Behavior {
private static final long serialVersionUID = 1L;
@@ -37,8 +37,11 @@ public abstract class ChangeObserver extends Behavior {
public void onObservableChanged(IPartialPageRequestHandler handler,
Collection<String> changedObservables) {
- if (component.isVisibleInHierarchy())
+ var parent = component.getParent();
+ if ((parent == null || parent.isVisibleInHierarchy())
+ && (component.determineVisibility() || component.getOutputMarkupPlaceholderTag())) {
handler.add(component);
+ }
}
public static Collection<String> filterObservables(Collection<String> observingObservables,
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
index 839c4d0b51..1b89705d13 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html
@@ -32,6 +32,7 @@
<a wicket:id="reply" class="btn btn-sm btn-outline-secondary mr-2">Reply</a>
<a wicket:id="resolve" class="btn btn-sm btn-outline-secondary mr-2">Set Resolved</a>
<a wicket:id="unresolve" class="btn btn-sm btn-outline-secondary">Set Unresolved</a>
+ <a wicket:id="delete" class="btn btn-sm btn-outline-danger ml-auto">Delete</a>
</wicket:fragment>
<wicket:fragment wicket:id="statusChangeFrag">
<div class="user-avatar flex-shrink-0"><a wicket:id="userAvatar"></a></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 90badb368f..658912ba5e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -1,30 +1,13 @@
package io.onedev.server.web.component.codecomment;
-import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
-import io.onedev.server.attachment.AttachmentSupport;
-import io.onedev.server.attachment.ProjectAttachmentSupport;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.entitymanager.CodeCommentReplyManager;
-import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
-import io.onedev.server.model.*;
-import io.onedev.server.model.support.CompareContext;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.UrlUtils;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.UrlManager;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.behavior.ChangeObserver;
-import io.onedev.server.web.component.comment.CommentInput;
-import io.onedev.server.web.component.markdown.ContentQuoted;
-import io.onedev.server.web.component.markdown.MarkdownEditor;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.component.markdown.SuggestionSupport;
-import io.onedev.server.web.component.user.ident.Mode;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.xodus.VisitInfoManager;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -57,12 +40,36 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import javax.annotation.Nullable;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import com.google.common.collect.Sets;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.attachment.AttachmentSupport;
+import io.onedev.server.attachment.ProjectAttachmentSupport;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.entitymanager.CodeCommentReplyManager;
+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.CompareContext;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.UrlUtils;
+import io.onedev.server.web.UrlManager;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.component.comment.CommentInput;
+import io.onedev.server.web.component.markdown.ContentQuoted;
+import io.onedev.server.web.component.markdown.MarkdownEditor;
+import io.onedev.server.web.component.markdown.MarkdownViewer;
+import io.onedev.server.web.component.markdown.SuggestionSupport;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.xodus.VisitInfoManager;
public abstract class CodeCommentPanel extends Panel {
@@ -282,32 +289,7 @@ public abstract class CodeCommentPanel extends Panel {
});
- viewFragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- String confirmMessage;
- if (getComment().getReplies().isEmpty()) {
- confirmMessage = "Do you really want to delete this comment?";
- } else {
- confirmMessage = "Deleting this comment will also delete all replies, do you really "
- + "want to continue?";
- }
- attributes.getAjaxCallListeners().add(new ConfirmClickListener(confirmMessage));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onDeleteComment(target, getComment());
- OneDev.getInstance(CodeCommentManager.class).delete(getComment());
- }
-
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canModifyOrDelete(getComment()));
- }
- });
+ viewFragment.add(new WebMarkupContainer("delete").setVisible(false));
return viewFragment;
}
@@ -359,6 +341,32 @@ public abstract class CodeCommentPanel extends Panel {
}
});
+ actionsContainer.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ String confirmMessage;
+ if (getComment().getReplies().isEmpty()) {
+ confirmMessage = "Do you really want to delete this code comment?";
+ } else {
+ confirmMessage = "Do you really want to delete this code comment and all its replies?";
+ }
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(confirmMessage));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onDeleteComment(target, getComment());
+ OneDev.getInstance(CodeCommentManager.class).delete(getComment());
+ }
+
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canModifyOrDelete(getComment()));
+ }
+ });
+
return actionsContainer;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html
index 3b37fa8157..bc44016b2e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html
@@ -4,7 +4,7 @@
<div wicket:id="content"></div>
<i wicket:id="noContent" class="text-muted"></i>
<div class="mt-3 d-empty-none d-flex align-items-center font-size-sm">
- <wicket:enclosure child="edit"><span class="d-first-child-none dot mr-2"></span><a wicket:id="edit" class="text-muted text-hover-primary mr-2">Edit</a></wicket:enclosure><wicket:enclosure child="quote"><span class="d-first-child-none dot mr-2"></span><a wicket:id="quote" class="text-muted text-hover-primary mr-2">Quote</a></wicket:enclosure><wicket:enclosure child="delete"><span class="d-first-child-none dot mr-2"></span><a wicket:id="delete" class="text-muted text-hover-primary mr-2">Delete</a></wicket:enclosure>
+ <wicket:enclosure child="edit"><span class="d-first-child-none dot mr-2"></span><a wicket:id="edit" class="text-muted text-hover-primary mr-2">Edit</a></wicket:enclosure><wicket:enclosure child="quote"><span class="d-first-child-none dot mr-2"></span><a wicket:id="quote" class="text-muted text-hover-primary mr-2">Quote</a></wicket:enclosure><wicket:enclosure child="delete"><span class="d-first-child-none dot mr-2"></span><a wicket:id="delete" class="text-muted text-hover-primary mr-2">Delete</a></wicket:enclosure><wicket:container wicket:id="moreActions"></wicket:container>
<span wicket:id="reactions"></span>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
index 5af8f18bd1..60709737ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
@@ -14,6 +14,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -247,6 +248,8 @@ public abstract class CommentPanel extends Panel {
});
+ viewer.add(newMoreActions("moreActions"));
+
viewer.setOutputMarkupId(true);
return viewer;
}
@@ -290,6 +293,10 @@ public abstract class CommentPanel extends Panel {
return null;
}
+ protected Component newMoreActions(String componentId) {
+ return new WebMarkupContainer("moreActions").setVisible(false);
+ }
+
protected abstract Collection<? extends EntityReaction> getReactions();
protected abstract void onToggleEmoji(AjaxRequestTarget target, String emoji);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
index a2a6ad88b6..0fcab7ae29 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.html
@@ -1,13 +1,8 @@
<wicket:panel>
- <div class="issue-activities">
- <table class="w-100">
- <tr wicket:id="activities" class="activity">
- <td class="avatar"><a wicket:id="avatar"></a></td>
- <td wicket:id="content" class="content"></td>
- </tr>
- </table>
- <div wicket:id="addComment" class="mt-4"></div>
- </div>
+ <ul class="issue-activities list-unstyled mb-0">
+ <li wicket:id="activities" class="activity"></li>
+ <li wicket:id="addComment" class="mt-4"></li>
+ </ul>
<wicket:fragment wicket:id="loginToCommentFrag">
<div class="login-to-comment alert alert-light text-center font-size-h6">
<a wicket:id="login" class="link-primary">Login to comment</a>
@@ -26,7 +21,6 @@
<div class="issue-activity-options">
<a wicket:id="showComments" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Toggle comments"><wicket:svg href="comments" class="icon"></wicket:svg></a>
<a wicket:id="showChangeHistory" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Toggle change history"><wicket:svg href="history" class="icon"></wicket:svg></a>
- <a wicket:id="showReferences" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Toggle references"><wicket:svg href="reference" class="icon"></wicket:svg></a>
<a wicket:id="showWorkLog" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Toggle work log"><wicket:svg href="work-log" class="icon"></wicket:svg></a>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 34057045f1..8103feb92d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -1,25 +1,15 @@
package io.onedev.server.web.component.issue.activities;
-import com.google.common.collect.Lists;
-import io.onedev.server.OneDev;
-import io.onedev.server.attachment.AttachmentSupport;
-import io.onedev.server.attachment.ProjectAttachmentSupport;
-import io.onedev.server.entitymanager.IssueCommentManager;
-import io.onedev.server.entityreference.ReferencedFromAware;
-import io.onedev.server.model.*;
-import io.onedev.server.model.support.issue.changedata.*;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.ProjectScopedCommit;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.behavior.ChangeObserver;
-import io.onedev.server.web.component.comment.CommentInput;
-import io.onedev.server.web.component.issue.activities.activity.*;
-import io.onedev.server.web.component.user.ident.Mode;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.simple.security.LoginPage;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.WicketUtils;
+import static io.onedev.server.security.SecurityUtils.canAccessTimeTracking;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.Cookie;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
@@ -33,7 +23,6 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -44,18 +33,40 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
-import javax.servlet.http.Cookie;
-import java.util.*;
+import com.google.common.collect.Lists;
-import static io.onedev.server.security.SecurityUtils.canAccessTimeTracking;
+import io.onedev.server.OneDev;
+import io.onedev.server.attachment.AttachmentSupport;
+import io.onedev.server.attachment.ProjectAttachmentSupport;
+import io.onedev.server.entitymanager.IssueCommentManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.IssueWork;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueOwnEstimatedTimeChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueOwnSpentTimeChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueTotalEstimatedTimeChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueTotalSpentTimeChangeData;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.component.comment.CommentInput;
+import io.onedev.server.web.component.issue.activities.activity.IssueActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueCommentActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueWorkActivity;
+import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.simple.security.LoginPage;
+import io.onedev.server.web.util.WicketUtils;
public abstract class IssueActivitiesPanel extends Panel {
private static final String COOKIE_SHOW_COMMENTS = "onedev.server.issue.showComments";
private static final String COOKIE_SHOW_CHANGE_HISTORY = "onedev.server.issue.showChangeHistory";
-
- private static final String COOKIE_SHOW_REFERENCES = "onedev.server.issue.showReferences";
private static final String COOKIE_SHOW_WORK_LOG = "onedev.server.issue.showWorkLog";
@@ -66,9 +77,7 @@ public abstract class IssueActivitiesPanel extends Panel {
private boolean showComments = true;
private boolean showChangeHistory = true;
-
- private boolean showReferences = true;
-
+
private boolean showWorkLog = true;
public IssueActivitiesPanel(String panelId) {
@@ -83,10 +92,6 @@ public abstract class IssueActivitiesPanel extends Panel {
if (cookie != null)
showChangeHistory = Boolean.valueOf(cookie.getValue());
- cookie = request.getCookie(COOKIE_SHOW_REFERENCES);
- if (cookie != null)
- showReferences = Boolean.valueOf(cookie.getValue());
-
cookie = request.getCookie(COOKIE_SHOW_WORK_LOG);
if (cookie != null)
showWorkLog = Boolean.valueOf(cookie.getValue());
@@ -98,14 +103,12 @@ public abstract class IssueActivitiesPanel extends Panel {
addOrReplace(activitiesView);
Issue issue = getIssue();
- var user = SecurityUtils.getAuthUser();
for (IssueActivity activity: getActivities()) {
if (issue.isVisitedAfter(activity.getDate())) {
activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));
} else {
Component row = newActivityRow(activitiesView.newChildId(), activity);
- if (user == null || !user.equals(activity.getUser()))
- row.add(AttributeAppender.append("class", "new"));
+ row.add(AttributeAppender.append("class", "new"));
activitiesView.add(row);
}
}
@@ -116,16 +119,12 @@ public abstract class IssueActivitiesPanel extends Panel {
private List<IssueActivity> getActivities() {
List<IssueActivity> activities = new ArrayList<>();
- activities.add(new IssueOpenedActivity(getIssue()));
-
List<IssueActivity> otherActivities = new ArrayList<>();
if (showChangeHistory) {
var project = getIssue().getProject();
for (IssueChange change: getIssue().getChanges()) {
- if (!(change.getData() instanceof ReferencedFromAware)
- && !(change.getData() instanceof IssueReferencedFromCommitData)
- && !(change.getData() instanceof IssueDescriptionChangeData)
+ if (!(change.getData() instanceof IssueDescriptionChangeData)
&& !(change.getData() instanceof IssueTotalEstimatedTimeChangeData)
&& !(change.getData() instanceof IssueOwnSpentTimeChangeData)
&& !(change.getData() instanceof IssueTotalSpentTimeChangeData)
@@ -134,24 +133,10 @@ public abstract class IssueActivitiesPanel extends Panel {
}
}
}
-
- if (showReferences) {
- for (IssueChange change: getIssue().getChanges()) {
- if (change.getData() instanceof ReferencedFromAware) {
- ReferencedFromAware<?> referencedFromAware = (ReferencedFromAware<?>) change.getData();
- if (ReferencedFromAware.canDisplay(referencedFromAware))
- otherActivities.add(new IssueChangeActivity(change));
- } else if (change.getData() instanceof IssueReferencedFromCommitData) {
- ProjectScopedCommit commit = ((IssueReferencedFromCommitData) change.getData()).getCommit();
- if (commit.canDisplay())
- otherActivities.add(new IssueChangeActivity(change));
- }
- }
- }
if (showComments) {
for (IssueComment comment: getIssue().getComments())
- otherActivities.add(new IssueCommentedActivity(comment));
+ otherActivities.add(new IssueCommentActivity(comment));
}
if (showWorkLog && getIssue().getProject().isTimeTracking()
@@ -169,25 +154,14 @@ public abstract class IssueActivitiesPanel extends Panel {
}
private Component newActivityRow(String id, IssueActivity activity) {
- WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));
- row.setOutputMarkupId(true);
- String anchor = activity.getAnchor();
- if (anchor != null)
- row.setMarkupId(anchor);
-
- if (activity.getUser() != null) {
- row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));
- row.add(AttributeAppender.append("class", "with-avatar"));
- } else {
- row.add(new WebMarkupContainer("avatar").setVisible(false));
- }
-
- row.add(activity.render("content", (DeleteCallback) target -> {
- row.remove();
- target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));
- }));
-
+ var row = activity.render(id);
row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));
+ if (activity instanceof IssueCommentActivity)
+ row.add(AttributeAppender.append("class", "comment"));
+ else
+ row.add(AttributeAppender.append("class", "non-comment"));
+ row.setDefaultModel(Model.of(activity));
+ row.setOutputMarkupId(true);
return row;
}
@@ -202,25 +176,33 @@ public abstract class IssueActivitiesPanel extends Panel {
updateActivities(handler);
}
+ @SuppressWarnings("deprecation")
private void updateActivities(IPartialPageRequestHandler handler) {
- @SuppressWarnings("deprecation")
- Component prevActivityRow = activitiesView.get(activitiesView.size()-1);
- IssueActivity lastActivity = (IssueActivity) prevActivityRow.getDefaultModelObject();
+ Component prevActivityRow = null;
+ IssueActivity lastActivity = null;
+ if (activitiesView.size() > 0) {
+ prevActivityRow = activitiesView.get(activitiesView.size()-1);
+ lastActivity = (IssueActivity) prevActivityRow.getDefaultModelObject();
+ }
List<IssueActivity> newActivities = new ArrayList<>();
for (IssueActivity activity: getActivities()) {
- if (activity.getDate().getTime() > lastActivity.getDate().getTime())
+ if (lastActivity == null || activity.getDate().after(lastActivity.getDate()))
newActivities.add(activity);
}
- var user = SecurityUtils.getAuthUser();
for (IssueActivity activity: newActivities) {
Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
- if (user == null || !user.equals(activity.getUser()))
- newActivityRow.add(AttributeAppender.append("class", "new"));
+ newActivityRow.add(AttributeAppender.append("class", "new"));
activitiesView.add(newActivityRow);
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());
+ String script;
+ if (prevActivityRow != null) {
+ script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
+ newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());
+ } else {
+ script = String.format("$(\"<tr id='%s'></tr>\").prependTo($('#%s').find('tbody'));",
+ newActivityRow.getMarkupId(), IssueActivitiesPanel.this.getMarkupId());
+ }
handler.prependJavaScript(script);
handler.add(newActivityRow);
prevActivityRow = newActivityRow;
@@ -393,35 +375,6 @@ public abstract class IssueActivitiesPanel extends Panel {
}
});
-
- fragment.add(new AjaxLink<Void>("showReferences") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (showReferences)
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- showReferences = !showReferences;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_REFERENCES, String.valueOf(showReferences));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(IssueActivitiesPanel.this);
- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
- }
-
- });
fragment.add(new AjaxLink<Void>("showWorkLog") {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueActivity.java
index e5158e8f98..e24afe7ee3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueActivity.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueActivity.java
@@ -3,21 +3,12 @@ package io.onedev.server.web.component.issue.activities.activity;
import java.io.Serializable;
import java.util.Date;
-import javax.annotation.Nullable;
-
import org.apache.wicket.markup.html.panel.Panel;
-import io.onedev.server.model.User;
-import io.onedev.server.web.util.DeleteCallback;
-
public interface IssueActivity extends Serializable {
Date getDate();
- Panel render(String panelId, DeleteCallback deleteCallback);
-
- User getUser();
-
- @Nullable
- String getAnchor();
+ Panel render(String panelId);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
index f576a10e0d..b06f974759 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
@@ -3,13 +3,10 @@ package io.onedev.server.web.component.issue.activities.activity;
import java.util.Date;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.User;
-import io.onedev.server.web.util.DeleteCallback;
public class IssueChangeActivity implements IssueActivity {
@@ -20,15 +17,8 @@ public class IssueChangeActivity implements IssueActivity {
}
@Override
- public Panel render(String panelId, DeleteCallback callback) {
- return new IssueChangePanel(panelId, new LoadableDetachableModel<IssueChange>() {
-
- @Override
- protected IssueChange load() {
- return getChange();
- }
-
- });
+ public Panel render(String panelId) {
+ return new IssueChangePanel(panelId);
}
public IssueChange getChange() {
@@ -40,14 +30,4 @@ public class IssueChangeActivity implements IssueActivity {
return getChange().getDate();
}
- @Override
- public String getAnchor() {
- return getChange().getAnchor();
- }
-
- @Override
- public User getUser() {
- return getChange().getUser();
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
index fd1e55fc7a..d8a52f1138 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
@@ -1,8 +1,10 @@
<wicket:panel>
- <div class="head">
- <span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
- </div>
- <div class="body">
- <div wicket:id="detail" class="detail"></div>
+ <div>
+ <wicket:svg href="history" class="icon text-gray"></wicket:svg>
+ <div class="head">
+ <span wicket:id="avatar" class="mr-1"></span>
+ <span wicket:id="name"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
+ </div>
+ <div wicket:id="body" class="body mt-3"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
index cf4a5455f8..76e43eb817 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
@@ -1,50 +1,47 @@
package io.onedev.server.web.component.issue.activities.activity;
-import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
+import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.model.IssueChange;
import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
-class IssueChangePanel extends GenericPanel<IssueChange> {
+class IssueChangePanel extends Panel {
- public IssueChangePanel(String id, IModel<IssueChange> model) {
- super(id, model);
+ public IssueChangePanel(String id) {
+ super(id);
}
-
- private IssueChange getChange() {
- return getModelObject();
- }
-
+
@Override
protected void onInitialize() {
super.onInitialize();
- String activity = getChange().getData().getActivity();
- if (getChange().getUser() != null) {
- add(new Label("user", getChange().getUser().getDisplayName()));
- } else {
- add(new WebMarkupContainer("user").setVisible(false));
- activity = StringUtils.capitalize(activity);
- }
-
- add(new Label("description", activity));
+ IssueChange change = getChange();
+
+ add(new UserIdentPanel("avatar", change.getUser(), Mode.AVATAR));
+ add(new Label("name", change.getUser().getDisplayName()));
+ add(new Label("description", change.getData().getActivity()));
- add(new Label("age", DateUtils.formatAge(getChange().getDate()))
- .add(new AttributeAppender("title", DateUtils.formatDateTime(getChange().getDate()))));
+ add(new Label("age", DateUtils.formatAge(change.getDate()))
+ .add(new AttributeAppender("title", DateUtils.formatDateTime(change.getDate()))));
ActivityDetail detail = getChange().getData().getActivityDetail();
- if (detail != null) {
- add(detail.render("detail"));
- } else {
- add(new WebMarkupContainer("detail").setVisible(false));
- add(AttributeAppender.append("class", "no-body"));
- }
+ if (detail != null)
+ add(detail.render("body"));
+ else
+ add(new WebMarkupContainer("body").setVisible(false));
+
+ setMarkupId(getChange().getAnchor());
+ setOutputMarkupId(true);
+ }
+
+ private IssueChange getChange() {
+ return ((IssueChangeActivity) getDefaultModelObject()).getChange();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentActivity.java
new file mode 100644
index 0000000000..fcbb96afac
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentActivity.java
@@ -0,0 +1,37 @@
+package io.onedev.server.web.component.issue.activities.activity;
+
+import java.util.Date;
+
+import org.apache.wicket.markup.html.panel.Panel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueCommentManager;
+import io.onedev.server.model.IssueComment;
+
+public class IssueCommentActivity implements IssueActivity {
+
+ private final Long commentId;
+
+ public IssueCommentActivity(IssueComment comment) {
+ commentId = comment.getId();
+ }
+
+ @Override
+ public Panel render(String panelId) {
+ return new IssueCommentPanel(panelId);
+ }
+
+ public Long getCommentId() {
+ return commentId;
+ }
+
+ public IssueComment getComment() {
+ return OneDev.getInstance(IssueCommentManager.class).load(commentId);
+ }
+
+ @Override
+ public Date getDate() {
+ return getComment().getDate();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.html
new file mode 100644
index 0000000000..16070e22e2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.html
@@ -0,0 +1,14 @@
+<wicket:panel>
+ <div class="d-flex">
+ <div class="avatar mr-3">
+ <span wicket:id="avatar"></span>
+ </div>
+ <div class="detail">
+ <div class="head mb-3">
+ <span wicket:id="name"></span> commented <span wicket:id="age"></span>
+ <a wicket:id="anchor" class="activity-anchor ml-2"><wicket:svg href="link" class="icon rotate-45"/></a>
+ </div>
+ <div wicket:id="body" class="body"></div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java
similarity index 60%
rename from server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java
index 2e742deec1..600be84fe4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java
@@ -1,9 +1,5 @@
package io.onedev.server.web.component.issue.activities.activity;
-import static io.onedev.server.security.SecurityUtils.canManageIssues;
-import static io.onedev.server.util.EmailAddressUtils.describe;
-import static org.unbescape.html.HtmlEscape.escapeHtml5;
-
import java.util.Collection;
import java.util.List;
@@ -12,8 +8,7 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
+import org.apache.wicket.markup.html.panel.Panel;
import org.jetbrains.annotations.Nullable;
import io.onedev.commons.utils.ExplicitException;
@@ -30,29 +25,25 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.comment.CommentPanel;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.util.DeleteCallback;
-class IssueCommentedPanel extends GenericPanel<IssueComment> {
+class IssueCommentPanel extends Panel {
- private final DeleteCallback deleteCallback;
-
- public IssueCommentedPanel(String id, IModel<IssueComment> model, DeleteCallback deleteCallback) {
- super(id, model);
- this.deleteCallback = deleteCallback;
+ public IssueCommentPanel(String id) {
+ super(id);
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("user", getComment().getUser().getDisplayName()));
+ add(new UserIdentPanel("avatar", getComment().getUser(), Mode.AVATAR));
+ add(new Label("name", getComment().getUser().getDisplayName()));
add(new Label("age", DateUtils.formatAge(getComment().getDate()))
.add(new AttributeAppender("title", DateUtils.formatDateTime(getComment().getDate()))));
- if (getComment().getOnBehalfOf() != null)
- add(new Label("onBehalfOf", " on behalf of <b>" + escapeHtml5(describe(getComment().getOnBehalfOf(), canManageIssues(getComment().getIssue().getProject()))) + "</b>").setEscapeModelStrings(false));
- else
- add(new WebMarkupContainer("onBehalfOf").setVisible(false));
add(new WebMarkupContainer("anchor") {
@@ -68,39 +59,46 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {
@Override
protected String getComment() {
- return IssueCommentedPanel.this.getComment().getContent();
+ return IssueCommentPanel.this.getComment().getContent();
}
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
if (comment.length() > IssueComment.MAX_CONTENT_LEN)
throw new ExplicitException("Comment too long");
- var entity = IssueCommentedPanel.this.getComment();
+ var entity = IssueCommentPanel.this.getComment();
entity.setContent(comment);
OneDev.getInstance(IssueCommentManager.class).update(entity);
- notifyIssueChange(target);
+ var page = (BasePage) getPage();
+ page.notifyObservablesChange(target, entity.getIssue().getChangeObservables(false));
}
@Override
protected Project getProject() {
- return IssueCommentedPanel.this.getComment().getIssue().getProject();
+ return IssueCommentPanel.this.getComment().getIssue().getProject();
}
+ @Nullable
@Override
- protected List<User> getParticipants() {
- return IssueCommentedPanel.this.getComment().getIssue().getParticipants();
+ protected String getAutosaveKey() {
+ return "issue-comment:" + IssueCommentPanel.this.getComment().getId();
}
-
+
@Override
protected AttachmentSupport getAttachmentSupport() {
return new ProjectAttachmentSupport(getProject(),
- IssueCommentedPanel.this.getComment().getIssue().getUUID(),
- canManageIssues(getProject()));
+ IssueCommentPanel.this.getComment().getIssue().getUUID(),
+ SecurityUtils.canManageIssues(getProject()));
}
+ @Override
+ protected List<User> getParticipants() {
+ return IssueCommentPanel.this.getComment().getIssue().getParticipants();
+ }
+
@Override
protected boolean canManageComment() {
- return SecurityUtils.canModifyOrDelete(IssueCommentedPanel.this.getComment());
+ return SecurityUtils.canModifyOrDelete(IssueCommentPanel.this.getComment());
}
@Override
@@ -116,39 +114,36 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {
@Override
protected DeleteCallback getDeleteCallback() {
return target -> {
- notifyIssueChange(target);
- deleteCallback.onDelete(target);
+ var page = (BasePage) getPage();
+ var issue = IssueCommentPanel.this.getComment().getIssue();
+ target.appendJavaScript(String.format("$('#%s').remove();", IssueCommentPanel.this.getMarkupId()));
+ IssueCommentPanel.this.remove();
+ OneDev.getInstance(IssueCommentManager.class).delete(IssueCommentPanel.this.getComment());
+ page.notifyObservablesChange(target, issue.getChangeObservables(false));
};
}
- @Nullable
- @Override
- protected String getAutosaveKey() {
- return "issue-comment:" + IssueCommentedPanel.this.getComment().getId();
- }
-
@Override
protected Collection<? extends EntityReaction> getReactions() {
- return IssueCommentedPanel.this.getComment().getReactions();
+ return IssueCommentPanel.this.getComment().getReactions();
}
@Override
protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
- var user = SecurityUtils.getUser();
- var comment = IssueCommentedPanel.this.getComment();
- OneDev.getInstance(IssueCommentReactionManager.class).toggleEmoji(user, comment, emoji);
+ OneDev.getInstance(IssueCommentReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ IssueCommentPanel.this.getComment(),
+ emoji);
}
-
+
});
+ setMarkupId(getComment().getAnchor());
setOutputMarkupId(true);
}
private IssueComment getComment() {
- return getModelObject();
+ return ((IssueCommentActivity) getDefaultModelObject()).getComment();
}
- private void notifyIssueChange(AjaxRequestTarget target) {
- ((BasePage)getPage()).notifyObservablesChange(target, getComment().getIssue().getChangeObservables(false));
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java
deleted file mode 100644
index 1c5fc00a50..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.onedev.server.web.component.issue.activities.activity;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueCommentManager;
-import io.onedev.server.model.IssueComment;
-import io.onedev.server.model.User;
-import io.onedev.server.web.util.DeleteCallback;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import java.util.Date;
-
-public class IssueCommentedActivity implements IssueActivity {
-
- private final Long commentId;
-
- public IssueCommentedActivity(IssueComment comment) {
- commentId = comment.getId();
- }
-
- @Override
- public Panel render(String panelId, DeleteCallback deleteCallback) {
- return new IssueCommentedPanel(panelId, new LoadableDetachableModel<>() {
-
- @Override
- protected IssueComment load() {
- return getComment();
- }
-
- }, target -> {
- OneDev.getInstance(IssueCommentManager.class).delete(getComment());
- deleteCallback.onDelete(target);
- });
- }
-
- public Long getCommentId() {
- return commentId;
- }
-
- public IssueComment getComment() {
- return OneDev.getInstance(IssueCommentManager.class).load(commentId);
- }
-
- @Override
- public Date getDate() {
- return getComment().getDate();
- }
-
- @Override
- public String getAnchor() {
- return getComment().getAnchor();
- }
-
- @Override
- public User getUser() {
- return getComment().getUser();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.html
deleted file mode 100644
index 5cf9a25d1e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<wicket:panel>
- <div class="head">
- <span wicket:id="user" class="user"></span> commented <span wicket:id="age"></span> <span wicket:id="onBehalfOf"></span>
- <a wicket:id="anchor" class="activity-anchor ml-2"><wicket:svg href="link" class="icon rotate-45"/></a>
- </div>
- <div wicket:id="body" class="body"></div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java
deleted file mode 100644
index a6bbf11965..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.onedev.server.web.component.issue.activities.activity;
-
-import java.util.Date;
-
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.User;
-import io.onedev.server.web.util.DeleteCallback;
-
-public class IssueOpenedActivity implements IssueActivity {
-
- private final Long issueId;
-
- public IssueOpenedActivity(Issue issue) {
- issueId = issue.getId();
- }
-
- @Override
- public Panel render(String panelId, DeleteCallback deleteCallback) {
- return new IssueOpenedPanel(panelId, new LoadableDetachableModel<Issue>() {
-
- @Override
- protected Issue load() {
- return getIssue();
- }
-
- });
- }
-
- public Issue getIssue() {
- return OneDev.getInstance(IssueManager.class).load(issueId);
- }
-
- @Override
- public Date getDate() {
- return getIssue().getSubmitDate();
- }
-
- @Override
- public String getAnchor() {
- return null;
- }
-
- @Override
- public User getUser() {
- return getIssue().getSubmitter();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.html
deleted file mode 100644
index e2b9b304d4..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<wicket:panel>
- <div class="head">
- <span wicket:id="user" class="user"></span> opened <span wicket:id="age"></span> <span wicket:id="onBehalfOf"></span>
- </div>
- <div wicket:id="body" class="body"></div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkActivity.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkActivity.java
index fba469ab70..b7b7a4a8a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkActivity.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkActivity.java
@@ -1,14 +1,12 @@
package io.onedev.server.web.component.issue.activities.activity;
+import java.util.Date;
+
+import org.apache.wicket.markup.html.panel.Panel;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueWorkManager;
import io.onedev.server.model.IssueWork;
-import io.onedev.server.model.User;
-import io.onedev.server.web.util.DeleteCallback;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import java.util.Date;
public class IssueWorkActivity implements IssueActivity {
@@ -19,18 +17,8 @@ public class IssueWorkActivity implements IssueActivity {
}
@Override
- public Panel render(String panelId, DeleteCallback deleteCallback) {
- return new IssueWorkPanel(panelId, new LoadableDetachableModel<IssueWork>() {
-
- @Override
- protected IssueWork load() {
- return getWork();
- }
-
- }, target -> {
- OneDev.getInstance(IssueWorkManager.class).delete(getWork());
- deleteCallback.onDelete(target);
- });
+ public Panel render(String panelId) {
+ return new IssueWorkPanel(panelId);
}
public Long getWorkId() {
@@ -40,20 +28,10 @@ public class IssueWorkActivity implements IssueActivity {
public IssueWork getWork() {
return OneDev.getInstance(IssueWorkManager.class).load(workId);
}
-
+
@Override
public Date getDate() {
return getWork().getDate();
}
-
- @Override
- public String getAnchor() {
- return null;
- }
-
- @Override
- public User getUser() {
- return getWork().getUser();
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html
index 58a64b48b1..7c438e220b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html
@@ -1,12 +1,13 @@
<wicket:panel>
- <div class="head">
- <span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
- </div>
- <div class="body">
- <div wicket:id="detail"></div>
+ <div>
+ <wicket:svg href="work-log" class="icon text-gray"></wicket:svg>
+ <div class="head">
+ <span wicket:id="avatar" class="mr-1"></span>
+ <span wicket:id="name"></span> logged work (<span wicket:id="workingPeriod"></span>) <span wicket:id="age"></span>
+ </div>
+ <div wicket:id="body" class="body mt-3"></div>
</div>
<wicket:fragment wicket:id="detailViewFrag">
- <div>Worked on this issue for <span wicket:id="workingPeriod"></span></div>
<div wicket:id="note" class="note mt-3"></div>
<div class="d-flex align-items-center d-empty-none mt-3"><wicket:enclosure child="edit"><a wicket:id="edit" class="text-muted text-hover-primary font-size-sm mr-2">Edit</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="delete"><a wicket:id="delete" class="text-muted text-hover-primary font-size-sm">Delete</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure></div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
index 8156e0eb42..fe4b8aad8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
@@ -1,17 +1,7 @@
package io.onedev.server.web.component.issue.activities.activity;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueWorkManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.IssueWork;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.editbean.IssueWorkBean;
+import static io.onedev.server.util.DateUtils.formatDateTime;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -22,42 +12,48 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
-import static io.onedev.server.util.DateUtils.formatDateTime;
-
-class IssueWorkPanel extends GenericPanel<IssueWork> {
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueWorkManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.IssueWork;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.component.markdown.MarkdownViewer;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.util.editbean.IssueWorkBean;
- private final DeleteCallback deleteCallback;
-
- public IssueWorkPanel(String id, IModel<IssueWork> model, DeleteCallback deleteCallback) {
- super(id, model);
- this.deleteCallback = deleteCallback;
- }
-
- private IssueWork getWork() {
- return getModelObject();
+class IssueWorkPanel extends Panel {
+
+ public IssueWorkPanel(String id) {
+ super(id);
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("user", getWork().getUser().getDisplayName()));
-
- add(new Label("description", "logged work"));
+ add(new UserIdentPanel("avatar", getWork().getUser(), Mode.AVATAR));
+ add(new Label("name", getWork().getUser().getDisplayName()));
+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();
+ add(new Label("workingPeriod", timeTrackingSetting.formatWorkingPeriod(getWork().getMinutes())));
add(new Label("age", DateUtils.formatAge(getWork().getDate()))
.add(new AttributeAppender("title", formatDateTime(getWork().getDate()))));
- add(newDetailViewer("detail"));
+ add(newDetailViewer("body"));
+
+ setMarkupId(getWork().getAnchor());
+ setOutputMarkupId(true);
}
private Component newDetailViewer(String componentId) {
var fragment = new Fragment(componentId, "detailViewFrag", this);
- var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();
- fragment.add(new Label("workingPeriod", timeTrackingSetting.formatWorkingPeriod(getWork().getMinutes())));
if (getWork().getNote() != null)
fragment.add(new MarkdownViewer("note", Model.of(getWork().getNote()), null));
else
@@ -67,7 +63,7 @@ class IssueWorkPanel extends GenericPanel<IssueWork> {
@Override
public void onClick(AjaxRequestTarget target) {
- var detailEditor = newDetailEditor("detail");
+ var detailEditor = newDetailEditor("body");
fragment.replaceWith(detailEditor);
target.add(detailEditor);
}
@@ -89,7 +85,9 @@ class IssueWorkPanel extends GenericPanel<IssueWork> {
@Override
public void onClick(AjaxRequestTarget target) {
notifyIssueChange(target);
- deleteCallback.onDelete(target);
+ getWorkManager().delete(getWork());
+ IssueWorkPanel.this.remove();
+ target.appendJavaScript(String.format("$('#%s').remove();", IssueWorkPanel.this.getMarkupId()));
}
@Override
@@ -100,7 +98,6 @@ class IssueWorkPanel extends GenericPanel<IssueWork> {
});
fragment.setOutputMarkupId(true);
-
return fragment;
}
@@ -122,7 +119,7 @@ class IssueWorkPanel extends GenericPanel<IssueWork> {
work.setDay(DateUtils.toLocalDate(bean.getStartAt()).toEpochDay());
work.setMinutes(bean.getSpentTime());
getWorkManager().createOrUpdate(work);
- var detailViewer = newDetailViewer("detail");
+ var detailViewer = newDetailViewer("body");
fragment.replaceWith(detailViewer);
target.add(detailViewer);
}
@@ -137,7 +134,7 @@ class IssueWorkPanel extends GenericPanel<IssueWork> {
@Override
public void onClick(AjaxRequestTarget target) {
- var detailViewer = newDetailViewer("detail");
+ var detailViewer = newDetailViewer("body");
fragment.replaceWith(detailViewer);
target.add(detailViewer);
}
@@ -150,6 +147,10 @@ class IssueWorkPanel extends GenericPanel<IssueWork> {
private IssueWorkManager getWorkManager() {
return OneDev.getInstance(IssueWorkManager.class);
}
+
+ private IssueWork getWork() {
+ return ((IssueWorkActivity) getDefaultModelObject()).getWork();
+ }
private void notifyIssueChange(AjaxRequestTarget target) {
((BasePage)getPage()).notifyObservablesChange(target, getWork().getIssue().getChangeObservables(false));
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.css
index cb5d803ea1..4dc142dd6b 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
@@ -1,58 +1,55 @@
-.issue-activities>table {
- table-layout: fixed;
+.issue-activities>.activity {
+ border-left: 4px solid white;
+}
+.dark-mode .issue-activities>.activity {
+ border-left-color: var(--dark-mode-dark);
}
-.issue-activities tr.activity.new>.avatar {
+.issue-activities>.activity.new {
border-left-color: var(--primary) !important;
}
-.issue-activities>table>tbody>tr>td {
+.issue-activities>.activity {
border-top: 1px solid var(--light-gray);
- padding: 1.25rem 0;
- vertical-align: top;
-}
-.dark-mode .issue-activities>table>tbody>tr>td {
- border-top-color: var(--dark-mode-lighter-dark);
}
-.issue-activities>table>tbody>tr:first-child>td {
- border-top: none;
+.dark-mode .issue-activities>.activity {
+ border-top-color: var(--dark-mode-light-dark);
}
-.issue-activities>table>tbody>tr>td.avatar {
- width: 48px;
- border-left: 4px solid white;
- padding-left: 8px;
+.issue-activities>.activity:first-child {
+ border-top-width: 2px;
+ border-top-style: dashed;
}
-.dark-mode .issue-activities>table>tbody>tr>td.avatar {
- border-left-color: var(--dark-mode-dark);
+.issue-activities>.activity>div {
+ padding: 16px 0 16px 8px;
}
-.issue-activities>table>tbody>tr>td.avatar .avatar {
+.issue-activities>.comment.activity img.avatar {
width: 40px;
height: 40px;
}
-.issue-activities>table>tbody>tr>td.avatar .avatar.system-avatar {
- width: 44px;
- height: 44px;
- margin-left: -2px;
- opacity: 75%;
-}
-.issue-activities>table>tbody>tr>td.content {
- padding-left: 1.25rem;
+.issue-activities>.activity .activity-anchor {
+ display: none;
}
-.issue-activities>table>tbody>tr>td.content>.body {
- margin-top: 1rem;
+.issue-activities>.activity:hover .activity-anchor {
+ display: inline;
}
-.issue-activities>table>tbody>tr>td.content>.body>.detail+.comment {
- margin-top: 1rem;
+.issue-activities>.non-comment+.non-comment {
+ border-top: none !important;
}
-.issue-activities>table>tbody>tr>td.content.no-body {
- vertical-align: middle;
-}
-.issue-activities>table>tbody>tr>td.content.no-body>.body {
- display: none;
-}
-.issue-activities>table>tbody>tr .activity-anchor {
- display: none;
-}
-.issue-activities>table>tbody>tr:hover .activity-anchor {
- display: inline;
+.issue-activities>.activity.non-comment>div {
+ border-left: 1px solid var(--light-gray) !important;
+ margin-left: 4.6rem;
+ position: relative;
+ padding-left: 1.3rem;
+}
+.dark-mode .issue-activities>.activity.non-comment>div {
+ border-color: var(--dark-mode-light-dark) !important;
+}
+.issue-activities>.activity.non-comment>div>.icon {
+ position: absolute;
+ left: -0.6rem;
+ top: 1.4rem;
+ background: white;
+}
+.dark-mode .issue-activities>.activity.non-comment>div>.icon {
+ background: var(--dark-mode-dark);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.html
new file mode 100644
index 0000000000..2dd8be0b23
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="border border-dashed border-primary rounded p-4">
+ <div class="mb-3">
+ <span wicket:id="submitterAvatar" class="mr-1"></span> <span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span> <span wicket:id="submitOnBehalfOf"></span>
+ </div>
+ <div wicket:id="description"></div>
+ </div>
+ <wicket:fragment wicket:id="linkIssuesFrag">
+ <span class="d-first-child-none dot mr-2"></span>
+ <a wicket:id="linkIssues" class="text-muted text-hover-primary mr-2">Link Issues</a>
+ </wicket:fragment>
+</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.java
similarity index 66%
rename from server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.java
index 4fdb4115ca..cb7109159f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.java
@@ -1,19 +1,17 @@
-package io.onedev.server.web.component.issue.activities.activity;
-
-import static io.onedev.server.security.SecurityUtils.canManageIssues;
-import static io.onedev.server.util.EmailAddressUtils.describe;
-import static org.unbescape.html.HtmlEscape.escapeHtml5;
+package io.onedev.server.web.component.issue.description;
import java.util.Collection;
import java.util.List;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-import org.jetbrains.annotations.Nullable;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
@@ -26,32 +24,36 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.EmailAddressUtils;
import io.onedev.server.web.component.comment.CommentPanel;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.util.DeleteCallback;
-class IssueOpenedPanel extends GenericPanel<Issue> {
+public abstract class IssueDescriptionPanel extends Panel {
- public IssueOpenedPanel(String id, IModel<Issue> model) {
- super(id, model);
+ public IssueDescriptionPanel(String id) {
+ super(id);
}
@Override
protected void onInitialize() {
super.onInitialize();
-
+
Issue issue = getIssue();
- add(new Label("user", issue.getSubmitter().getDisplayName()));
- add(new Label("age", DateUtils.formatAge(issue.getSubmitDate()))
+ add(new UserIdentPanel("submitterAvatar", issue.getSubmitter(), Mode.AVATAR));
+ add(new Label("submitterName", issue.getSubmitter().getDisplayName()));
+ add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate()))
.add(new AttributeAppender("title", DateUtils.formatDateTime(issue.getSubmitDate()))));
if (issue.getOnBehalfOf() != null)
- add(new Label("onBehalfOf", " on behalf of <b>" + escapeHtml5(describe(issue.getOnBehalfOf(), canManageIssues(getIssue().getProject()))) + "</b>").setEscapeModelStrings(false));
+ add(new Label("submitOnBehalfOf", " on behalf of <b>" + HtmlEscape.escapeHtml5(EmailAddressUtils.describe(issue.getOnBehalfOf(), SecurityUtils.canManageIssues(getIssue().getProject()))) + "</b>").setEscapeModelStrings(false));
else
- add(new WebMarkupContainer("onBehalfOf").setVisible(false));
-
- add(new CommentPanel("body") {
+ add(new WebMarkupContainer("submitOnBehalfOf").setVisible(false));
+
+ add(new CommentPanel("description") {
@Override
protected String getComment() {
@@ -105,7 +107,6 @@ class IssueOpenedPanel extends GenericPanel<Issue> {
return null;
}
- @Nullable
@Override
protected String getAutosaveKey() {
return "issue:" + getIssue().getId() + ":description";
@@ -124,11 +125,22 @@ class IssueOpenedPanel extends GenericPanel<Issue> {
emoji);
}
- });
- }
+ @Override
+ protected Component newMoreActions(String componentId) {
+ var fragment = new Fragment(componentId, "linkIssuesFrag", IssueDescriptionPanel.this);
+ fragment.add(new AjaxLink<Void>("linkIssues") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+
+ }
+ });
+ return fragment;
+ }
- private Issue getIssue() {
- return getModelObject();
+ });
+
}
+ protected abstract Issue getIssue();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html
index bf17131710..b54f940e07 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html
@@ -1,10 +1,8 @@
<wicket:panel>
- <div class="issue-operations">
- <div class="state-and-actions d-flex flex-wrap row-gap-3">
- <a wicket:id="state" class="state">
- <span wicket:id="name"></span>
- </a>
- <a wicket:id="newIssue" class="new-issue btn btn-primary btn-sm btn-icon ml-auto" title="Create new issue"><wicket:svg href="plus" class="icon"/></a>
- </div>
+ <div class="issue-operations d-flex flex-wrap row-gap-3">
+ <a wicket:id="state" class="state">
+ <span wicket:id="name"></span>
+ </a>
+ <a wicket:id="newIssue" class="new-issue btn btn-primary btn-sm btn-icon ml-auto" title="Create new issue"><wicket:svg href="plus" class="icon"/></a>
</div>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
index 40f2cc6d8e..be5e83fd67 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
@@ -1,18 +1,15 @@
-.issue-operations>div {
- margin-bottom: 1.5rem;
-}
-.issue-operations>.state-and-actions>.state {
+.issue-operations>.state {
margin-right: 1.2rem;
padding-right: 1.2rem;
}
-.issue-operations>.state-and-actions>.state.with-separator {
+.issue-operations>.state.with-separator {
border-right: 1px solid var(--light-gray);
}
-.dark-mode .issue-operations>.state-and-actions>.state.with-separator {
+.dark-mode .issue-operations>.state.with-separator {
border-right-color: var(--dark-mode-lighter-dark);
}
-.issue-operations>.state-and-actions>.state>.issue-state {
+.issue-operations>.state>.issue-state {
padding: 0.55rem 0.75rem;
font-size: 0.925rem;
border: 1px solid transparent;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoCssResourceReference.java
deleted file mode 100644
index 150d9b327b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.sideinfo;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class SideInfoCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public SideInfoCssResourceReference() {
- super(SideInfoCssResourceReference.class, "side-info.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java
index 9d378ddb7e..3d500984f9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoLink.java
@@ -26,7 +26,7 @@ public class SideInfoLink extends AjaxLink<Void> {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new SideInfoCssResourceReference()));
+ response.render(CssHeaderItem.forReference(new SideInfoResourceReference()));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
index f35ebf88d5..ab3c5ce71d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoPanel.java
@@ -5,9 +5,9 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.IEvent;
-import org.apache.wicket.markup.head.CssHeaderItem;
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.panel.Panel;
import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;
@@ -56,7 +56,8 @@ public abstract class SideInfoPanel extends Panel {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));
- response.render(CssHeaderItem.forReference(new SideInfoCssResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new SideInfoResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.sideInfo.onDomReady('" + getMarkupId() + "');"));
}
protected abstract Component newTitle(String componentId);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.java
new file mode 100644
index 0000000000..1ac596a8b4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/SideInfoResourceReference.java
@@ -0,0 +1,26 @@
+package io.onedev.server.web.component.sideinfo;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class SideInfoResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public SideInfoResourceReference() {
+ super(SideInfoResourceReference.class, "side-info.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ SideInfoResourceReference.class, "side-info.css")));
+ return dependencies;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js
new file mode 100644
index 0000000000..115754b107
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js
@@ -0,0 +1,29 @@
+onedev.server.sideInfo = {
+ onDomReady: function(containerId) {
+ var $container = $("#" + containerId);
+ $(document).on("mouseup touchstart", function(e) {
+ if ($(".flatpickr-calendar.open").length == 0
+ && $(".pcr-app.visible").length == 0
+ && $container.find(".dropdown-open").length == 0) {
+ var x = e.pageX;
+ var y = e.pageY;
+
+ var contains = $container.offset().left<x && $container.offset().left+$container.outerWidth()>x
+ && $container.offset().top<y && $container.offset().top+$container.outerHeight()>y;
+
+ if (!$container.is(e.target) && $container.has(e.target).length === 0 && !contains) {
+ $container.addClass("closed");
+ }
+ }
+ });
+ $(document).on("keydown", function(e) {
+ if (e.keyCode == 27 && $(e.target).closest(".flatpickr-calendar").length == 0
+ && $container.find(".dropdown-open").length == 0
+ && $(".select2-drop:visible").length == 0
+ && $(".flatpickr-calendar.open").length == 0
+ && $(".pcr-app.visible").length == 0) {
+ $container.addClass("closed");
+ }
+ });
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
index cefe469b57..a4e84dbe4b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
@@ -10,7 +10,7 @@
<div wicket:id="actions" class="mr-2">
<a wicket:id="rebuild" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2" title="Re-run this build"><wicket:svg href="re-run" class="icon"/></a>
<a wicket:id="cancel" class="btn btn-icon btn-light btn-hover-danger btn-xs mr-2" title="Cancel this build"><wicket:svg href="cancel" class="icon"/></a>
- <a wicket:id="edit" title="Edit build description" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="edit" class="icon"/></a>
+ <a wicket:id="edit" title="Edit build description" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="edit-file" class="icon"/></a>
<a wicket:id="terminal" title="Open terminal of current running step" class="ee-feature btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="terminal" class="icon"/></a>
<a wicket:id="promotions" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2" title="Promotions"><wicket:svg href="next" class="icon"/></a>
</div>
@@ -24,7 +24,7 @@
<div wicket:id="buildSpecNotFound" class="alert alert-notice alert-light-warning">Build spec not found in commit of this build</div>
<div wicket:id="jobNotFound" class="alert alert-notice alert-light-warning">Job '<span wicket:id="jobName"></span>' associated with the build not found.
Most probably there are import errors in the <a wicket:id="buildSpec">build spec</a></div>
- <div wicket:id="description" class="mb-2"></div>
+ <div wicket:id="description" class="border border-dashed border-primary rounded p-3 mb-3"></div>
<ul wicket:id="buildTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 flex-shrink-0"></ul>
<wicket:child></wicket:child>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
index 1e3eba94cc..639a2cc387 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
@@ -7,7 +7,8 @@
</div>
<div class="modal-body d-flex position-relative overflow-hidden">
<div class="main flex-grow-1">
- <div wicket:id="operations"></div>
+ <div wicket:id="operations" class="mb-5"></div>
+ <div wicket:id="description" class="mb-5"></div>
<ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
<div wicket:id="tabContent"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index 1712c19436..7f9934d75a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -1,11 +1,28 @@
package io.onedev.server.web.page.project.issues.boards;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.IRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
+
import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.xodus.VisitInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
@@ -22,6 +39,7 @@ import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;
import io.onedev.server.web.component.issue.authorizations.IssueAuthorizationsPanel;
import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;
+import io.onedev.server.web.component.issue.description.IssueDescriptionPanel;
import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;
import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;
import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;
@@ -32,22 +50,7 @@ import io.onedev.server.web.component.tabbable.AjaxActionTab;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.util.CursorSupport;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.cycle.IRequestCycleListener;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
+import io.onedev.server.xodus.VisitInfoManager;
abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContext {
@@ -105,6 +108,15 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
});
+ add(new IssueDescriptionPanel("description") {
+
+ @Override
+ protected Issue getIssue() {
+ return CardDetailPanel.this.getIssue();
+ }
+
+ });
+
List<Tab> tabs = new ArrayList<>();
tabs.add(new AjaxActionTab(Model.of("Activities")) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
index c0a1202633..fb09391dbb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
@@ -6,7 +6,8 @@
</div>
<div class="card-body d-flex position-relative overflow-hidden">
<div class="main flex-grow-1">
- <div wicket:id="operations"></div>
+ <div wicket:id="operations" class="mb-5"></div>
+ <div wicket:id="description" class="mb-5"></div>
<ul wicket:id="issueTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
<wicket:child></wicket:child>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index b74da89290..2c65096382 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -1,6 +1,35 @@
package io.onedev.server.web.page.project.issues.detail;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.persistence.EntityNotFoundException;
+import javax.validation.ValidationException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.IRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.entitymanager.IssueLinkManager;
@@ -17,6 +46,7 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
+import io.onedev.server.web.component.issue.description.IssueDescriptionPanel;
import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;
import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;
import io.onedev.server.web.component.issue.side.IssueSidePanel;
@@ -34,32 +64,6 @@ import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
import io.onedev.server.xodus.VisitInfoManager;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.cycle.IRequestCycleListener;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import javax.persistence.EntityNotFoundException;
-import javax.validation.ValidationException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext {
@@ -139,8 +143,15 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
});
- add(new Tabbable("issueTabs", new LoadableDetachableModel<>() {
+ add(new IssueDescriptionPanel("description") {
+ @Override
+ protected Issue getIssue() {
+ return IssueDetailPage.this.getIssue();
+ }
+ });
+
+ add(new Tabbable("issueTabs", new LoadableDetachableModel<>() {
@Override
protected List<? extends Tab> load() {
List<Tab> tabs = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
index a658334d4f..33edc91f83 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
@@ -1,3 +1,7 @@
+.issue-detail .submitter-avatar img {
+ width: 40px;
+ height: 40px;
+}
.issue-detail .transition-option .modal-header {
display: none;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 415c001808..21b617895f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -25,7 +25,13 @@
<a wicket:id="clone" title="Check out to local workspace" class="btn btn-primary btn-icon mr-3"><wicket:svg href="download2" class="icon"></wicket:svg></a>
<a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-auto" title="Open new pull request"><wicket:svg href="plus" class="icon"/></a>
</div>
- <div wicket:id="requestSummary" class="summary mb-4 font-size-h6 border-primary border border-dashed rounded">
+ <div wicket:id="description" class="description border border-dashed border-primary rounded p-4 mb-5">
+ <div class="mb-3">
+ <span wicket:id="submitterAvatar" class="mr-1"></span> <span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span>
+ </div>
+ <div wicket:id="content"></div>
+ </div>
+ <div wicket:id="requestSummary" class="summary p-4 mb-4 font-size-h6 border border-dashed border-primary rounded">
<wicket:enclosure>
<div class="text-warning">
<wicket:svg href="exclamation-circle" class="icon"></wicket:svg> <span wicket:id="checkError"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 2868d64845..c03c2dcac9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -65,10 +65,13 @@ import org.jetbrains.annotations.Nullable;
import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
+import io.onedev.server.attachment.AttachmentSupport;
+import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.entitymanager.PullRequestAssignmentManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestLabelManager;
import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.PullRequestReactionManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -87,6 +90,7 @@ import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.PullRequestWatch;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.code.BuildRequirement;
import io.onedev.server.model.support.pullrequest.AutoMerge;
@@ -97,6 +101,7 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ReadCode;
+import io.onedev.server.util.DateUtils;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
@@ -106,6 +111,7 @@ import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.branch.BranchLink;
+import io.onedev.server.web.component.comment.CommentPanel;
import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.reference.EntityReferencePanel;
@@ -114,6 +120,7 @@ import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.RunJobLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.ModalLink;
@@ -147,6 +154,7 @@ import io.onedev.server.web.page.project.pullrequests.detail.operationdlg.Operat
import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
+import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.PullRequestAware;
import io.onedev.server.web.util.editbean.CommitMessageBean;
import io.onedev.server.web.util.editbean.LabelsBean;
@@ -359,6 +367,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
add(newRequestHead());
add(newStatusBarContainer());
+ add(newDescriptionContainer());
+
WebMarkupContainer summaryContainer = new WebMarkupContainer("requestSummary") {
@Override
@@ -1599,6 +1609,101 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return statusBarContainer;
}
+ private WebMarkupContainer newDescriptionContainer() {
+ PullRequest request = getPullRequest();
+
+ var descriptionContainer = new WebMarkupContainer("description");
+ descriptionContainer.add(new UserIdentPanel("submitterAvatar", request.getSubmitter(), Mode.AVATAR));
+ descriptionContainer.add(new Label("submitterName", request.getSubmitter().getDisplayName()));
+ descriptionContainer.add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate()))
+ .add(new AttributeAppender("title", DateUtils.formatDateTime(request.getSubmitDate()))));
+
+ descriptionContainer.add(new CommentPanel("content") {
+
+ @Override
+ protected String getComment() {
+ return getPullRequest().getDescription();
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ OneDev.getInstance(PullRequestChangeManager.class).changeDescription(getPullRequest(), comment);
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
+ }
+
+ @Nullable
+ @Override
+ protected String getAutosaveKey() {
+ return "pull-request:" + getPullRequest().getId() + ":description";
+ }
+
+ @Override
+ protected Project getProject() {
+ return getPullRequest().getTargetProject();
+ }
+
+ @Override
+ protected List<User> getParticipants() {
+ return getPullRequest().getParticipants();
+ }
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID(),
+ SecurityUtils.canManagePullRequests(getProject()));
+ }
+
+ @Override
+ protected boolean canManageComment() {
+ return SecurityUtils.canModifyPullRequest(getPullRequest());
+ }
+
+ @Override
+ protected String getRequiredLabel() {
+ return null;
+ }
+
+ @Override
+ protected String getEmptyDescription() {
+ return "No description";
+ }
+
+ @Override
+ protected ContentVersionSupport getContentVersionSupport() {
+ return new ContentVersionSupport() {
+
+ @Override
+ public long getVersion() {
+ return 0;
+ }
+
+ };
+ }
+
+ @Override
+ protected DeleteCallback getDeleteCallback() {
+ return null;
+ }
+
+ @Override
+ protected Collection<? extends EntityReaction> getReactions() {
+ return getPullRequest().getReactions();
+ }
+
+ @Override
+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ OneDev.getInstance(PullRequestReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ getPullRequest(),
+ emoji);
+ }
+
+ });
+
+ return descriptionContainer;
+ }
+
private WebMarkupContainer newSummaryContributions() {
return new ListView<PullRequestSummaryPart>("contributions",
new LoadableDetachableModel<List<PullRequestSummaryPart>>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
index 8d0b880b78..7967718737 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html
@@ -1,13 +1,8 @@
<wicket:extend>
- <div wicket:id="activities" class="activities">
- <table class="w-100">
- <tr wicket:id="activities" class="activity">
- <td class="avatar"><a wicket:id="avatar"></a></td>
- <td wicket:id="content" class="content"></td>
- </tr>
- </table>
- <div wicket:id="addComment" class="mt-4"></div>
- </div>
+ <ul wicket:id="activities" class="activities list-unstyled mb-0">
+ <li wicket:id="activities" class="activity"></li>
+ <li wicket:id="addComment" class="mt-4"></li>
+ </ul>
<wicket:fragment wicket:id="loginToCommentFrag">
<div class="login-to-comment alert alert-light text-center font-size-h6">
<a wicket:id="login" class="link-primary">Login to comment</a>
@@ -20,18 +15,17 @@
<button wicket:id="save" class="btn btn-primary dirty-aware mt-3">Comment</button>
</form>
</wicket:fragment>
- <wicket:fragment wicket:id="sinceChangesRowAvatarFrag">
- <wicket:svg href="diff" class="icon"/>
- </wicket:fragment>
- <wicket:fragment wicket:id="sinceChangesRowContentFrag">
- <a wicket:id="sinceChanges" class="link-primary font-size-h6">Changes since last visit</a>
+ <wicket:fragment wicket:id="sinceChangesRowFrag">
+ <div class="d-flex align-items-center p-0">
+ <span class="mr-3"><wicket:svg href="diff" class="icon text-primary"/></span>
+ <a wicket:id="sinceChanges" class="link-primary font-size-h6">Changes since last visit</a>
+ </div>
</wicket:fragment>
<wicket:fragment wicket:id="optionsFrag">
<div class="pull-request-activity-options">
<a wicket:id="showComments" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Toggle comments"><wicket:svg href="comments" class="icon"></wicket:svg></a>
<a wicket:id="showCommits" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Toggle commits"><wicket:svg href="commit" class="icon"></wicket:svg></a>
<a wicket:id="showChangeHistory" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Toggle change history"><wicket:svg href="history" class="icon"></wicket:svg></a>
- <a wicket:id="showReferences" class="btn btn-xs text-muted btn-active-secondary btn-icon" title="Toggle references"><wicket:svg href="reference" class="icon"></wicket:svg></a>
</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 43dbb3e921..e7ac207838 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -1,32 +1,15 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
-import io.onedev.server.attachment.AttachmentSupport;
-import io.onedev.server.attachment.ProjectAttachmentSupport;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.entityreference.ReferencedFromAware;
-import io.onedev.server.model.*;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCommitData;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.ProjectScopedCommit;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.behavior.ChangeObserver;
-import io.onedev.server.web.component.comment.CommentInput;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.component.user.ident.Mode;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestOpenedActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestUpdatedActivity;
-import io.onedev.server.web.page.simple.security.LoginPage;
-import io.onedev.server.web.util.DeleteCallback;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.Cookie;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
@@ -38,11 +21,9 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
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.form.Form;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -57,9 +38,32 @@ import org.eclipse.jgit.lib.ObjectId;
import org.jetbrains.annotations.Nullable;
import org.joda.time.DateTime;
-import javax.servlet.http.Cookie;
-import java.util.*;
-import java.util.stream.Collectors;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.attachment.AttachmentSupport;
+import io.onedev.server.attachment.ProjectAttachmentSupport;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.PullRequestUpdate;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.component.comment.CommentInput;
+import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestUpdateActivity;
+import io.onedev.server.web.page.simple.security.LoginPage;
public class PullRequestActivitiesPage extends PullRequestDetailPage {
@@ -68,16 +72,12 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
private static final String COOKIE_SHOW_COMMITS = "onedev.server.pullRequest.showCommits";
private static final String COOKIE_SHOW_CHANGE_HISTORY = "onedev.server.pullRequest.showChangeHistory";
-
- private static final String COOKIE_SHOW_REFERENCES = "onedev.server.pullRequest.showReferences";
private boolean showComments = true;
private boolean showCommits = true;
private boolean showChangeHistory = true;
-
- private boolean showReferences = true;
private WebMarkupContainer container;
@@ -100,92 +100,46 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
cookie = request.getCookie(COOKIE_SHOW_CHANGE_HISTORY);
if (cookie != null)
showChangeHistory = Boolean.valueOf(cookie.getValue());
-
- cookie = request.getCookie(COOKIE_SHOW_REFERENCES);
- if (cookie != null)
- showReferences = Boolean.valueOf(cookie.getValue());
}
private Component newActivityRow(String id, PullRequestActivity activity) {
- WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));
- row.setOutputMarkupId(true);
-
- String anchor = activity.getAnchor();
- if (anchor != null)
- row.setMarkupId(anchor);
-
- if (activity.getUser() != null)
- row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));
- else
- row.add(new WebMarkupContainer("avatar"));
-
- row.add(activity.render("content", new DeleteCallback() {
-
- @Override
- public void onDelete(AjaxRequestTarget target) {
- row.remove();
- target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));
- }
-
- }));
-
+ var row = activity.render(id);
row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));
-
+ if (activity instanceof PullRequestCommentActivity)
+ row.add(AttributeAppender.append("class", "comment"));
+ else
+ row.add(AttributeAppender.append("class", "non-comment"));
+ row.setDefaultModel(Model.of(activity));
+ row.setOutputMarkupId(true);
return row;
}
private List<PullRequestActivity> getActivities() {
PullRequest request = getPullRequest();
List<PullRequestActivity> activities = new ArrayList<>();
-
- activities.add(new PullRequestOpenedActivity(request));
List<PullRequestActivity> otherActivities = new ArrayList<>();
if (showComments) {
for (PullRequestComment comment: request.getComments())
- otherActivities.add(new PullRequestCommentedActivity(comment));
+ otherActivities.add(new PullRequestCommentActivity(comment));
}
if (showCommits) {
for (PullRequestUpdate update: request.getUpdates())
- otherActivities.add(new PullRequestUpdatedActivity(update));
+ otherActivities.add(new PullRequestUpdateActivity(update));
}
if (showChangeHistory) {
for (PullRequestChange change: getPullRequest().getChanges()) {
if (!(change.getData() instanceof ReferencedFromAware)
- && !(change.getData() instanceof PullRequestReferencedFromCommitData)
&& !(change.getData() instanceof PullRequestDescriptionChangeData)) {
otherActivities.add(new PullRequestChangeActivity(change));
}
}
}
-
- if (showReferences) {
- for (PullRequestChange change: getPullRequest().getChanges()) {
- if (change.getData() instanceof ReferencedFromAware) {
- ReferencedFromAware<?> referencedFromAware = (ReferencedFromAware<?>) change.getData();
- if (ReferencedFromAware.canDisplay(referencedFromAware))
- otherActivities.add(new PullRequestChangeActivity(change));
- } else if (change.getData() instanceof PullRequestReferencedFromCommitData) {
- ProjectScopedCommit commit = ((PullRequestReferencedFromCommitData) change.getData()).getCommit();
- if (commit.canDisplay())
- otherActivities.add(new PullRequestChangeActivity(change));
- }
- }
- }
- otherActivities.sort((o1, o2) -> {
- if (o1.getDate().getTime()<o2.getDate().getTime())
- return -1;
- else if (o1.getDate().getTime()>o2.getDate().getTime())
- return 1;
- else if (o1 instanceof PullRequestOpenedActivity)
- return -1;
- else
- return 1;
- });
+ otherActivities.sort(Comparator.comparingLong(o -> o.getDate().getTime()));
activities.addAll(otherActivities);
@@ -193,26 +147,10 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
private Component newSinceChangesRow(String id, Date sinceDate) {
- WebMarkupContainer row = new WebMarkupContainer(id);
- row.setOutputMarkupId(true);
-
- String avatarHtml = String.format("<svg class='icon'><use xlink:href='%s'/></svg>", SpriteImage.getVersionedHref("diff"));
- row.add(new Label("avatar", avatarHtml) {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("div");
- }
-
- }.setEscapeModelStrings(false));
-
- WebMarkupContainer contentColumn = new Fragment("content", "sinceChangesRowContentFrag", this);
- contentColumn.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));
- row.add(contentColumn);
-
+ var row = new Fragment(id, "sinceChangesRowFrag", this);
+ row.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));
row.add(AttributeAppender.append("class", "since-changes"));
-
+ row.setOutputMarkupId(true);
return row;
}
@@ -234,8 +172,8 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
Collection<ObjectId> commitIds = new HashSet<>();
for (PullRequestActivity activity: activities) {
- if (activity instanceof PullRequestUpdatedActivity) {
- PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;
+ if (activity instanceof PullRequestUpdateActivity) {
+ PullRequestUpdateActivity updatedActivity = (PullRequestUpdateActivity) activity;
commitIds.addAll(updatedActivity.getUpdate().getCommits()
.stream().map(it->it.copy()).collect(Collectors.toSet()));
}
@@ -261,15 +199,13 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {
Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
- if (newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdatedActivity))
+ if (newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdateActivity))
activitiesView.add(newSinceChangesRow(activitiesView.newChildId(), sinceDate));
}
- var user = SecurityUtils.getAuthUser();
for (PullRequestActivity activity: newActivities) {
Component row = newActivityRow(activitiesView.newChildId(), activity);
- if (user == null || !user.equals(activity.getUser()))
- row.add(AttributeAppender.append("class", "new"));
+ row.add(AttributeAppender.append("class", "new"));
activitiesView.add(row);
}
@@ -380,14 +316,19 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
+ @SuppressWarnings("deprecation")
@Override
public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {
- @SuppressWarnings("deprecation")
- Component prevActivityRow = activitiesView.get(activitiesView.size()-1);
- PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();
+ Component prevActivityRow = null;
+ PullRequestActivity lastActivity = null;
+ if (activitiesView.size() > 0) {
+ prevActivityRow = activitiesView.get(activitiesView.size()-1);
+ lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();
+ }
+
List<PullRequestActivity> newActivities = new ArrayList<>();
for (PullRequestActivity activity: getActivities()) {
- if (activity.getDate().after(lastActivity.getDate()))
+ if (lastActivity == null || activity.getDate().after(lastActivity.getDate()))
newActivities.add(activity);
}
@@ -400,12 +341,18 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
if (sinceChangesRow == null && !newActivities.isEmpty()
- && newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdatedActivity)) {
+ && newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdateActivity)) {
Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
activitiesView.add(sinceChangesRow);
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());
+ String script;
+ if (prevActivityRow != null) {
+ script = String.format("$(\"<li id='%s'></li>\").insertAfter('#%s');",
+ sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());
+ } else {
+ script = String.format("$(\"<tr id='%s'></tr>\").prependTo($('#%s'));",
+ sinceChangesRow.getMarkupId(), container.getMarkupId());
+ }
handler.prependJavaScript(script);
handler.add(sinceChangesRow);
prevActivityRow = sinceChangesRow;
@@ -413,21 +360,25 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
Collection<ObjectId> commitIds = new HashSet<>();
- var user = SecurityUtils.getAuthUser();
for (PullRequestActivity activity: newActivities) {
Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
- if (user == null || !user.equals(activity.getUser()))
- newActivityRow.add(AttributeAppender.append("class", "new"));
+ newActivityRow.add(AttributeAppender.append("class", "new"));
activitiesView.add(newActivityRow);
- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
- newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());
+ String script;
+ if (prevActivityRow != null) {
+ script = String.format("$(\"<li id='%s'></li>\").insertAfter('#%s');",
+ newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());
+ } else {
+ script = String.format("$(\"<tr id='%s'></tr>\").prependTo($('#%s'));",
+ newActivityRow.getMarkupId(), container.getMarkupId());
+ }
handler.prependJavaScript(script);
handler.add(newActivityRow);
- if (activity instanceof PullRequestUpdatedActivity) {
- handler.appendJavaScript("$('tr.since-changes').addClass('visible');");
- PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;
+ if (activity instanceof PullRequestUpdateActivity) {
+ handler.appendJavaScript("$('li.since-changes').addClass('visible');");
+ PullRequestUpdateActivity updatedActivity = (PullRequestUpdateActivity) activity;
commitIds.addAll(updatedActivity.getUpdate().getCommits()
.stream().map(it->it.copy()).collect(Collectors.toSet()));
}
@@ -537,36 +488,6 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
});
-
- fragment.add(new AjaxLink<Void>("showReferences") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (showReferences)
- add(AttributeAppender.append("class", "active"));
- setOutputMarkupId(true);
- }
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- showReferences = !showReferences;
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie = new Cookie(COOKIE_SHOW_REFERENCES, String.valueOf(showReferences));
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(container);
- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));
- }
-
- });
return fragment;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivity.java
index 1fc2ec2bc7..769c79aeba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivity.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivity.java
@@ -3,21 +3,12 @@ package io.onedev.server.web.page.project.pullrequests.detail.activities;
import java.io.Serializable;
import java.util.Date;
-import javax.annotation.Nullable;
-
import org.apache.wicket.Component;
-import io.onedev.server.model.User;
-import io.onedev.server.web.util.DeleteCallback;
-
public interface PullRequestActivity extends Serializable {
Date getDate();
- Component render(String componentId, DeleteCallback deleteCallback);
-
- User getUser();
-
- @Nullable
- String getAnchor();
+ Component render(String componentId);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
index c5b7eda850..552f7a8d82 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
@@ -3,14 +3,11 @@ package io.onedev.server.web.page.project.pullrequests.detail.activities.activit
import java.util.Date;
import org.apache.wicket.Component;
-import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.model.User;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
-import io.onedev.server.web.util.DeleteCallback;
public class PullRequestChangeActivity implements PullRequestActivity {
@@ -21,18 +18,11 @@ public class PullRequestChangeActivity implements PullRequestActivity {
}
@Override
- public Component render(String panelId, DeleteCallback callback) {
- return new PullRequestChangePanel(panelId, new LoadableDetachableModel<PullRequestChange>() {
-
- @Override
- protected PullRequestChange load() {
- return getChange();
- }
-
- });
+ public Component render(String panelId) {
+ return new PullRequestChangePanel(panelId);
}
- private PullRequestChange getChange() {
+ public PullRequestChange getChange() {
return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
}
@@ -41,14 +31,4 @@ public class PullRequestChangeActivity implements PullRequestActivity {
return getChange().getDate();
}
- @Override
- public String getAnchor() {
- return getChange().getAnchor();
- }
-
- @Override
- public User getUser() {
- return getChange().getUser();
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
index f59a7c7671..f9d4f4a77d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
@@ -1,9 +1,11 @@
<wicket:panel>
- <div class="head">
- <span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
- <a wicket:id="changes" class="since-changes ml-2" title="Changes since this action"><wicket:svg href="diff" class="icon"></wicket:svg></a>
- </div>
- <div class="body">
- <div wicket:id="detail" class="detail"></div>
+ <div>
+ <wicket:svg href="history" class="icon text-gray"></wicket:svg>
+ <div class="head">
+ <span wicket:id="avatar" class="mr-1"></span>
+ <span wicket:id="name"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
+ <a wicket:id="changes" class="since-changes ml-2" title="Changes since this action"><wicket:svg href="diff" class="icon"></wicket:svg></a>
+ </div>
+ <div wicket:id="body" class="body mt-3"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
index bb7a3d9580..58648d1181 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
@@ -1,40 +1,34 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;
-class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
+class PullRequestChangePanel extends Panel {
- public PullRequestChangePanel(String id, IModel<PullRequestChange> model) {
- super(id, model);
+ public PullRequestChangePanel(String id) {
+ super(id);
}
@Override
protected void onInitialize() {
super.onInitialize();
- PullRequestChange change = getModelObject();
-
- String activity = change.getData().getActivity();
- if (change.getUser() != null) {
- add(new Label("user", change.getUser().getDisplayName()));
- } else {
- add(new WebMarkupContainer("user").setVisible(false));
- activity = StringUtils.capitalize(activity);
- }
-
- add(new Label("description", activity));
+ PullRequestChange change = getChange();
+
+ add(new UserIdentPanel("avatar", change.getUser(), Mode.AVATAR));
+ add(new Label("name", change.getUser().getDisplayName()));
+ add(new Label("description", change.getData().getActivity()));
add(new Label("age", DateUtils.formatAge(change.getDate()))
.add(new AttributeAppender("title", DateUtils.formatDateTime(change.getDate()))));
@@ -48,16 +42,17 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
}, getChange().getDate()));
ActivityDetail detail = getChange().getData().getActivityDetail();
- if (detail != null) {
- add(detail.render("detail"));
- } else {
- add(new WebMarkupContainer("detail").setVisible(false));
- add(AttributeAppender.append("class", "no-body"));
- }
+ if (detail != null)
+ add(detail.render("body"));
+ else
+ add(new WebMarkupContainer("body").setVisible(false));
+
+ setMarkupId(getChange().getAnchor());
+ setOutputMarkupId(true);
}
private PullRequestChange getChange() {
- return getModelObject();
+ return ((PullRequestChangeActivity) getDefaultModelObject()).getChange();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentActivity.java
new file mode 100644
index 0000000000..41a9bc9930
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentActivity.java
@@ -0,0 +1,35 @@
+package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+
+import java.util.Date;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
+
+public class PullRequestCommentActivity implements PullRequestActivity {
+
+ private final Long commentId;
+
+ public PullRequestCommentActivity(PullRequestComment comment) {
+ commentId = comment.getId();
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new PullRequestCommentPanel(componentId);
+ }
+
+
+ public PullRequestComment getComment() {
+ return OneDev.getInstance(PullRequestCommentManager.class).load(commentId);
+ }
+
+ @Override
+ public Date getDate() {
+ return getComment().getDate();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.html
new file mode 100644
index 0000000000..3d354048b5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.html
@@ -0,0 +1,15 @@
+<wicket:panel>
+ <div class="d-flex">
+ <div class="avatar mr-3">
+ <span wicket:id="avatar"></span>
+ </div>
+ <div class="detail">
+ <div class="head mb-3">
+ <span wicket:id="name"></span> commented <span wicket:id="age"></span>
+ <a wicket:id="changes" title="Changes since this comment" class="since-changes ml-2"><wicket:svg href="diff" class="icon"></wicket:svg></a>
+ <a wicket:id="anchor" class="activity-anchor ml-2"><wicket:svg href="link" class="icon rotate-45"/></a>
+ </div>
+ <div wicket:id="body" class="body"></div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java
similarity index 64%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java
index e383f5c1f3..d0ea6e1d3e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java
@@ -8,9 +8,8 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
import org.jetbrains.annotations.Nullable;
import io.onedev.commons.utils.ExplicitException;
@@ -28,24 +27,24 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.comment.CommentPanel;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;
import io.onedev.server.web.util.DeleteCallback;
-class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
-
- private final DeleteCallback deleteCallback;
+class PullRequestCommentPanel extends Panel {
- public PullRequestCommentedPanel(String id, IModel<PullRequestComment> model, DeleteCallback deleteCallback) {
- super(id, model);
- this.deleteCallback = deleteCallback;
+ public PullRequestCommentPanel(String id) {
+ super(id);
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("user", getComment().getUser().getDisplayName()));
+ add(new UserIdentPanel("avatar", getComment().getUser(), Mode.AVATAR));
+ add(new Label("name", getComment().getUser().getDisplayName()));
add(new Label("age", DateUtils.formatAge(getComment().getDate()))
.add(new AttributeAppender("title", DateUtils.formatDateTime(getComment().getDate()))));
@@ -72,45 +71,46 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
@Override
protected String getComment() {
- return PullRequestCommentedPanel.this.getComment().getContent();
+ return PullRequestCommentPanel.this.getComment().getContent();
}
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
if (comment.length() > PullRequestComment.MAX_CONTENT_LEN)
throw new ExplicitException("Comment too long");
- var entity = PullRequestCommentedPanel.this.getComment();
+ var entity = PullRequestCommentPanel.this.getComment();
entity.setContent(comment);
- OneDev.getInstance(PullRequestCommentManager.class).update(entity);
- notifyPullRequestChange(target);
+ getPullRequestCommentManager().update(entity);
+ var page = (BasePage) getPage();
+ page.notifyObservableChange(target, PullRequest.getChangeObservable(entity.getRequest().getId()));
}
@Override
protected Project getProject() {
- return PullRequestCommentedPanel.this.getComment().getProject();
+ return PullRequestCommentPanel.this.getComment().getProject();
}
@Nullable
@Override
protected String getAutosaveKey() {
- return "pull-request-comment:" + PullRequestCommentedPanel.this.getComment().getId();
+ return "pull-request-comment:" + PullRequestCommentPanel.this.getComment().getId();
}
@Override
protected AttachmentSupport getAttachmentSupport() {
return new ProjectAttachmentSupport(getProject(),
- PullRequestCommentedPanel.this.getComment().getRequest().getUUID(),
+ PullRequestCommentPanel.this.getComment().getRequest().getUUID(),
SecurityUtils.canManagePullRequests(getProject()));
}
@Override
protected List<User> getParticipants() {
- return PullRequestCommentedPanel.this.getComment().getRequest().getParticipants();
+ return PullRequestCommentPanel.this.getComment().getRequest().getParticipants();
}
@Override
protected boolean canManageComment() {
- return SecurityUtils.canModifyOrDelete(PullRequestCommentedPanel.this.getComment());
+ return SecurityUtils.canModifyOrDelete(PullRequestCommentPanel.this.getComment());
}
@Override
@@ -126,35 +126,40 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
@Override
protected DeleteCallback getDeleteCallback() {
return target -> {
- notifyPullRequestChange(target);
- deleteCallback.onDelete(target);
+ var page = (BasePage) getPage();
+ var pullRequest = PullRequestCommentPanel.this.getComment().getRequest();
+ target.appendJavaScript(String.format("$('#%s').remove();", PullRequestCommentPanel.this.getMarkupId()));
+ PullRequestCommentPanel.this.remove();
+ getPullRequestCommentManager().delete(PullRequestCommentPanel.this.getComment());
+ page.notifyObservableChange(target, PullRequest.getChangeObservable(pullRequest.getId()));
};
}
@Override
protected Collection<? extends EntityReaction> getReactions() {
- return PullRequestCommentedPanel.this.getComment().getReactions();
+ return PullRequestCommentPanel.this.getComment().getReactions();
}
@Override
protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
OneDev.getInstance(PullRequestCommentReactionManager.class).toggleEmoji(
SecurityUtils.getUser(),
- PullRequestCommentedPanel.this.getComment(),
+ PullRequestCommentPanel.this.getComment(),
emoji);
}
});
-
+
+ setMarkupId(getComment().getAnchor());
setOutputMarkupId(true);
}
-
- private PullRequestComment getComment() {
- return getModelObject();
+
+ private PullRequestCommentManager getPullRequestCommentManager() {
+ return OneDev.getInstance(PullRequestCommentManager.class);
}
-
- private void notifyPullRequestChange(AjaxRequestTarget target) {
- ((BasePage)getPage()).notifyObservableChange(target,
- PullRequest.getChangeObservable(getComment().getRequest().getId()));
+
+ private PullRequestComment getComment() {
+ return ((PullRequestCommentActivity) getDefaultModelObject()).getComment();
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
deleted file mode 100644
index 4e3ed86c9c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-
-import java.util.Date;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.User;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
-import io.onedev.server.web.util.DeleteCallback;
-
-public class PullRequestCommentedActivity implements PullRequestActivity {
-
- private final Long commentId;
-
- public PullRequestCommentedActivity(PullRequestComment comment) {
- commentId = comment.getId();
- }
-
- @Override
- public Component render(String componentId, DeleteCallback deleteCallback) {
- return new PullRequestCommentedPanel(componentId, new LoadableDetachableModel<PullRequestComment>() {
-
- @Override
- protected PullRequestComment load() {
- return getComment();
- }
-
- }, new DeleteCallback() {
-
- @Override
- public void onDelete(AjaxRequestTarget target) {
- OneDev.getInstance(PullRequestCommentManager.class).delete(getComment());
- deleteCallback.onDelete(target);
- }
- });
- }
-
- public PullRequestComment getComment() {
- return OneDev.getInstance(PullRequestCommentManager.class).load(commentId);
- }
-
- @Override
- public Date getDate() {
- return getComment().getDate();
- }
-
- @Override
- public String getAnchor() {
- return getComment().getAnchor();
- }
-
- @Override
- public User getUser() {
- return getComment().getUser();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.html
deleted file mode 100644
index 7759e42ea1..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<wicket:panel>
- <div class="head">
- <span wicket:id="user" class="user"></span> commented <span wicket:id="age"></span>
- <a wicket:id="changes" title="Changes since this comment" class="since-changes ml-2"><wicket:svg href="diff" class="icon"></wicket:svg></a>
- <a wicket:id="anchor" class="activity-anchor ml-2"><wicket:svg href="link" class="icon rotate-45"/></a>
- </div>
- <div wicket:id="body" class="body"></div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java
deleted file mode 100644
index 3783669288..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-
-import java.util.Date;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
-import io.onedev.server.web.util.DeleteCallback;
-
-public class PullRequestOpenedActivity implements PullRequestActivity {
-
- private final Long requestId;
-
- public PullRequestOpenedActivity(PullRequest request) {
- requestId = request.getId();
- }
-
- @Override
- public Component render(String componentId, DeleteCallback deleteCallback) {
- return new PullRequestOpenedPanel(componentId, new LoadableDetachableModel<PullRequest>() {
-
- @Override
- protected PullRequest load() {
- return getRequest();
- }
-
- });
- }
-
- public PullRequest getRequest() {
- return OneDev.getInstance(PullRequestManager.class).load(requestId);
- }
-
- @Override
- public Date getDate() {
- return getRequest().getSubmitDate();
- }
-
- @Override
- public String getAnchor() {
- return null;
- }
-
- @Override
- public User getUser() {
- return getRequest().getSubmitter();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.html
deleted file mode 100644
index 906b57b671..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<wicket:panel>
- <div class="head">
- <a wicket:id="user" class="user"></a> opened <span wicket:id="age"></span>
- </div>
- <div wicket:id="body" class="body"></div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
deleted file mode 100644
index aca5ff4005..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-import org.jetbrains.annotations.Nullable;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.attachment.AttachmentSupport;
-import io.onedev.server.attachment.ProjectAttachmentSupport;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.entitymanager.PullRequestReactionManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.EntityReaction;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.comment.CommentPanel;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.util.DeleteCallback;
-
-class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
-
- public PullRequestOpenedPanel(String id, IModel<PullRequest> model) {
- super(id, model);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- PullRequest request = getPullRequest();
- add(new Label("user", request.getSubmitter().getDisplayName()));
- add(new Label("age", DateUtils.formatAge(request.getSubmitDate()))
- .add(new AttributeAppender("title", DateUtils.formatDateTime(request.getSubmitDate()))));
-
- add(new CommentPanel("body") {
-
- @Override
- protected String getComment() {
- return getPullRequest().getDescription();
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, String comment) {
- OneDev.getInstance(PullRequestChangeManager.class).changeDescription(getPullRequest(), comment);
- ((BasePage)getPage()).notifyObservableChange(target,
- PullRequest.getChangeObservable(getPullRequest().getId()));
- }
-
- @Nullable
- @Override
- protected String getAutosaveKey() {
- return "pull-request:" + getPullRequest().getId() + ":description";
- }
-
- @Override
- protected Project getProject() {
- return getPullRequest().getTargetProject();
- }
-
- @Override
- protected List<User> getParticipants() {
- return getPullRequest().getParticipants();
- }
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID(),
- SecurityUtils.canManagePullRequests(getProject()));
- }
-
- @Override
- protected boolean canManageComment() {
- return SecurityUtils.canModifyPullRequest(getPullRequest());
- }
-
- @Override
- protected String getRequiredLabel() {
- return null;
- }
-
- @Override
- protected String getEmptyDescription() {
- return "No description";
- }
-
- @Override
- protected ContentVersionSupport getContentVersionSupport() {
- return new ContentVersionSupport() {
-
- @Override
- public long getVersion() {
- return 0;
- }
-
- };
- }
-
- @Override
- protected DeleteCallback getDeleteCallback() {
- return null;
- }
-
- @Override
- protected Collection<? extends EntityReaction> getReactions() {
- return getPullRequest().getReactions();
- }
-
- @Override
- protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
- OneDev.getInstance(PullRequestReactionManager.class).toggleEmoji(
- SecurityUtils.getUser(),
- getPullRequest(),
- emoji);
- }
-
- });
- }
-
- private PullRequest getPullRequest() {
- return getModelObject();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdateActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdateActivity.java
new file mode 100644
index 0000000000..ed3e8d9489
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdateActivity.java
@@ -0,0 +1,34 @@
+package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+
+import java.util.Date;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestUpdateManager;
+import io.onedev.server.model.PullRequestUpdate;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
+
+public class PullRequestUpdateActivity implements PullRequestActivity {
+
+ private final Long updateId;
+
+ public PullRequestUpdateActivity(PullRequestUpdate update) {
+ updateId = update.getId();
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new PullRequestUpdatePanel(componentId);
+ }
+
+ public PullRequestUpdate getUpdate() {
+ return OneDev.getInstance(PullRequestUpdateManager.class).load(updateId);
+ }
+
+ @Override
+ public Date getDate() {
+ return getUpdate().getDate();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.html
new file mode 100644
index 0000000000..028efa595d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.html
@@ -0,0 +1,14 @@
+<wicket:panel>
+ <div wicket:id="tooManyCommits" class="alert alert-notice alert-light-warning"></div>
+ <div wicket:id="commits" class="commit d-flex align-items-start">
+ <wicket:svg href="commit" class="icon flex-shrink-0 text-gray"></wicket:svg>
+ <div class="author flex-shrink-0 mr-2"><span wicket:id="author"></span></div>
+ <div wicket:id="message" class="message mr-2"></div>
+ <div wicket:id="date" class="font-size-sm text-muted d-none d-xxl-block mr-2"></div>
+ <div class="actions flex-shrink-0 ml-auto d-none d-lg-block font-size-sm">
+ <a wicket:id="signature" class="mr-2"></a>
+ <a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a>
+ <a wicket:id="copyHash" class="mr-2"><wicket:svg href="copy" class="icon icon-sm"></wicket:svg></a>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
index d82d5385f5..d148123b2b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatePanel.java
@@ -8,8 +8,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -33,18 +32,16 @@ import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.PersonIdentPanel;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
-class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
+class PullRequestUpdatePanel extends Panel {
- public PullRequestUpdatedPanel(String id, IModel<PullRequestUpdate> model) {
- super(id, model);
+ public PullRequestUpdatePanel(String id) {
+ super(id);
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("age", DateUtils.formatAge(getUpdate().getDate()))
- .add(new AttributeAppender("title", DateUtils.formatDateTime(getUpdate().getDate()))));
String tooManyMessage = "Too many commits, displaying recent " + WebConstants.MAX_DISPLAY_COMMITS;
add(new Label("tooManyCommits", tooManyMessage) {
@@ -130,7 +127,7 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
}
private PullRequestUpdate getUpdate() {
- return getModelObject();
+ return ((PullRequestUpdateActivity) getDefaultModelObject()).getUpdate();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java
deleted file mode 100644
index 0dcd4fcde1..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-
-import java.util.Date;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.model.PullRequestUpdate;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
-import io.onedev.server.web.util.DeleteCallback;
-
-public class PullRequestUpdatedActivity implements PullRequestActivity {
-
- private final Long updateId;
-
- public PullRequestUpdatedActivity(PullRequestUpdate update) {
- updateId = update.getId();
- }
-
- @Override
- public Component render(String componentId, DeleteCallback deleteCallback) {
- return new PullRequestUpdatedPanel(componentId, new LoadableDetachableModel<PullRequestUpdate>() {
-
- @Override
- protected PullRequestUpdate load() {
- return getUpdate();
- }
-
- });
- }
-
- public PullRequestUpdate getUpdate() {
- return OneDev.getInstance(Dao.class).load(PullRequestUpdate.class, updateId);
- }
-
- @Override
- public Date getDate() {
- return getUpdate().getDate();
- }
-
- @Override
- public String getAnchor() {
- return null;
- }
-
- @Override
- public User getUser() {
- return null;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
deleted file mode 100644
index b448a6cf45..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<wicket:panel>
- <div class="head">
- New commits added <span wicket:id="age"></span>
- </div>
- <div class="body border-left">
- <div wicket:id="tooManyCommits" class="alert alert-notice alert-light-warning"></div>
- <div wicket:id="commits" class="commit d-flex align-items-start">
- <wicket:svg href="commit" class="icon flex-shrink-0 mr-2 mt-1 text-gray"></wicket:svg>
- <div class="author flex-shrink-0 mr-2"><span wicket:id="author"></span></div>
- <div wicket:id="message" class="message mr-2"></div>
- <div wicket:id="date" class="font-size-sm text-muted d-none d-xxl-block mr-2"></div>
- <div class="actions flex-shrink-0 ml-auto d-none d-lg-block font-size-sm">
- <a wicket:id="signature" class="mr-2"></a>
- <a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a>
- <a wicket:id="copyHash" class="mr-2"><wicket:svg href="copy" class="icon icon-sm"></wicket:svg></a>
- </div>
- </div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index 2a9ddbbf6a..41bafda3df 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -1,102 +1,39 @@
-.pull-request-detail>.card-body>.main>.activities .activity.new>.avatar {
- border-left-color: var(--primary) !important;
+.pull-request-detail>.card-body>.main>.activities>.activity {
+ border-left: 4px solid white;
+}
+.dark-mode .pull-request-detail>.card-body>.main>.activities>.activity {
+ border-left-color: var(--dark-mode-dark);
}
-.pull-request-detail>.card-body>.main>.activities>table {
- table-layout: fixed;
+.pull-request-detail>.card-body>.main>.activities>.activity.new {
+ border-left-color: var(--primary) !important;
}
-.pull-request-detail>.card-body>.main>.activities .activity>td {
+.pull-request-detail>.card-body>.main>.activities>.activity {
border-top: 1px solid var(--light-gray);
- padding: 1.25rem 0;
- vertical-align: top;
}
-.dark-mode .pull-request-detail>.card-body>.main>.activities .activity>td {
+.dark-mode .pull-request-detail>.card-body>.main>.activities>.activity {
border-top-color: var(--dark-mode-light-dark);
}
-.pull-request-detail>.card-body>.main>.activities .activity:first-child>td {
- border-top: none;
-}
-.pull-request-detail>.card-body>.main>.activities .activity>td.avatar {
- width: 48px;
- border-left: 4px solid white;
- padding-left: 8px;
+.pull-request-detail>.card-body>.main>.activities>.activity:first-child {
+ border-top-width: 2px;
+ border-top-style: dashed;
}
-.dark-mode .pull-request-detail>.card-body>.main>.activities .activity>td.avatar {
- border-left-color: var(--dark-mode-dark);
+.pull-request-detail>.card-body>.main>.activities>.activity>div {
+ padding: 16px 0 16px 8px;
}
-.pull-request-detail>.card-body>.main>.activities .activity>td.avatar .avatar {
+.pull-request-detail>.card-body>.main>.activities>.comment.activity img.avatar {
width: 40px;
height: 40px;
}
-.pull-request-detail>.card-body>.main>.activities .activity>td.avatar .avatar.system-avatar {
- width: 44px;
- height: 44px;
- margin-left: -2px;
- opacity: 75%;
-}
-
-.pull-request-detail>.card-body>.main>.activities .activity>td.content {
- padding-left: 1.25rem;
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased,
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased a,
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased span,
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased:before {
- color: var(--muted);
-}
-.dark-mode .pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased,
-.dark-mode .pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased a,
-.dark-mode .pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased span,
-.dark-mode .pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased:before {
- color: rgb(98, 101, 126);
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit.rebased img {
- opacity: 36%;
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content {
- padding-top: 0;
- padding-bottom: 0;
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit {
- padding: 0.8rem 0;
- margin-left: -9px;
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>svg:first-child {
- background: white;
- opacity: 100%;
- width: 17px !important;
- height: 17px !important;
-}
-.dark-mode .pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>svg:first-child {
- background: var(--dark-mode-dark);
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.head {
+.pull-request-detail>.card-body>.main>.activities>.activity .activity-anchor,
+.pull-request-detail>.card-body>.main>.activities>.activity .since-changes {
display: none;
}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body {
- margin: 0;
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body {
- margin-left: 10px;
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestChangeActivity>td.content>.body>.detail+.comment {
- margin-top: 1rem;
-}
-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity+.PullRequestUpdatedActivity td {
- border-top: none;
-}
-
-.pull-request-detail>.card-body>.main>.activities .activity>td>.body {
- margin-top: 1rem;
-}
-.pull-request-detail>.card-body>.main>.activities .activity>td.no-body {
- vertical-align: middle;
-}
-.pull-request-detail>.card-body>.main>.activities .activity>td.no-body>.body {
- display: none;
+.pull-request-detail>.card-body>.main>.activities>.activity:hover .activity-anchor,
+.pull-request-detail>.card-body>.main>.activities>.activity:hover .since-changes {
+ display: inline;
}
-
-.pull-request-detail>.card-body>.main>.activities .activity.since-changes .avatar div {
+.pull-request-detail>.card-body>.main>.activities>.activity.since-changes span {
border-radius: 20px;
background: var(--primary);
width: 40px;
@@ -105,20 +42,57 @@
align-items: center;
justify-content: center;
}
-.pull-request-detail>.card-body>.main>.activities .activity.since-changes .avatar .icon {
+.pull-request-detail>.card-body>.main>.activities>.activity.since-changes span .icon {
width: 20px;
height: 20px;
- color: white;
+ color: white !important;
}
-.pull-request-detail>.card-body>.main>.activities .activity.since-changes td {
- vertical-align: middle;
+.pull-request-detail>.card-body>.main>.activities>.non-comment+.non-comment {
+ border-top: none !important;
}
-.pull-request-detail>.card-body>.main>.activities>table>tbody>tr .activity-anchor,
-.pull-request-detail>.card-body>.main>.activities>table>tbody>tr .since-changes {
- display: none;
+.pull-request-detail>.card-body>.main>.activities>.activity.non-comment>div {
+ border-left: 1px solid var(--light-gray) !important;
+ margin-left: 4.6rem;
+ position: relative;
+ padding-left: 1.3rem;
+}
+.dark-mode .pull-request-detail>.card-body>.main>.activities>.activity.non-comment>div {
+ border-color: var(--dark-mode-light-dark) !important;
+}
+.pull-request-detail>.card-body>.main>.activities>.activity.non-comment>div>.icon {
+ position: absolute;
+ left: -0.6rem;
+ top: 1.4rem;
+ background: white;
}
-.pull-request-detail>.card-body>.main>.activities>table>tbody>tr:hover .activity-anchor,
-.pull-request-detail>.card-body>.main>.activities>table>tbody>tr:hover .since-changes {
- display: inline;
+.dark-mode .pull-request-detail>.card-body>.main>.activities>.activity.non-comment>div>.icon {
+ background: var(--dark-mode-dark);
+}
+
+.pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased,
+.pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased a,
+.pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased span,
+.pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased:before {
+ color: var(--muted);
+}
+.dark-mode .pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased,
+.dark-mode .pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased a,
+.dark-mode .pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased span,
+.dark-mode .pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased:before {
+ color: rgb(98, 101, 126);
+}
+.pull-request-detail>.card-body>.main>.activities>.activity>.commit.rebased img {
+ opacity: 36%;
+}
+.pull-request-detail>.card-body>.main>.activities>.activity.since-changes {
+ padding: 16px 0 16px 8px;
+}
+.pull-request-detail>.card-body>.main>.activities>.activity.since-changes .icon {
+ width: 1.2rem;
+ height: 1.2rem;
}
+.pull-request-detail>.card-body>.main>.activities>.activity>.commit+.commit,
+.pull-request-detail>.card-body>.main>.activities>.PullRequestUpdateActivity+.PullRequestUpdateActivity.activity>.commit {
+ margin-top: -16px;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 1b0746c9c5..3e62f1f2d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -4,8 +4,13 @@
.pull-request-detail>.card-body>.main>.status-bar>.status {
font-size: 1rem;
}
+.pull-request-detail>.card-body>.main>.description {
+ border-bottom: none !important;
+ margin-bottom: 0 !important;
+ border-radius: 0.42rem 0.42rem 0 0 !important;
+}
.pull-request-detail>.card-body>.main>.summary {
- padding: 1.2rem 1.5rem;
+ border-radius: 0 0 0.42rem 0.42rem !important;
}
.pull-request-detail>.card-body>.main>.summary>div {
margin-bottom: 1rem;
@@ -68,9 +73,9 @@ ul>li>a.code-comments.new .icon {
}
@media(min-width: 992px) {
- .pull-request-detail>.card-body>.main>.summary .more-info,
- .pull-request-detail>.card-body>.main>.summary .more-info:hover,
- .pull-request-detail>.card-body>.main>.summary .more-info:focus {
+ html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.summary .more-info,
+ html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.summary .more-info:hover,
+ html:not(.PullRequestChangesPage) .pull-request-detail>.card-body>.main>.summary .more-info:focus {
color: inherit !important;
cursor: inherit !important;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
index 84ac8d35d9..ca39ab84b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
@@ -1,17 +1,9 @@
package io.onedev.server.web.page.simple.error;
-import com.google.common.base.Throwables;
-import io.onedev.server.OneDev;
-import io.onedev.server.exception.ServerNotFoundException;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.exception.ExceptionUtils;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.MultilineLabel;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.page.HomePage;
-import io.onedev.server.web.page.simple.SimplePage;
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+
+import java.io.Serializable;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -26,9 +18,19 @@ import org.eclipse.jetty.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.Serializable;
+import com.google.common.base.Throwables;
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.exception.ExceptionUtils;
+import io.onedev.server.exception.ServerNotFoundException;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.component.MultilineLabel;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.page.HomePage;
+import io.onedev.server.web.page.simple.SimplePage;
public class GeneralErrorPage extends SimplePage {
@@ -46,7 +48,7 @@ public class GeneralErrorPage extends SimplePage {
public GeneralErrorPage(Exception exception) {
super(new PageParameters());
-
+
serverNotFound = ExceptionUtils.find(exception, ServerNotFoundException.class) != null;
var response = ExceptionUtils.buildResponse(exception);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index f45898c60f..3e45c0e8db 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,9 +1,10 @@
package io.onedev.server.web.page.test;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
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.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -17,10 +18,10 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Link<Void>("test") {
+ add(new AjaxLink<Void>("test") {
@Override
- public void onClick() {
+ public void onClick(AjaxRequestTarget target) {
}
});
diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java
index b9097a7297..42f1777c04 100644
--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java
@@ -1,10 +1,62 @@
package io.onedev.server.xodus;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.lang3.SerializationUtils;
+import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Sets;
+
import io.onedev.commons.loader.ManagedSerializedForm;
-import io.onedev.commons.utils.*;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.TarUtils;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterManager;
@@ -13,7 +65,6 @@ import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.entityreference.ReferenceChangeManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.entity.EntityRemoved;
@@ -24,12 +75,23 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.git.GitContribution;
import io.onedev.server.git.GitContributor;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.command.*;
+import io.onedev.server.git.command.FileChange;
+import io.onedev.server.git.command.ListFileChangesCommand;
+import io.onedev.server.git.command.ListFilesCommand;
+import io.onedev.server.git.command.ListNumStatsCommand;
+import io.onedev.server.git.command.LogCommand;
+import io.onedev.server.git.command.LogCommit;
+import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.git.command.RevListCommand.Order;
+import io.onedev.server.git.command.RevListOptions;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.util.*;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.ElementPumper;
+import io.onedev.server.util.NameAndEmail;
+import io.onedev.server.util.Pair;
+import io.onedev.server.util.ProgrammingLanguageDetector;
import io.onedev.server.util.concurrent.BatchWorkManager;
import io.onedev.server.util.concurrent.BatchWorker;
import io.onedev.server.util.concurrent.Prioritized;
@@ -42,34 +104,6 @@ import jetbrains.exodus.env.Environment;
import jetbrains.exodus.env.Store;
import jetbrains.exodus.env.Transaction;
import jetbrains.exodus.env.TransactionalComputable;
-import org.apache.commons.lang3.SerializationUtils;
-import org.eclipse.jgit.errors.MissingObjectException;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevObject;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
@Singleton
public class DefaultCommitInfoManager extends AbstractEnvironmentManager
@@ -155,8 +189,6 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager
private final IssueManager issueManager;
- private final ReferenceChangeManager entityReferenceManager;
-
private final ListenerRegistry listenerRegistry;
private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();
@@ -172,7 +204,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager
BatchWorkManager batchWorkManager, SessionManager sessionManager,
EmailAddressManager emailAddressManager, UserManager userManager,
ClusterManager clusterManager, ListenerRegistry listenerRegistry,
- IssueManager issueManager, ReferenceChangeManager entityReferenceManager) {
+ IssueManager issueManager) {
this.projectManager = projectManager;
this.batchWorkManager = batchWorkManager;
this.sessionManager = sessionManager;
@@ -181,7 +213,6 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager
this.clusterManager = clusterManager;
this.listenerRegistry = listenerRegistry;
this.issueManager = issueManager;
- this.entityReferenceManager = entityReferenceManager;
}
private boolean isCommitCollected(byte[] commitBytes) {
@@ -335,9 +366,6 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager
listenerRegistry.post(new IssueCommitsAttached(issueManager.load(issueId)));
}
- entityReferenceManager.addReferenceChange(
- new ProjectScopedCommit(project, project.getRevCommit(currentCommitId, true)));
-
if (currentCommit.getCommitter() != null)
users.add(new NameAndEmail(currentCommit.getCommitter()));