Skip to content

The Unified and Autonomous Development Platform

feat: issue and pull request comment should work even without websocket (#1426)

Robin Shenfe20331debfe
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
index d12ed6cbf4..a23074263e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
@@ -1,21 +1,6 @@
package io.onedev.server.entitymanager.impl;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-
import com.google.common.base.Preconditions;
-import org.hibernate.Hibernate;
-import org.hibernate.query.Query;
-
import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.model.Issue;
@@ -25,6 +10,15 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
+import org.hibernate.Hibernate;
+import org.hibernate.query.Query;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import java.util.*;
@Singleton
public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implements IssueLinkManager {
@@ -42,9 +36,12 @@ public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implem
public void syncLinks(LinkSpec spec, Issue issue, Collection<Issue> linkedIssues, boolean opposite) {
if (spec.getOpposite() != null) {
Collection<IssueLink> links = opposite?issue.getSourceLinks():issue.getTargetLinks();
- for (IssueLink link: links) {
- if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue)))
+ for (var it = links.iterator(); it.hasNext();) {
+ var link = it.next();
+ if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue))) {
delete(link);
+ it.remove();
+ }
}
for (Issue linkedIssue: linkedIssues) {
boolean found = false;
@@ -65,12 +62,16 @@ public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implem
link.setTarget(linkedIssue);
}
create(link);
+ links.add(link);
}
}
} else {
- for (IssueLink link: issue.getLinks()) {
- if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue)))
+ for (var link: issue.getLinks()) {
+ if (link.getSpec().equals(spec) && !linkedIssues.contains(link.getLinked(issue))) {
delete(link);
+ issue.getSourceLinks().remove(link);
+ issue.getTargetLinks().remove(link);
+ }
}
for (Issue linkedIssue: linkedIssues) {
boolean found = false;
@@ -86,6 +87,7 @@ public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implem
link.setSource(issue);
link.setTarget(linkedIssue);
create(link);
+ issue.getTargetLinks().add(link);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/event/Event.java b/server-core/src/main/java/io/onedev/server/event/Event.java
new file mode 100644
index 0000000000..7f110fbb52
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/Event.java
@@ -0,0 +1,22 @@
+package io.onedev.server.event;
+
+import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.web.websocket.PageKey;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+
+public abstract class Event {
+
+ private final PageKey sourcePage;
+
+ public Event() {
+ sourcePage = WicketUtils.getPageKey();
+ }
+
+ @Nullable
+ public PageKey getSourcePage() {
+ return sourcePage;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/agent/AgentConnected.java b/server-core/src/main/java/io/onedev/server/event/agent/AgentConnected.java
index eb852bd25b..58d28d9ab9 100644
--- a/server-core/src/main/java/io/onedev/server/event/agent/AgentConnected.java
+++ b/server-core/src/main/java/io/onedev/server/event/agent/AgentConnected.java
@@ -3,7 +3,7 @@ package io.onedev.server.event.agent;
import io.onedev.server.model.Agent;
public class AgentConnected extends AgentEvent {
-
+
public AgentConnected(Agent agent) {
super(agent);
}
diff --git a/server-core/src/main/java/io/onedev/server/event/agent/AgentEvent.java b/server-core/src/main/java/io/onedev/server/event/agent/AgentEvent.java
index 2ddbea9aa9..0104712168 100644
--- a/server-core/src/main/java/io/onedev/server/event/agent/AgentEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/agent/AgentEvent.java
@@ -1,17 +1,20 @@
package io.onedev.server.event.agent;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.event.Event;
import io.onedev.server.model.Agent;
-public abstract class AgentEvent {
+public abstract class AgentEvent extends Event {
- private final Agent agent;
+ private final Long agentId;
public AgentEvent(Agent agent) {
- this.agent = agent;
+ agentId = agent.getId();
}
public Agent getAgent() {
- return agent;
+ return OneDev.getInstance(AgentManager.class).load(agentId);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/event/cluster/ConnectionEvent.java b/server-core/src/main/java/io/onedev/server/event/cluster/ConnectionEvent.java
index c2d776bbd4..3b40946e4e 100644
--- a/server-core/src/main/java/io/onedev/server/event/cluster/ConnectionEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/cluster/ConnectionEvent.java
@@ -1,6 +1,8 @@
package io.onedev.server.event.cluster;
-public abstract class ConnectionEvent {
+import io.onedev.server.event.Event;
+
+public abstract class ConnectionEvent extends Event {
private final String server;
diff --git a/server-core/src/main/java/io/onedev/server/event/cluster/ConnectionRestored.java b/server-core/src/main/java/io/onedev/server/event/cluster/ConnectionRestored.java
index 827eecc7c2..a29a6adab2 100644
--- a/server-core/src/main/java/io/onedev/server/event/cluster/ConnectionRestored.java
+++ b/server-core/src/main/java/io/onedev/server/event/cluster/ConnectionRestored.java
@@ -1,7 +1,7 @@
package io.onedev.server.event.cluster;
public class ConnectionRestored extends ConnectionEvent {
-
+
public ConnectionRestored(String server) {
super(server);
}
diff --git a/server-core/src/main/java/io/onedev/server/event/entity/EntityEvent.java b/server-core/src/main/java/io/onedev/server/event/entity/EntityEvent.java
index 6c9e36dc10..6a1840ac23 100644
--- a/server-core/src/main/java/io/onedev/server/event/entity/EntityEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/entity/EntityEvent.java
@@ -1,8 +1,9 @@
package io.onedev.server.event.entity;
+import io.onedev.server.event.Event;
import io.onedev.server.model.AbstractEntity;
-public abstract class EntityEvent {
+public abstract class EntityEvent extends Event {
private final AbstractEntity entity;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/ActiveServerChanged.java b/server-core/src/main/java/io/onedev/server/event/project/ActiveServerChanged.java
index 1aaa3373d2..09cfda27a0 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/ActiveServerChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/ActiveServerChanged.java
@@ -5,6 +5,8 @@ import java.util.Collection;
public class ActiveServerChanged implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private final String activeServer;
private final Collection<Long> projectIds;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/CommitIndexed.java b/server-core/src/main/java/io/onedev/server/event/project/CommitIndexed.java
index e177acd0a5..ee677f61f9 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/CommitIndexed.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/CommitIndexed.java
@@ -21,7 +21,7 @@ public class CommitIndexed extends ProjectEvent {
return commitId;
}
- public static String getWebSocketObservable(String commitId) {
+ public static String getChangeObservable(String commitId) {
return CommitIndexed.class.getName() + ":" + commitId;
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/ProjectCreated.java b/server-core/src/main/java/io/onedev/server/event/project/ProjectCreated.java
index 72f2548603..087e8fbe4c 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/ProjectCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/ProjectCreated.java
@@ -7,8 +7,6 @@ import io.onedev.server.security.SecurityUtils;
public class ProjectCreated extends ProjectEvent {
- private static final long serialVersionUID = 1L;
-
public ProjectCreated(Project project) {
super(SecurityUtils.getUser(), new Date(), project);
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
index be9d355673..e8fa0fb4a8 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
@@ -1,25 +1,25 @@
package io.onedev.server.event.project;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.Event;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.commenttext.CommentText;
-public abstract class ProjectEvent implements Serializable {
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Optional;
- private static final long serialVersionUID = 1L;
+public abstract class ProjectEvent extends Event implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private final Long projectId;
private final Long userId;
diff --git a/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java
index 25460e2c84..4a2b5105b6 100644
--- a/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java
@@ -124,7 +124,7 @@ public class DefaultLogManager implements LogManager, Serializable {
throw new RuntimeException(e);
}
}
- webSocketManager.notifyObservableChange(Build.getLogWebSocketObservable(buildId));
+ webSocketManager.notifyObservableChange(Build.getLogChangeObservable(buildId), null);
}
}
return null;
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index ab95194788..0d367721c4 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -855,14 +855,29 @@ public class Build extends ProjectBelonging
return branches;
}
- public static String getLogWebSocketObservable(Long buildId) {
+ public static String getLogChangeObservable(Long buildId) {
return "build-log:" + buildId;
}
- public static String getWebSocketObservable(Long buildId) {
+ public static String getDetailChangeObservable(Long buildId) {
return Build.class.getName() + ":" + buildId;
}
+ public static String getCommitStatusChangeObservable(Long projectId, String commitHash) {
+ return "commit-status:" + projectId + ":" + commitHash;
+ }
+
+ public static String getJobStatusChangeObservable(Long projectId, String commitHash, String jobName) {
+ return "job-status:" + projectId + ":" + commitHash + ":" + jobName;
+ }
+
+ public Collection<String> getChangeObservables() {
+ return Sets.newHashSet(
+ getDetailChangeObservable(getId()),
+ getCommitStatusChangeObservable(getProject().getId(), getCommitHash()),
+ getJobStatusChangeObservable(getProject().getId(), getCommitHash(), getJobName()));
+ }
+
public static void push(@Nullable Build build) {
stack.get().push(build);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index 803afe3146..a6f4e76f76 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -279,7 +279,7 @@ public class CodeComment extends ProjectBelonging implements AttachmentStorageSu
return gitService.hasObjects(project, objIds.toArray(new ObjectId[0]));
}
- public static String getWebSocketObservable(Long commentId) {
+ public static String getChangeObservable(Long commentId) {
return CodeComment.class.getName() + ":" + commentId;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 14bcba2868..a385e9078d 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -302,8 +302,6 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment
private transient Collection<User> authorizedUsers;
- private transient List<IssueLink> links;
-
public String getState() {
return state;
}
@@ -545,11 +543,9 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment
}
public Collection<IssueLink> getLinks() {
- if (links == null) {
- links = new ArrayList<>();
- links.addAll(sourceLinks);
- links.addAll(targetLinks);
- }
+ var links = new ArrayList<IssueLink>();
+ links.addAll(sourceLinks);
+ links.addAll(targetLinks);
return links;
}
@@ -613,13 +609,20 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment
return fieldInputs;
}
- public static String getWebSocketObservable(Long issueId) {
+ public static String getDetailChangeObservable(Long issueId) {
return Issue.class.getName() + ":" + issueId;
}
- public static String getListWebSocketObservable(Long projectId) {
+ public static String getListChangeObservable(Long projectId) {
return Issue.class.getName() + ":list:" + projectId;
}
+
+ public Collection<String> getChangeObservables(boolean withList) {
+ Collection<String> observables = Sets.newHashSet(getDetailChangeObservable(getId()));
+ if (withList)
+ observables.addAll(getProject().getIssueListObservables());
+ return observables;
+ }
@Override
public IssueFacade getFacade() {
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index a7397a6d26..4783743f6e 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -1682,5 +1682,15 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
}
return builds;
}
-
+
+ public Collection<String> getIssueListObservables() {
+ Collection<String> observables = new HashSet<>();
+ var current = this;
+ do {
+ observables.add(Issue.getListChangeObservable(current.getId()));
+ current = current.getParent();
+ } while (current != null);
+
+ return observables;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 0f33c3a203..73ca66caf9 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -838,14 +838,10 @@ public class PullRequest extends ProjectBelonging
return OneDev.getInstance(GitService.class);
}
- public static String getWebSocketObservable(Long requestId) {
+ public static String getChangeObservable(Long requestId) {
return PullRequest.class.getName() + ":" + requestId;
}
-
- public static String getClosedWebSocketObservable(Long requestId) {
- return PullRequest.class.getName() + ":" + requestId + ":closed";
- }
-
+
public Collection<Long> getFixedIssueIds() {
if (fixedIssueIds == null) {
fixedIssueIds = new HashSet<>();
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java
index 0d6e45cd41..85c7a9e4cb 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java
@@ -54,7 +54,7 @@ public class StateTransitionTrigger extends TransitionTrigger {
@Override
public String getDescription() {
- return "state of an issue is transited to " + states;
+ return "state of other issue is transited to " + states;
}
}
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 f0446029cc..5fab696837 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
@@ -2727,7 +2727,7 @@ h6, .h6 {
background-color: #fff;
}
.badge-light {
- color: var(dark);
+ color: var(--dark);
background-color: var(--light);
}
.dark-mode .badge-light {
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/target.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/target.svg
index bd6ce7006e..1003b9d379 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/target.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/target.svg
@@ -1,57 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- class="icon"
- width="200px"
- height="200.00px"
- viewBox="0 0 1024 1024"
- version="1.1"
- id="svg12"
- sodipodi:docname="icon01.svg"
- inkscape:version="1.0 (4035a4f, 2020-05-01)">
- <metadata
- id="metadata18">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs16" />
- <sodipodi:namedview
- inkscape:document-rotation="0"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="971"
- id="namedview14"
- showgrid="false"
- inkscape:zoom="3.97"
- inkscape:cx="100"
- inkscape:cy="100"
- inkscape:window-x="0"
- inkscape:window-y="23"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg12" />
- <path
- d="m 516.51385,133.37172 c 211.8048,0 383.3571,172.03324 383.3571,384.4318 0,212.39859 -171.5523,384.43182 -383.3571,384.43182 -211.80478,0 -383.35707,-172.03323 -383.35707,-384.43182 0,-212.39856 171.55229,-384.4318 383.35707,-384.4318 m 0,-76.886364 c -253.97406,0 -460.028495,206.632094 -460.028495,461.318164 0,254.68608 206.054435,461.31818 460.028495,461.31818 253.97408,0 460.0285,-206.6321 460.0285,-461.31818 0,-254.68607 -206.05442,-461.318164 -460.0285,-461.318164 z m 0,307.545464 c 84.33856,0 153.34283,69.19771 153.34283,153.7727 0,84.57501 -69.00427,153.77273 -153.34283,153.77273 -84.33856,0 -153.34283,-69.19772 -153.34283,-153.77273 0,-84.57499 69.00427,-153.7727 153.34283,-153.7727 z"
- stroke="currentColor"
- stroke-width="23.9934"
- id="path10" />
-</svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686815400180" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13290" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M511.715374 956.115742c-59.949604 0-117.960515-11.762074-172.773581-34.946452-52.874372-22.384916-100.26244-54.363368-141.034966-95.125901s-72.740985-88.160595-95.125902-141.034967c-23.174384-54.703139-34.946452-112.823976-34.946452-172.77358 0-59.949604 11.762074-117.960515 34.946452-172.773581 22.384916-52.874372 54.353375-100.26244 95.125902-141.034966 40.762533-40.772526 88.150602-72.740985 141.034966-95.125902C393.644933 80.126009 451.765769 68.353941 511.715374 68.353941s117.970508 11.762074 172.77358 34.946452c52.874372 22.384916 100.26244 54.353375 141.034967 95.125902 40.762533 40.762533 72.740985 88.150602 95.125901 141.034966 23.174384 54.703139 34.946452 112.823976 34.946452 172.773581 0 59.949604-11.762074 117.970508-34.946452 172.77358-22.384916 52.874372-54.363368 100.26244-95.125901 141.034967-40.762533 40.762533-88.160595 72.740985-141.034967 95.125901-54.813065 23.294304-112.823976 34.946452-172.77358 34.946452z m0-814.4512c-99.003289 0-192.070577 38.603988-262.083401 108.606818-70.00283 70.00283-108.596824 163.070119-108.596825 262.073408 0 99.013282 38.593994 192.080571 108.596825 262.083401C319.634803 844.430999 412.702092 883.024993 511.715374 883.024993c99.003289 0 192.080571-38.593994 262.073407-108.596824 70.00283-70.00283 108.606818-163.070119 108.606818-262.083401 0-99.003289-38.593994-192.080571-108.606818-262.073408-70.00283-70.122749-163.070119-108.606818-262.073407-108.606818z m0 0" p-id="13291"></path><path d="M511.715374 715.677756c-112.134441 0-203.382955-91.238521-203.382955-203.382955 0-112.134441 91.248514-203.263036 203.382955-203.263035 112.134441 0 203.382955 91.128595 203.382955 203.263035 0 112.144434-91.248514 203.382955-203.382955 203.382955z m0-333.565234c-71.831598 0-130.302199 58.470601-130.302199 130.302199s58.470601 130.302199 130.302199 130.302198 130.302199-58.470601 130.302198-130.302198c0-71.951517-58.470601-130.302199-130.302198-130.302199z m-1.149226-153.256731c20.216378 0 36.545375-16.328997 36.545375-36.545375V37.015058c0-20.216378-16.328997-36.545375-36.545375-36.545374s-36.545375 16.328997-36.545375 36.545374v155.305351c0 20.206384 16.33899 36.535381 36.545375 36.535382z m1.149226 566.758102c-20.216378 0-36.545375 16.328997-36.545375 36.545375v155.305351c0 20.216378 16.328997 36.535381 36.545375 36.535381s36.535381-16.328997 36.535381-36.535381V832.159268c0-20.216378-16.328997-36.545375-36.535381-36.545375z m0 0M228.396282 512.804458c0-20.216378-16.328997-36.545375-36.545375-36.545375H36.545557c-20.216378 0-36.545375 16.328997-36.545375 36.545375s16.328997 36.535381 36.545375 36.535381h155.30535c20.096458 0.009993 36.545375-16.319004 36.545375-36.535381z m566.638183-1.139232c0 20.216378 16.328997 36.535381 36.535382 36.535381h155.305351c20.216378 0 36.545375-16.328997 36.545374-36.535381 0-20.216378-16.328997-36.545375-36.545374-36.545375H831.569847c-20.096458 0-36.535381 16.448916-36.535382 36.545375z m0 0" p-id="13292"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/WebSocketObserver.java b/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/web/behavior/WebSocketObserver.java
rename to server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
index b2e61773e2..e5a902df03 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/WebSocketObserver.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
@@ -6,8 +6,10 @@ import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-public abstract class WebSocketObserver extends Behavior {
-
+public abstract class ChangeObserver extends Behavior {
+
+ private static final long serialVersionUID = 1L;
+
protected Component component;
@Override
@@ -16,8 +18,6 @@ public abstract class WebSocketObserver extends Behavior {
this.component = component;
}
- private static final long serialVersionUID = 1L;
-
public abstract Collection<String> getObservables();
public abstract void onObservableChanged(IPartialPageRequestHandler handler);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index e94dd4110f..77f6ef3a1e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -29,7 +29,7 @@ import io.onedev.server.util.criteria.OrCriteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.BuildQueryBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.build.ParamValuesLabel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.datatable.DefaultDataTable;
@@ -1310,8 +1310,8 @@ public abstract class BuildListPanel extends Panel {
return getGlobalBuildSetting().getListParams();
}
- private WebSocketObserver newBuildObserver(Long buildId) {
- return new WebSocketObserver() {
+ private ChangeObserver newBuildObserver(Long buildId) {
+ return new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -1320,7 +1320,7 @@ public abstract class BuildListPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(Build.getWebSocketObservable(buildId));
+ return Sets.newHashSet(Build.getDetailChangeObservable(buildId));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
index 8c18a3ca73..c8f249c943 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
@@ -27,7 +27,7 @@ import io.onedev.server.model.Build.Status;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
@SuppressWarnings("serial")
public class BuildLogPanel extends GenericPanel<Build> {
@@ -46,7 +46,7 @@ public class BuildLogPanel extends GenericPanel<Build> {
protected void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
private void appendRecentLogEntries(IPartialPageRequestHandler handler) {
List<JobLogEntryEx> logEntries = getLogManager().readLogEntries(getBuild(), nextOffset, 0);
@@ -67,12 +67,12 @@ public class BuildLogPanel extends GenericPanel<Build> {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(Build.getLogWebSocketObservable(getBuild().getId()));
+ return Sets.newHashSet(Build.getLogChangeObservable(getBuild().getId()));
}
});
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -83,7 +83,7 @@ public class BuildLogPanel extends GenericPanel<Build> {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(Build.getWebSocketObservable(getBuild().getId()));
+ return Sets.newHashSet(Build.getDetailChangeObservable(getBuild().getId()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 9fae336da8..9452cc40c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -43,7 +43,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.asset.emoji.Emojis;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.build.ParamValuesLabel;
import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;
import io.onedev.server.web.component.entity.reference.ReferencePanel;
@@ -323,7 +323,7 @@ public abstract class BuildSidePanel extends Panel {
});
- general.add(new WebSocketObserver() {
+ general.add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -332,7 +332,7 @@ public abstract class BuildSidePanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(Build.getWebSocketObservable(getBuild().getId()));
+ return Sets.newHashSet(Build.getDetailChangeObservable(getBuild().getId()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
index 363b702989..4fb363d02a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
@@ -16,7 +16,7 @@ import com.google.common.collect.Sets;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.svg.SpriteImage;
@SuppressWarnings("serial")
@@ -49,7 +49,7 @@ public class BuildStatusIcon extends SpriteImage {
}));
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -58,7 +58,7 @@ public class BuildStatusIcon extends SpriteImage {
@Override
public Collection<String> getObservables() {
- return getWebSocketObservables();
+ return getChangeObservables();
}
});
@@ -72,7 +72,7 @@ public class BuildStatusIcon extends SpriteImage {
super.onDetach();
}
- protected Collection<String> getWebSocketObservables() {
+ protected Collection<String> getChangeObservables() {
return Sets.newHashSet();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
index 95166046f0..98bc9d015e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
@@ -22,6 +22,9 @@
<a wicket:id="orderBy" class="order-by text-gray d-inline-block mb-2 mr-4">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
+ <a wicket:id="unresolved" class="order-by text-gray d-inline-block mb-2 mr-4">
+ <wicket:svg href="target" class="icon"></wicket:svg> Unresolved
+ </a>
</div>
<div wicket:id="body" class="body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 5b5c752d48..2d0be9ef55 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -9,6 +9,9 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
+import io.onedev.server.search.entity.codecomment.UnresolvedCriteria;
+import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -16,6 +19,7 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -619,6 +623,20 @@ public abstract class CodeCommentListPanel extends Panel {
});
+ add(new AjaxLink<Void>("unresolved") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ CodeCommentListPanel.this.getFeedbackMessages().clear();
+ var criteria = new UnresolvedCriteria();
+ queryModel.setObject(new CodeCommentQuery(criteria));
+ queryStringModel.setObject(criteria.toString());
+ target.add(queryInput);
+ doQuery(target);
+ }
+
+ }.setVisible(getPage() instanceof PullRequestCodeCommentsPage));
+
queryInput = new TextField<String>("input", queryStringModel);
queryInput.add(new CodeCommentQueryBehavior(new AbstractReadOnlyModel<Project>() {
@@ -755,17 +773,39 @@ public abstract class CodeCommentListPanel extends Panel {
public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
CodeComment comment = rowModel.getObject();
Fragment fragment = new Fragment(componentId, "contentFrag", CodeCommentListPanel.this);
- String statusLabel;
- if (comment.isResolved()) {
- statusLabel = String.format(
- "<span title='Resolved'><svg class='icon text-success mr-1'><use xlink:href='%s'/></svg></span>",
- SpriteImage.getVersionedHref("tick-circle-o"));
- } else {
- statusLabel = String.format(
- "<span title='Unresolved'><svg class='icon text-warning mr-1'><use xlink:href='%s'/></svg></span>",
- SpriteImage.getVersionedHref("dot"));
- }
- fragment.add(new Label("status", statusLabel).setEscapeModelStrings(false));
+ var commentId = comment.getId();
+ fragment.add(new Label("status", new LoadableDetachableModel<String>() {
+ @Override
+ protected String load() {
+ if (rowModel.getObject().isResolved()) {
+ return String.format(
+ "<span title='Resolved'><svg class='icon text-success mr-1'><use xlink:href='%s'/></svg></span>",
+ SpriteImage.getVersionedHref("tick-circle-o"));
+ } else {
+ return String.format(
+ "<span title='Unresolved'><svg class='icon text-warning mr-1'><use xlink:href='%s'/></svg></span>",
+ SpriteImage.getVersionedHref("dot"));
+ }
+ }
+ }) {
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ChangeObserver() {
+ @Override
+ public Collection<String> getObservables() {
+ return Sets.newHashSet(CodeComment.getChangeObservable(commentId));
+ }
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ handler.add(component);
+ }
+ });
+ setOutputMarkupId(true);
+ setEscapeModelStrings(false);
+ }
+ });
WebMarkupContainer link;
if (!comment.isValid()) {
@@ -811,8 +851,27 @@ public abstract class CodeCommentListPanel extends Panel {
protected Item<CodeComment> newRowItem(String id, int index, IModel<CodeComment> model) {
Item<CodeComment> item = super.newRowItem(id, index, model);
CodeComment comment = model.getObject();
- item.add(AttributeAppender.append("class",
- comment.isVisitedAfter(comment.getLastActivity().getDate())?"comment":"comment new"));
+ item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+ @Override
+ protected String load() {
+ var comment = item.getModelObject();
+ return comment.isVisitedAfter(comment.getLastActivity().getDate()) ? "comment" : "comment new";
+ }
+ }));
+
+ var commentId = comment.getId();
+ item.add(new ChangeObserver() {
+ @Override
+ public Collection<String> getObservables() {
+ return Sets.newHashSet(CodeComment.getChangeObservable(commentId));
+ }
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ handler.add(component);
+ }
+ });
+ item.setOutputMarkupId(true);
return item;
}
});
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 54086af21b..ec9bf41a71 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
@@ -10,6 +10,7 @@ import javax.annotation.Nullable;
import io.onedev.server.web.component.markdown.ContentQuoted;
import io.onedev.server.web.component.markdown.MarkdownEditor;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -35,6 +36,9 @@ import org.apache.wicket.markup.repeater.RepeatingView;
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 com.google.common.collect.Sets;
@@ -60,7 +64,7 @@ import io.onedev.server.util.UrlUtils;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.markdown.MarkdownViewer;
import io.onedev.server.web.component.markdown.SuggestionSupport;
import io.onedev.server.web.component.comment.CommentInput;
@@ -107,7 +111,11 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected String load() {
- return getComment().isVisitedAfter(getComment().getCreateDate())?"": "new";
+ var comment = getComment();
+ if (!comment.getUser().equals(SecurityUtils.getUser()) && !comment.isVisitedAfter(getComment().getCreateDate()))
+ return "new";
+ else
+ return "";
}
}));
@@ -418,7 +426,7 @@ public abstract class CodeCommentPanel extends Panel {
add(activitiesView);
add(newActionsContainer());
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
@SuppressWarnings("deprecation")
@@ -440,9 +448,11 @@ public abstract class CodeCommentPanel extends Panel {
}
}
+ var user = SecurityUtils.getUser();
for (CodeCommentActivity activity: newActivities) {
- Component newActivityContainer = activity.render(activitiesView.newChildId());
- newActivityContainer.add(AttributeAppender.append("class", "new"));
+ Component newActivityContainer = activity.render(activitiesView.newChildId());
+ if (user == null || !user.equals(activity.getUser()))
+ newActivityContainer.add(AttributeAppender.append("class", "new"));
activitiesView.add(newActivityContainer);
String script;
@@ -457,27 +467,61 @@ public abstract class CodeCommentPanel extends Panel {
handler.add(newActivityContainer);
prevActivityContainer = newActivityContainer;
}
-
- OneDev.getInstance(VisitInfoManager.class).visitCodeComment(SecurityUtils.getUser(), getComment());
}
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(CodeComment.getWebSocketObservable(commentId));
+ return Sets.newHashSet(CodeComment.getChangeObservable(commentId));
}
});
+
+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {
+
+ @Override
+ public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {
+ }
+
+ @Override
+ public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {
+ }
+
+ @Override
+ public IRequestHandler onException(RequestCycle cycle, Exception ex) {
+ return null;
+ }
+
+ @Override
+ public void onEndRequest(RequestCycle cycle) {
+ if (SecurityUtils.getUser() != null)
+ OneDev.getInstance(VisitInfoManager.class).visitCodeComment(SecurityUtils.getUser(), getComment());
+ }
+
+ @Override
+ public void onDetach(RequestCycle cycle) {
+ }
+
+ @Override
+ public void onBeginRequest(RequestCycle cycle) {
+ }
+
+ });
setOutputMarkupId(true);
}
- @Override
- protected void onBeforeRender() {
- if (SecurityUtils.getUser() != null)
- OneDev.getInstance(VisitInfoManager.class).visitCodeComment(SecurityUtils.getUser(), getComment());
- super.onBeforeRender();
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -614,6 +658,7 @@ public abstract class CodeCommentPanel extends Panel {
WebMarkupContainer actionsContainer = newActionsContainer();
editFragment.replaceWith(actionsContainer);
target.add(actionsContainer);
+ notifyCodeCommentChange(target, getComment());
}
}
@@ -928,6 +973,7 @@ public abstract class CodeCommentPanel extends Panel {
viewFragment.remove();
OneDev.getInstance(CodeCommentReplyManager.class).delete(getReply());
target.appendJavaScript(String.format("$('#%s').remove();", viewFragment.getMarkupId()));
+ notifyCodeCommentChange(target, getComment());
}
@Override
@@ -965,5 +1011,10 @@ public abstract class CodeCommentPanel extends Panel {
return getReply().getUser();
}
- }
+ }
+
+ private void notifyCodeCommentChange(AjaxRequestTarget target, CodeComment comment) {
+ ((BasePage) getPage()).notifyObservableChange(target, CodeComment.getChangeObservable(comment.getId()));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
index ff66c1ab29..69ad3c756c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
@@ -90,8 +90,8 @@ public abstract class CommitStatusLink extends DropdownLink {
add(new BuildStatusIcon("icon", statusModel) {
@Override
- protected Collection<String> getWebSocketObservables() {
- return CommitStatusLink.this.getWebSocketObservables();
+ protected Collection<String> getChangeObservables() {
+ return CommitStatusLink.this.getChangeObservables();
}
});
@@ -119,9 +119,9 @@ public abstract class CommitStatusLink extends DropdownLink {
add(AttributeAppender.append("class", "commit-status text-nowrap"));
}
- protected Collection<String> getWebSocketObservables() {
+ protected Collection<String> getChangeObservables() {
if (!jobsModel.getObject().isEmpty())
- return Sets.newHashSet("commit-status:" + getProject().getId() + ":" + commitId.name());
+ return Sets.newHashSet(Build.getCommitStatusChangeObservable(getProject().getId(), commitId.name()));
else
return new HashSet<>();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 08a3b23ca6..13e0860c7e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -1,58 +1,8 @@
package io.onedev.server.web.component.diff.revision;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-import javax.servlet.http.Cookie;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
-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.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.util.visit.IVisit;
-import org.apache.wicket.util.visit.IVisitor;
-import org.eclipse.jgit.diff.DiffEntry;
-import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import org.eclipse.jgit.lib.AnyObjectId;
-import org.eclipse.jgit.lib.ObjectId;
-
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.ExceptionUtils;
@@ -72,13 +22,7 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.git.exception.ObsoleteCommitException;
import io.onedev.server.git.service.DiffEntryFacade;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentReply;
-import io.onedev.server.model.CodeCommentStatusChange;
-import io.onedev.server.model.PendingSuggestionApply;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.Mark;
import io.onedev.server.search.code.CodeIndexManager;
@@ -94,9 +38,10 @@ import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.ajaxlistener.TrackViewStateListener;
import io.onedev.server.web.behavior.PatternSetAssistBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
+import io.onedev.server.web.component.comment.CommentInput;
import io.onedev.server.web.component.diff.blob.BlobDiffPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
@@ -104,7 +49,6 @@ import io.onedev.server.web.component.markdown.OutdatedSuggestionException;
import io.onedev.server.web.component.markdown.SuggestionSupport;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
-import io.onedev.server.web.component.comment.CommentInput;
import io.onedev.server.web.component.suggestionapply.SuggestionApplyBean;
import io.onedev.server.web.component.suggestionapply.SuggestionApplyModalPanel;
import io.onedev.server.web.component.svg.SpriteImage;
@@ -113,6 +57,45 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequest
import io.onedev.server.web.util.DiffPlanarRange;
import io.onedev.server.web.util.RevisionDiff;
import io.onedev.server.web.util.SuggestionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+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.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.util.visit.IVisit;
+import org.apache.wicket.util.visit.IVisitor;
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
+import org.eclipse.jgit.lib.AnyObjectId;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.annotation.Nullable;
+import javax.servlet.http.Cookie;
+import java.util.*;
/**
* Make sure to add only one revision diff panel on a page
@@ -373,7 +356,7 @@ public abstract class RevisionDiffPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -382,7 +365,7 @@ public abstract class RevisionDiffPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return getWebSocketObservables();
+ return getChangeObservables();
}
});
@@ -564,23 +547,6 @@ public abstract class RevisionDiffPanel extends Panel {
}
});
-
- add(new WebSocketObserver() {
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
- Collection<String> observables = Sets.newHashSet();
- if (getPullRequest() != null)
- observables.add(PullRequest.getClosedWebSocketObservable(getPullRequest().getId()));
- return observables;
- }
-
- });
}
}.setOutputMarkupId(true));
@@ -1439,7 +1405,7 @@ public abstract class RevisionDiffPanel extends Panel {
}));
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -1450,7 +1416,7 @@ public abstract class RevisionDiffPanel extends Panel {
public Collection<String> getObservables() {
Set<String> observables = new HashSet<>();
if (annotationSupport != null && annotationSupport.getOpenComment() != null)
- observables.add(CodeComment.getWebSocketObservable(annotationSupport.getOpenComment().getId()));
+ observables.add(CodeComment.getChangeObservable(annotationSupport.getOpenComment().getId()));
return observables;
}
@@ -1821,10 +1787,10 @@ public abstract class RevisionDiffPanel extends Panel {
response.render(JavaScriptHeaderItem.forReference(new RevisionDiffResourceReference()));
}
- private Set<String> getWebSocketObservables() {
+ private Set<String> getChangeObservables() {
return Sets.newHashSet(
- CommitIndexed.getWebSocketObservable(getProject().getObjectId(oldRev, true).name()),
- CommitIndexed.getWebSocketObservable(getProject().getObjectId(newRev, true).name()));
+ CommitIndexed.getChangeObservable(getProject().getObjectId(oldRev, true).name()),
+ CommitIndexed.getChangeObservable(getProject().getObjectId(newRev, true).name()));
}
protected abstract boolean isContextDifferent(CompareContext compareContext);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java b/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java
index 17a2d46005..35a62765c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java
@@ -1,13 +1,20 @@
package io.onedev.server.web.component.issue;
+import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.util.ColorUtils;
+import io.onedev.server.web.behavior.ChangeObserver;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import java.util.Collection;
@SuppressWarnings("serial")
public class IssueStateBadge extends Label {
@@ -15,7 +22,12 @@ public class IssueStateBadge extends Label {
private IModel<Issue> issueModel;
public IssueStateBadge(String id, IModel<Issue> issueModel) {
- super(id, issueModel.getObject().getState());
+ super(id, new LoadableDetachableModel<>() {
+ @Override
+ protected Object load() {
+ return issueModel.getObject().getState();
+ }
+ });
this.issueModel = issueModel;
}
@@ -26,19 +38,38 @@ public class IssueStateBadge extends Label {
}
@Override
- protected void onInitialize() {
- super.onInitialize();
-
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
Issue issue = issueModel.getObject();
StateSpec stateSpec = OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpec(issue.getState());
if (stateSpec != null) {
String fontColor = ColorUtils.isLight(stateSpec.getColor())?"#333":"#f9f9f9";
String style = String.format("background-color: %s; color: %s;", stateSpec.getColor(), fontColor);
- add(AttributeAppender.append("style", style));
- add(AttributeAppender.append("title", "State"));
+ tag.put("style", style);
+ tag.put("title", "State");
}
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ChangeObserver() {
+
+ @Override
+ public Collection<String> getObservables() {
+ return Sets.newHashSet(Issue.getDetailChangeObservable(issueModel.getObject().getId()));
+ }
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ handler.add(component);
+ }
+
+ });
add(AttributeAppender.append("class", "issue-state badge"));
+
+ setOutputMarkupId(true);
}
}
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 177b77df9d..f23d9171a4 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
@@ -14,7 +14,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.behavior.WebSocketObserver;
+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;
@@ -22,6 +22,7 @@ import io.onedev.server.web.component.issue.activities.activity.IssueCommentedAc
import io.onedev.server.web.component.issue.activities.activity.IssueOpenedActivity;
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 org.apache.wicket.AttributeModifier;
@@ -48,10 +49,7 @@ import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import javax.servlet.http.Cookie;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@SuppressWarnings("serial")
public abstract class IssueActivitiesPanel extends Panel {
@@ -85,12 +83,14 @@ public abstract class IssueActivitiesPanel extends Panel {
addOrReplace(activitiesView);
Issue issue = getIssue();
+ var user = SecurityUtils.getUser();
for (IssueActivity activity: getActivities()) {
if (issue.isVisitedAfter(activity.getDate())) {
activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));
} else {
Component row = newActivityRow(activitiesView.newChildId(), activity);
- row.add(AttributeAppender.append("class", "new"));
+ if (user == null || !user.equals(activity.getUser()))
+ row.add(AttributeAppender.append("class", "new"));
activitiesView.add(row);
}
}
@@ -172,7 +172,7 @@ public abstract class IssueActivitiesPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -189,9 +189,11 @@ public abstract class IssueActivitiesPanel extends Panel {
newActivities.add(activity);
}
+ var user = SecurityUtils.getUser();
for (IssueActivity activity: newActivities) {
Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
- newActivityRow.add(AttributeAppender.append("class", "new"));
+ if (user == null || !user.equals(activity.getUser()))
+ newActivityRow.add(AttributeAppender.append("class", "new"));
activitiesView.add(newActivityRow);
String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
@@ -204,7 +206,7 @@ public abstract class IssueActivitiesPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Lists.newArrayList(Issue.getWebSocketObservable(getIssue().getId()));
+ return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
}
});
@@ -261,6 +263,7 @@ public abstract class IssueActivitiesPanel extends Panel {
comment.setDate(new Date());
comment.setIssue(getIssue());
OneDev.getInstance(IssueCommentManager.class).create(comment, new ArrayList<>());
+ ((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(false));
input.clearMarkdown();
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
index f6e0bb7e59..e7e46dedcf 100644
--- 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
@@ -29,13 +29,9 @@ public class IssueCommentedActivity implements IssueActivity {
return getComment();
}
- }, new DeleteCallback() {
-
- @Override
- public void onDelete(AjaxRequestTarget target) {
- OneDev.getInstance(IssueCommentManager.class).delete(getComment());
- deleteCallback.onDelete(target);
- }
+ }, target -> {
+ OneDev.getInstance(IssueCommentManager.class).delete(getComment());
+ deleteCallback.onDelete(target);
});
}
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/IssueCommentedPanel.java
index 0e848764db..7d2ea564d6 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/IssueCommentedPanel.java
@@ -1,16 +1,5 @@
package io.onedev.server.web.component.issue.activities.activity;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-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 io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
@@ -23,9 +12,20 @@ import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.facade.UserCache;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
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;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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 java.util.ArrayList;
+import java.util.List;
@SuppressWarnings("serial")
class IssueCommentedPanel extends GenericPanel<IssueComment> {
@@ -66,8 +66,10 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {
protected void onSaveComment(AjaxRequestTarget target, String comment) {
if (comment.length() > IssueComment.MAX_CONTENT_LEN)
throw new ExplicitException("Comment too long");
- IssueCommentedPanel.this.getComment().setContent(comment);
- OneDev.getInstance(IssueCommentManager.class).update(IssueCommentedPanel.this.getComment());
+ var entity = IssueCommentedPanel.this.getComment();
+ entity.setContent(comment);
+ OneDev.getInstance(IssueCommentManager.class).update(entity);
+ notifyIssueChange(target);
}
@Override
@@ -102,19 +104,15 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {
@Override
protected ContentVersionSupport getContentVersionSupport() {
- return new ContentVersionSupport() {
-
- @Override
- public long getVersion() {
- return 0;
- }
-
- };
+ return () -> 0;
}
@Override
protected DeleteCallback getDeleteCallback() {
- return deleteCallback;
+ return target -> {
+ notifyIssueChange(target);
+ deleteCallback.onDelete(target);
+ };
}
});
@@ -126,4 +124,7 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {
return getModelObject();
}
+ 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/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
index 00303c9157..96eb1ce998 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/activities/activity/IssueOpenedPanel.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import io.onedev.server.entitymanager.IssueChangeManager;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
@@ -50,6 +51,7 @@ class IssueOpenedPanel extends GenericPanel<Issue> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
OneDev.getInstance(IssueChangeManager.class).changeDescription(getIssue(), comment);
+ ((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(false));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java
index e6674e016a..8b0f977896 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java
@@ -8,6 +8,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.util.ReferenceTransformer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -68,6 +69,7 @@ public abstract class IssueEditableTitlePanel extends Panel {
super.onSubmit(target, form);
OneDev.getInstance(IssueChangeManager.class).changeTitle(getIssue(), titleInput.getModelObject());
+ ((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(false));
Fragment titleViewer = newTitleViewer();
titleEditor.replaceWith(titleViewer);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 4dd9eb5d1f..e84328989b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -30,6 +30,7 @@ import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.InplacePropertyEditLink;
import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
@@ -151,6 +152,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro
FieldUtils.newBeanComponentContext(beanDescriptor, bean),
bean, FieldUtils.getEditableFields(getProject(), dependentFields)));
OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues);
+ notifyObservablesChange(target);
close();
}
@@ -159,9 +161,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro
new DependentFieldsEditor(handler, bean, propertyNames, false, "Dependent Fields");
} else {
OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues);
+ notifyObservablesChange(handler);
}
-
- FieldValuesPanel.this.onUpdated(handler);
}
@Override
@@ -405,8 +406,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro
@Nullable
protected abstract Input getField();
-
- protected void onUpdated(IPartialPageRequestHandler handler) {
- }
+ private void notifyObservablesChange(IPartialPageRequestHandler handler) {
+ ((BasePage)getPage()).notifyObservablesChange(handler, getIssue().getChangeObservables(true));
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 0624f7bd16..d6c8b99ad0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -36,9 +36,9 @@ import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.issue.IssueStateBadge;
@@ -1389,10 +1389,6 @@ public abstract class IssueListPanel extends Panel {
protected Issue getIssue() {
return (Issue) fragment.getDefaultModelObject();
}
-
- @Override
- protected void onTransited(AjaxRequestTarget target) {
- }
};
@@ -1403,10 +1399,6 @@ public abstract class IssueListPanel extends Panel {
} else {
fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR_AND_NAME, true) {
- @Override
- protected void onUpdated(IPartialPageRequestHandler handler) {
- }
-
@SuppressWarnings("deprecation")
@Override
protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {
@@ -1477,7 +1469,7 @@ public abstract class IssueListPanel extends Panel {
});
- fragment.add(new WebSocketObserver() {
+ fragment.add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -1488,7 +1480,7 @@ public abstract class IssueListPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(Issue.getWebSocketObservable(issueId));
+ return Sets.newHashSet(Issue.getDetailChangeObservable(issueId));
}
});
@@ -1505,9 +1497,26 @@ public abstract class IssueListPanel extends Panel {
@Override
protected Item<Issue> newRowItem(String id, int index, IModel<Issue> model) {
Item<Issue> item = super.newRowItem(id, index, model);
- Issue issue = model.getObject();
- item.add(AttributeAppender.append("class",
- issue.isVisitedAfter(issue.getLastActivity().getDate())?"issue":"issue new"));
+ item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+ @Override
+ protected String load() {
+ Issue issue = model.getObject();
+ return issue.isVisitedAfter(issue.getLastActivity().getDate())?"issue":"issue new";
+ }
+ }));
+ var issueId = model.getObject().getId();
+ item.add(new ChangeObserver() {
+ @Override
+ public Collection<String> getObservables() {
+ return Sets.newHashSet(Issue.getDetailChangeObservable(issueId));
+ }
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ handler.add(component);
+ }
+ });
+ item.setOutputMarkupId(true);
return item;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index 57c686fc66..6a5aa2e817 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -30,7 +31,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.issue.IssueStateBadge;
import io.onedev.server.web.component.issue.transitionoption.TransitionOptionPanel;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
@@ -116,6 +117,7 @@ public abstract class IssueOperationsPanel extends Panel {
manager.changeState(getIssue(), transition.getToState(), fieldValues,
transition.getRemoveFields(), comment);
target.add(IssueOperationsPanel.this);
+ ((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(true));
}
@Override
@@ -167,7 +169,7 @@ public abstract class IssueOperationsPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -176,7 +178,7 @@ public abstract class IssueOperationsPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Lists.newArrayList(Issue.getWebSocketObservable(getIssue().getId()));
+ return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java
index 93f83c6f17..25122bb53a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java
@@ -5,6 +5,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -104,8 +105,8 @@ public abstract class TransitionMenuLink extends MenuLink {
IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);
manager.changeState(getIssue(), transition.getToState(), fieldValues,
transition.getRemoveFields(), comment);
+ ((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(true));
modal.close();
- TransitionMenuLink.this.onTransited(target);
}
@Override
@@ -127,6 +128,4 @@ public abstract class TransitionMenuLink extends MenuLink {
protected abstract Issue getIssue();
- protected abstract void onTransited(AjaxRequestTarget target);
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 0b081a4bef..c0862734f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -19,7 +19,7 @@ import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.entity.reference.ReferencePanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.floating.AlignPlacement;
@@ -43,6 +43,7 @@ import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.list.SimpleUserListLink;
import io.onedev.server.web.editable.InplacePropertyEditLink;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneIssuesPage;
import io.onedev.server.web.page.simple.security.LoginPage;
@@ -152,7 +153,7 @@ public abstract class IssueSidePanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -161,7 +162,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Lists.newArrayList(Issue.getWebSocketObservable(getIssue().getId()));
+ return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
}
});
@@ -310,6 +311,7 @@ public abstract class IssueSidePanel extends Panel {
void onDelete(AjaxRequestTarget target, Issue linkedIssue) {
getIssueChangeManager().removeLink(model.getObject().getSpec(), getIssue(),
linkedIssue, opposite);
+ notifyIssueChange(target, getIssue());
}
};
@@ -351,6 +353,7 @@ public abstract class IssueSidePanel extends Panel {
getSession().warn("Not authorized to link issue in project '" + selection.getProject() + "'");
} else {
getIssueChangeManager().addLink(spec, getIssue(), selection, opposite);
+ notifyIssueChange(target, getIssue());
}
}
@@ -377,8 +380,10 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onSave(AjaxRequestTarget target, Issue issue) {
getIssueManager().open(issue);
+ notifyIssueChange(target, issue);
getIssueChangeManager().addLink(model.getObject().getSpec(),
getIssue(), issue, opposite);
+ notifyIssueChange(target, getIssue());
modal.close();
}
@@ -462,6 +467,7 @@ public abstract class IssueSidePanel extends Panel {
} else {
getIssueChangeManager().changeLink(side.getSpec(), getIssue(),
linkedIssue, side.isOpposite());
+ notifyIssueChange(handler, getIssue());
}
}
@@ -497,13 +503,14 @@ public abstract class IssueSidePanel extends Panel {
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
attributes.getAjaxCallListeners().add(new ConfirmClickListener(
- "Do you really want to unlink this issue?"));
+ "Do you really want to remove this link?"));
}
@Override
public void onClick(AjaxRequestTarget target) {
Issue linkedIssue = getIssueManager().load(linkedIssueId);
deleteListener.onDelete(target, linkedIssue);
+ notifyIssueChange(target, getIssue());
}
}.setVisible(deleteListener != null));
@@ -515,10 +522,6 @@ public abstract class IssueSidePanel extends Panel {
return getIssueManager().load(linkedIssueId);
}
- @Override
- protected void onTransited(AjaxRequestTarget target) {
- }
-
};
stateLink.add(new IssueStateBadge("badge", new LoadableDetachableModel<Issue>() {
@@ -620,6 +623,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
getIssueChangeManager().removeSchedule(getIssue(), item.getModelObject());
+ notifyIssueChange(target, getIssue());
}
@Override
@@ -678,6 +682,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onSelect(AjaxRequestTarget target, Milestone milestone) {
getIssueChangeManager().addSchedule(getIssue(), milestone);
+ notifyIssueChange(target, getIssue());
}
});
@@ -836,6 +841,10 @@ public abstract class IssueSidePanel extends Panel {
protected abstract Component newDeleteLink(String componentId);
+ private void notifyIssueChange(IPartialPageRequestHandler handler, Issue issue) {
+ ((BasePage)getPage()).notifyObservablesChange(handler, issue.getChangeObservables(true));
+ }
+
private static abstract class LinkDeleteListener implements Serializable {
abstract void onDelete(AjaxRequestTarget target, Issue linkedIssue);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
index f6113848b1..53a7a618f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java
@@ -8,6 +8,9 @@ import java.util.Map;
import javax.annotation.Nullable;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.entitymanager.SettingManager;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -39,7 +42,7 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@SuppressWarnings("serial")
-public abstract class TransitionOptionPanel extends Panel {
+public abstract class TransitionOptionPanel extends Panel implements InputContext {
private String comment;
@@ -147,6 +150,16 @@ public abstract class TransitionOptionPanel extends Panel {
setOutputMarkupId(true);
}
+
+ @Override
+ public List<String> getInputNames() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public InputSpec getInputSpec(String inputName) {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);
+ }
protected abstract Issue getIssue();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
index 9c61471565..d3f9674886 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java
@@ -8,6 +8,7 @@ import java.util.UUID;
import javax.annotation.Nullable;
+import com.google.common.collect.Sets;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -31,7 +32,7 @@ import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.web.asset.pipelinebutton.PipelineButtonCssResourceReference;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.floating.AlignPlacement;
@@ -124,7 +125,7 @@ public abstract class JobInfoButton extends Panel {
detailLink.add(new Label("name", getJobName()));
- detailLink.add(new WebSocketObserver() {
+ detailLink.add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -133,7 +134,7 @@ public abstract class JobInfoButton extends Panel {
@Override
public Collection<String> getObservables() {
- return Lists.newArrayList("job-status:" + getProject().getId() + ":" + getCommitId().name() + ":" + getJobName());
+ return Sets.newHashSet(Build.getJobStatusChangeObservable(getProject().getId(), getCommitId().name(), getJobName()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
index 668e546e12..12b46dbd23 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
@@ -1,15 +1,19 @@
package io.onedev.server.web.component.job.joblist;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
+import com.google.common.collect.Sets;
+import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;
+import io.onedev.server.web.component.job.JobDefLink;
+import io.onedev.server.web.component.job.RunJobLink;
+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -24,21 +28,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
-import com.google.common.collect.Sets;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Build.Status;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;
-import io.onedev.server.web.component.job.JobDefLink;
-import io.onedev.server.web.component.job.RunJobLink;
-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
+import javax.annotation.Nullable;
+import java.util.*;
@SuppressWarnings("serial")
public abstract class JobListPanel extends Panel {
@@ -169,7 +160,7 @@ public abstract class JobListPanel extends Panel {
jobsView.add(jobItem);
}
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -178,14 +169,14 @@ public abstract class JobListPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return getWebSocketObservables();
+ return getChangeObservables();
}
});
}
- private Collection<String> getWebSocketObservables() {
- return Sets.newHashSet("commit-status:" + getProject().getId() + ":" + commitId.name());
+ private Collection<String> getChangeObservables() {
+ return Sets.newHashSet(Build.getCommitStatusChangeObservable(getProject().getId(), commitId.name()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
index dfe51880ef..564030c43f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssigneeChoice.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.pullrequest.assignment;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -51,10 +52,13 @@ public abstract class AssigneeChoice extends SelectToAddChoice<User> {
assignment.setRequest(getPullRequest());
assignment.setUser(user);
- if (!getPullRequest().isNew())
+ if (!getPullRequest().isNew()) {
OneDev.getInstance(PullRequestAssignmentManager.class).create(assignment);
- else
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
+ } else {
getPullRequest().getAssignments().add(assignment);
+ }
};
protected abstract PullRequest getPullRequest();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
index 3043644300..e14b5cf8fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/assignment/AssignmentListPanel.java
@@ -6,6 +6,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -27,7 +28,7 @@ import io.onedev.server.model.PullRequestAssignment;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
@@ -108,11 +109,13 @@ public abstract class AssignmentListPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
PullRequest request = getPullRequest();
PullRequestAssignment assignment = item.getModelObject();
+ request.getAssignments().remove(assignment);
if (request.isNew()) {
- request.getAssignments().remove(assignment);
target.add(AssignmentListPanel.this);
} else {
OneDev.getInstance(PullRequestAssignmentManager.class).delete(assignment);
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
}
assignmentsModel.detach();
}
@@ -152,7 +155,7 @@ public abstract class AssignmentListPanel extends Panel {
});
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -162,7 +165,7 @@ public abstract class AssignmentListPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
index d9c96c0de5..f553ccc32c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java
@@ -39,7 +39,7 @@ import io.onedev.server.model.Build.Status;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.floating.FloatingPanel;
@@ -175,7 +175,7 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
});
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -186,7 +186,7 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 0290e0cea0..d8b6b49757 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.pullrequest.list;
+import com.google.common.collect.Sets;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
@@ -21,6 +22,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.asset.emoji.Emojis;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
@@ -52,6 +54,7 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -846,8 +849,26 @@ public abstract class PullRequestListPanel extends Panel {
protected Item<PullRequest> newRowItem(String id, int index, IModel<PullRequest> model) {
Item<PullRequest> item = super.newRowItem(id, index, model);
PullRequest request = model.getObject();
- item.add(AttributeAppender.append("class",
- request.isVisitedAfter(request.getLastActivity().getDate())?"request":"request new"));
+ item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+ @Override
+ protected String load() {
+ var request = item.getModelObject();
+ return request.isVisitedAfter(request.getLastActivity().getDate())?"request":"request new";
+ }
+ }));
+ var requestId = request.getId();
+ item.add(new ChangeObserver() {
+ @Override
+ public Collection<String> getObservables() {
+ return Sets.newHashSet(PullRequest.getChangeObservable(requestId));
+ }
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ handler.add(component);
+ }
+ });
+ item.setOutputMarkupId(true);
return item;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
index b262b8745d..87ad6a5890 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewListPanel.java
@@ -10,9 +10,10 @@ import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
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 org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -113,6 +114,7 @@ public abstract class ReviewListPanel extends Panel {
PullRequestReview review = item.getModelObject();
review.setStatus(Status.PENDING);
OneDev.getInstance(PullRequestReviewManager.class).update(review);
+ notifyPullRequestChange(target);
}
@Override
@@ -159,6 +161,7 @@ public abstract class ReviewListPanel extends Panel {
if (eachReview.isNew())
reviewManager.create(eachReview);
}
+ notifyPullRequestChange(target);
} else {
reviewerRequired = true;
}
@@ -205,7 +208,7 @@ public abstract class ReviewListPanel extends Panel {
});
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -215,7 +218,7 @@ public abstract class ReviewListPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
});
@@ -229,4 +232,8 @@ public abstract class ReviewListPanel extends Panel {
response.render(CssHeaderItem.forReference(new ReviewCssResourceReference()));
}
+ private void notifyPullRequestChange(AjaxRequestTarget target) {
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
index 5782d6d24a..56190a6366 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewerChoice.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.pullrequest.review;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -64,7 +65,9 @@ public abstract class ReviewerChoice extends SelectToAddChoice<User> {
if (review.isNew())
OneDev.getInstance(PullRequestReviewManager.class).create(review);
else
- OneDev.getInstance(PullRequestReviewManager.class).update(review);
+ OneDev.getInstance(PullRequestReviewManager.class).update(review);
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 97b4cab8b6..e1740d39aa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -65,7 +65,7 @@ import io.onedev.server.util.CryptoUtils;
import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.ForceOrdinaryStyleBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;
@@ -275,7 +275,7 @@ public abstract class BasePage extends WebPage {
if (message.getText().startsWith(WebSocketMessages.OBSERVABLE_CHANGED)) {
List<String> observables = Splitter.on('\n').splitToList(
message.getText().substring(WebSocketMessages.OBSERVABLE_CHANGED.length()+1));
- for (WebSocketObserver observer: findWebSocketObservers()) {
+ for (ChangeObserver observer: findChangeObservers()) {
if (CollectionUtils.containsAny(observer.getObservables(), observables))
observer.onObservableChanged(handler);
}
@@ -287,6 +287,17 @@ public abstract class BasePage extends WebPage {
}
+ public void notifyObservablesChange(IPartialPageRequestHandler handler, Collection<String> observables) {
+ for (ChangeObserver observer: findChangeObservers()) {
+ if (CollectionUtils.containsAny(observer.getObservables(), observables))
+ observer.onObservableChanged(handler);
+ }
+ }
+
+ public void notifyObservableChange(IPartialPageRequestHandler handler, String observable) {
+ notifyObservablesChange(handler, Sets.newHashSet(observable));
+ }
+
public FeedbackPanel getSessionFeedback() {
return sessionFeedback;
}
@@ -324,23 +335,23 @@ public abstract class BasePage extends WebPage {
super.onAfterRender();
}
- private Collection<WebSocketObserver> findWebSocketObservers() {
- Collection<WebSocketObserver> observers = new HashSet<>();
- observers.addAll(getBehaviors(io.onedev.server.web.behavior.WebSocketObserver.class));
+ private Collection<ChangeObserver> findChangeObservers() {
+ Collection<ChangeObserver> observers = new HashSet<>();
+ observers.addAll(getBehaviors(ChangeObserver.class));
visitChildren(Component.class, new IVisitor<Component, Void>() {
@Override
public void component(Component object, IVisit<Void> visit) {
- observers.addAll(object.getBehaviors(WebSocketObserver.class));
+ observers.addAll(object.getBehaviors(ChangeObserver.class));
}
});
return observers;
}
- public final Collection<String> findWebSocketObservables() {
+ public final Collection<String> findChangeObservables() {
Collection<String> observables = new HashSet<>();
- for (WebSocketObserver observer: findWebSocketObservers())
+ for (ChangeObserver observer: findChangeObservers())
observables.addAll(observer.getObservables());
return observables;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index e0f0f10dd9..db105b40ec 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -34,7 +34,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.FilenameUtils;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.commit.status.CommitStatusLink;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
@@ -246,7 +246,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
}.setOutputMarkupPlaceholderTag(true));
- revisionIndexing.add(new WebSocketObserver() {
+ revisionIndexing.add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -258,7 +258,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
public Collection<String> getObservables() {
Set<String> observables = new HashSet<>();
if (resolvedRevision != null)
- observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision, true).name()));
+ observables.add(CommitIndexed.getChangeObservable(getProject().getRevCommit(resolvedRevision, true).name()));
return observables;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index 254c332793..b8d36e7b73 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -1,66 +1,8 @@
package io.onedev.server.web.page.project.blob.render.source;
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-import javax.servlet.http.Cookie;
-
-import io.onedev.server.util.diff.DiffUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxChannel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-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.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.unbescape.html.HtmlEscape;
-import org.unbescape.javascript.JavaScriptEscape;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-
import io.onedev.commons.jsymbol.Symbol;
import io.onedev.commons.jsymbol.SymbolExtractor;
import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
@@ -82,12 +24,7 @@ import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentReply;
-import io.onedev.server.model.CodeCommentStatusChange;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.Mark;
import io.onedev.server.search.code.CodeSearchManager;
@@ -95,21 +32,22 @@ import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Similarities;
+import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
+import io.onedev.server.web.component.comment.CommentInput;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.markdown.SuggestionSupport;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.comment.CommentInput;
import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
import io.onedev.server.web.component.suggestionapply.SuggestionApplyBean;
@@ -126,6 +64,52 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.AnnotationInfo;
import io.onedev.server.web.util.CodeCommentInfo;
import io.onedev.server.web.util.WicketUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxChannel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+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.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.unbescape.html.HtmlEscape;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import javax.annotation.Nullable;
+import javax.servlet.http.Cookie;
+import java.util.*;
+
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
/**
* Make sure to add only one source view panel per page
@@ -229,14 +213,9 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
target.appendJavaScript(script);
}
- }, new OptionChangeCallback() {
-
- @Override
- public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());
- target.appendJavaScript(script);
- }
-
+ }, (OptionChangeCallback) target -> {
+ String script = String.format("onedev.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());
+ target.appendJavaScript(script);
});
return sourceFormat;
}
@@ -388,7 +367,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
}));
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -399,7 +378,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
public Collection<String> getObservables() {
Set<String> observables = new HashSet<>();
if (context.getOpenComment() != null)
- observables.add(CodeComment.getWebSocketObservable(context.getOpenComment().getId()));
+ observables.add(CodeComment.getChangeObservable(context.getOpenComment().getId()));
return observables;
}
@@ -449,12 +428,12 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
protected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {
- SourceViewPanel.this.onSaveCommentReply(reply);
+ SourceViewPanel.this.onSaveCommentReply(target, reply);
}
@Override
protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {
- SourceViewPanel.this.onSaveCommentStatusChange(change, note);
+ SourceViewPanel.this.onSaveCommentStatusChange(target, change, note);
}
@Override
@@ -615,12 +594,12 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
protected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {
- SourceViewPanel.this.onSaveCommentReply(reply);
+ SourceViewPanel.this.onSaveCommentReply(target, reply);
}
@Override
protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {
- SourceViewPanel.this.onSaveCommentStatusChange(change, note);
+ SourceViewPanel.this.onSaveCommentStatusChange(target, change, note);
}
@Override
@@ -673,12 +652,12 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
protected void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {
- SourceViewPanel.this.onSaveCommentReply(reply);
+ SourceViewPanel.this.onSaveCommentReply(target, reply);
}
@Override
protected void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {
- SourceViewPanel.this.onSaveCommentStatusChange(change, note);
+ SourceViewPanel.this.onSaveCommentStatusChange(target, change, note);
}
@Override
@@ -1259,7 +1238,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
return viewPlainMode;
}
- private void onSaveCommentReply(CodeCommentReply reply) {
+ private void onSaveCommentReply(AjaxRequestTarget target, CodeCommentReply reply) {
reply.setCompareContext(getCompareContext());
if (reply.isNew())
OneDev.getInstance(CodeCommentReplyManager.class).create(reply);
@@ -1267,7 +1246,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
OneDev.getInstance(CodeCommentReplyManager.class).update(reply);
}
- private void onSaveCommentStatusChange(CodeCommentStatusChange change, String note) {
+ private void onSaveCommentStatusChange(AjaxRequestTarget target, CodeCommentStatusChange change, String note) {
change.setCompareContext(getCompareContext());
OneDev.getInstance(CodeCommentStatusChangeManager.class).create(change, note);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 29679ea5ca..0a62eb52b4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -25,7 +25,7 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
@@ -42,6 +42,7 @@ import io.onedev.server.web.component.sideinfo.SideInfoPanel;
import io.onedev.server.web.component.tabbable.PageTabHead;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;
@@ -162,8 +163,8 @@ public abstract class BuildDetailPage extends ProjectPage
return new ViewStateAwarePageLink<Void>(componentId, ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));
}
- private WebSocketObserver newBuildObserver(Long buildId) {
- return new WebSocketObserver() {
+ private ChangeObserver newBuildObserver(Long buildId) {
+ return new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -173,7 +174,7 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(Build.getWebSocketObservable(buildId));
+ return Sets.newHashSet(Build.getDetailChangeObservable(buildId));
}
};
@@ -219,8 +220,8 @@ public abstract class BuildDetailPage extends ProjectPage
}) {
@Override
- protected Collection<String> getWebSocketObservables() {
- return Sets.newHashSet(Build.getWebSocketObservable(getBuild().getId()));
+ protected Collection<String> getChangeObservables() {
+ return Sets.newHashSet(Build.getDetailChangeObservable(getBuild().getId()));
}
});
@@ -296,6 +297,7 @@ public abstract class BuildDetailPage extends ProjectPage
getBuild().setDescription(((DescriptionBean)bean).getValue());
OneDev.getInstance(BuildManager.class).update(getBuild());
OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(getBuild()));
+ ((BasePage)getPage()).notifyObservablesChange(target, getBuild().getChangeObservables());
close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index 51e68fbc9c..6427b11979 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -6,6 +6,7 @@ import java.util.List;
import javax.annotation.Nullable;
import io.onedev.server.web.component.issue.create.CreateIssuePanel;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.wicket.Component;
@@ -98,6 +99,7 @@ abstract class BacklogColumnPanel extends Panel {
@Override
protected void onSave(AjaxRequestTarget target, Issue issue) {
getIssueManager().open(issue);
+ notifyIssueChange(target, issue);
modal.close();
}
@@ -157,6 +159,7 @@ abstract class BacklogColumnPanel extends Panel {
if (!SecurityUtils.canScheduleIssues(issue.getProject()))
throw new UnauthorizedException("Permission denied");
OneDev.getInstance(IssueChangeManager.class).removeSchedule(issue, getMilestone());
+ notifyIssueChange(target, issue);
target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, true);", issue.getId()));
}
@@ -243,4 +246,8 @@ abstract class BacklogColumnPanel extends Panel {
protected abstract Milestone getMilestone();
+ private void notifyIssueChange(AjaxRequestTarget target, Issue issue) {
+ ((BasePage)getPage()).notifyObservablesChange(target, issue.getChangeObservables(true));
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index 10d73ea119..956cde2223 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -1,39 +1,9 @@
package io.onedev.server.web.page.project.issues.boards;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.CallbackParameter;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.hibernate.Hibernate;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueLink;
-import io.onedev.server.model.LinkSpec;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.model.Project;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.security.SecurityUtils;
@@ -53,6 +23,30 @@ import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
import io.onedev.server.web.websocket.WebSocketManager;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.hibernate.Hibernate;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
@SuppressWarnings("serial")
abstract class BoardCardPanel extends GenericPanel<Issue> {
@@ -82,10 +76,6 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
protected Issue getIssue() {
return issueModel.getObject();
}
-
- @Override
- protected void onTransited(AjaxRequestTarget target) {
- }
};
transitLink.setVisible(displayFields.contains(Issue.NAME_STATE));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index d280aede9b..37391ae6dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -33,6 +33,7 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.editable.BeanDescriptor;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.util.ProjectAware;
import org.apache.commons.lang3.SerializationUtils;
@@ -278,6 +279,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
@Override
protected void onSave(AjaxRequestTarget target, Issue issue) {
getIssueManager().open(issue);
+ notifyIssueChange(target, issue);
modal.close();
}
@@ -341,8 +343,8 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
// move a backlog issue to board
if (!SecurityUtils.canScheduleIssues(issue.getProject()))
throw new UnauthorizedException("Permission denied");
-
OneDev.getInstance(IssueChangeManager.class).addSchedule(issue, getMilestone());
+ notifyIssueChange(target, issue);
markAccepted(target, issue, true);
} else if (fieldName.equals(Issue.NAME_STATE)) {
AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);
@@ -360,8 +362,12 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
for (String promptField: trigger.getPromptFields()) {
FieldSpec fieldSpec = getIssueSetting().getFieldSpec(promptField);
if (fieldSpec != null && SecurityUtils.canEditIssueField(getProject(), fieldSpec.getName())) {
- hasPromptFields = true;
- break;
+ Class<?> fieldBeanClass = FieldUtils.getFieldBeanClass();
+ Serializable fieldBean = issue.getFieldBean(fieldBeanClass, true);
+ if (FieldUtils.isFieldVisible(new BeanDescriptor(fieldBeanClass), fieldBean, promptField)) {
+ hasPromptFields = true;
+ break;
+ }
}
}
if (hasPromptFields) {
@@ -400,6 +406,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
} else {
OneDev.getInstance(IssueChangeManager.class).changeState(issue, getColumn(),
new HashMap<>(), transitionRef.get().getRemoveFields(), null);
+ notifyIssueChange(target, issue);
markAccepted(target, issue, true);
}
} else {
@@ -448,11 +455,17 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
return getIssueSetting().getFieldSpec(inputName);
}
+ @Override
+ protected boolean isDirtyAware() {
+ return false;
+ }
+
@Override
protected void onSave(AjaxRequestTarget target, Serializable bean) {
fieldValues.putAll(FieldUtils.getFieldValues(
FieldUtils.newBeanComponentContext(beanDescriptor, bean),
bean, FieldUtils.getEditableFields(getProject(), dependentFields)));
+ notifyIssueChange(target, issue);
close();
Issue issue = getIssueManager().load(issueId);
OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues);
@@ -468,6 +481,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
new DependentFieldsEditor(target, fieldBean, propertyNames, false, "Dependent Fields");
} else {
OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues);
+ notifyIssueChange(target, issue);
markAccepted(target, issue, true);
}
}
@@ -504,4 +518,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
@Nullable
protected abstract IssueQuery getBoardQuery();
+ private void notifyIssueChange(AjaxRequestTarget target, Issue issue) {
+ ((BasePage)getPage()).notifyObservablesChange(target, issue.getChangeObservables(true));
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
index 257530ca0b..150e0ac2f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
@@ -1,16 +1,14 @@
package io.onedev.server.web.page.project.issues.boards;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
+import com.google.common.collect.Sets;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.behavior.ChangeObserver;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.LoadableDetachableModel;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import java.util.Collection;
@SuppressWarnings("serial")
abstract class CardCountLabel extends Label {
@@ -32,7 +30,7 @@ abstract class CardCountLabel extends Label {
protected void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -41,11 +39,7 @@ abstract class CardCountLabel extends Label {
@Override
public Collection<String> getObservables() {
- Set<String> observables = new HashSet<>();
- observables.add(Issue.getListWebSocketObservable(getProject().getId()));
- for (Project project: getProject().getDescendants())
- observables.add(Issue.getListWebSocketObservable(project.getId()));
- return observables;
+ return Sets.newHashSet(Issue.getListChangeObservable(getProject().getId()));
}
});
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 59dc939810..0da4a59c1d 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
@@ -5,6 +5,7 @@ import java.util.List;
import javax.annotation.Nullable;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -231,6 +232,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
@Override
public void onClick(AjaxRequestTarget target) {
OneDev.getInstance(IssueManager.class).delete(getIssue());
+ ((BasePage)getPage()).notifyObservablesChange(target, getProject().getIssueListObservables());
onDeletedIssue(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
index b7a7a5169c..84d3d6fd9d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
@@ -1,21 +1,6 @@
package io.onedev.server.web.page.project.issues.boards;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-
+import com.google.common.collect.Sets;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
@@ -24,9 +9,21 @@ import io.onedev.server.model.Project;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
import io.onedev.server.web.util.Cursor;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
@SuppressWarnings("serial")
abstract class CardListPanel extends Panel {
@@ -130,7 +127,7 @@ abstract class CardListPanel extends Panel {
});
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -139,11 +136,7 @@ abstract class CardListPanel extends Panel {
@Override
public Collection<String> getObservables() {
- Set<String> observables = new HashSet<>();
- observables.add(Issue.getListWebSocketObservable(getProject().getId()));
- for (Project project: getProject().getDescendants())
- observables.add(Issue.getListWebSocketObservable(project.getId()));
- return observables;
+ return Sets.newHashSet(Issue.getListChangeObservable(getProject().getId()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
index f2358a20ca..0a88627af3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
@@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -63,6 +64,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {
editor.newComponentContext(), fieldBean, editableFields);
OneDev.getInstance(IssueChangeManager.class).changeState(getIssue(),
getTransition().getToState(), fieldValues, getTransition().getRemoveFields(), null);
+ ((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(true));
onSaved(target);
}
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 559515872b..8f0d89c519 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
@@ -8,7 +8,7 @@ import javax.persistence.EntityNotFoundException;
import javax.validation.ValidationException;
import com.google.common.collect.Lists;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
@@ -182,7 +182,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
public void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -191,7 +191,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
@Override
public Collection<String> getObservables() {
- return Lists.newArrayList(Issue.getWebSocketObservable(getIssue().getId()));
+ return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
}
});
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 5b7b7df260..1419841c93 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
@@ -24,7 +24,7 @@ import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
@@ -51,6 +51,7 @@ import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.editable.InplacePropertyEditLink;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
@@ -99,7 +100,6 @@ import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
import org.jetbrains.annotations.Nullable;
-import org.unbescape.html.HtmlEscape;
import javax.persistence.EntityNotFoundException;
import javax.validation.ValidationException;
@@ -272,6 +272,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
super.onSubmit(target, form);
OneDev.getInstance(PullRequestChangeManager.class).changeTitle(getPullRequest(), title);
+ notifyPullRequestChange(target);
isEditingTitle = false;
target.add(requestHead);
@@ -318,11 +319,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
};
- summaryContainer.add(new WebSocketObserver() {
+ summaryContainer.add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
@@ -823,8 +824,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
public void onClick(AjaxRequestTarget target) {
- dropdown.close();
OneDev.getInstance(PullRequestChangeManager.class).changeTargetBranch(getPullRequest(), branch);
+ notifyPullRequestChange(target);
+ dropdown.close();
}
};
@@ -967,7 +969,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Project getProject() {
- return getProject();
+ return PullRequestDetailPage.this.getProject();
}
@Override
@@ -1067,11 +1069,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
fragment.add(actions);
}
- fragment.add(new WebSocketObserver() {
+ fragment.add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
@@ -1154,6 +1156,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onUpdate(AjaxRequestTarget target) {
OneDev.getInstance(PullRequestChangeManager.class).changeMergeStrategy(getPullRequest(), mergeStrategy);
+ notifyPullRequestChange(target);
}
});
@@ -1214,7 +1217,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
protected void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
@@ -1223,7 +1226,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
});
@@ -1312,11 +1315,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
private WebMarkupContainer newOperationsContainer() {
WebMarkupContainer operationsContainer = new WebMarkupContainer("requestOperations");
- operationsContainer.add(new WebSocketObserver() {
+ operationsContainer.add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
@@ -1354,9 +1357,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
@Override
- protected String operate() {
+ protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
getPullRequestReviewManager().review(getPullRequest(), true, getComment());
+ notifyPullRequestChange(target);
Session.get().success("Approved");
return null;
} else {
@@ -1396,9 +1400,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
@Override
- protected String operate() {
+ protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
getPullRequestReviewManager().review(getPullRequest(), false, getComment());
+ notifyPullRequestChange(target);
Session.get().success("Requested For changes");
return null;
} else {
@@ -1433,18 +1438,19 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new MergeConfirmPanel(id, modal, latestUpdateId) {
@Override
- protected String operate() {
+ protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
var request = getPullRequest();
var branchProtection = getProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());
- var errorMessage = branchProtection.checkCommitMessage(getCommitMessage(),
- request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);
- if (errorMessage != null) {
- return errorMessage;
- } else {
- getPullRequestManager().merge(getPullRequest(), getCommitMessage());
- return null;
+ if (getCommitMessage() != null) {
+ var errorMessage = branchProtection.checkCommitMessage(getCommitMessage(),
+ request.getMergeStrategy() != SQUASH_SOURCE_BRANCH_COMMITS);
+ if (errorMessage != null)
+ return errorMessage;
}
+ getPullRequestManager().merge(getPullRequest(), getCommitMessage());
+ notifyPullRequestChange(target);
+ return null;
} else {
return "Can not perform this operation now";
}
@@ -1472,9 +1478,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
@Override
- protected String operate() {
+ protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
- getPullRequestManager().discard(getPullRequest(), getComment());
+ getPullRequestManager().discard(getPullRequest(), getComment());
+ notifyPullRequestChange(target);
return null;
} else {
return "Can not perform this operation now";
@@ -1508,9 +1515,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
@Override
- protected String operate() {
+ protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
getPullRequestManager().reopen(getPullRequest(), getComment());
+ notifyPullRequestChange(target);
return null;
} else {
return "Can not perform this operation now";
@@ -1546,9 +1554,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
@Override
- protected String operate() {
+ protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
getPullRequestManager().deleteSourceBranch(getPullRequest(), getComment());
+ notifyPullRequestChange(target);
Session.get().success("Deleted source branch");
return null;
} else {
@@ -1585,9 +1594,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new CommentableOperationConfirmPanel(id, modal, latestUpdateId) {
@Override
- protected String operate() {
+ protected String operate(AjaxRequestTarget target) {
if (canOperate()) {
getPullRequestManager().restoreSourceBranch(getPullRequest(), getComment());
+ notifyPullRequestChange(target);
Session.get().success("Restored source branch");
return null;
} else {
@@ -1649,11 +1659,14 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
public Component render(String componentId) {
if (getMainPageClass() == PullRequestCodeCommentsPage.class) {
Fragment fragment = new Fragment(componentId, "codeCommentsTabLinkFrag", PullRequestDetailPage.this);
+
+ // Do not show unresolved only by default as new indicator for
+ // code comments tab may also be caused by new activities in
+ // resolved issues
Link<Void> link = new ViewStateAwarePageLink<Void>("link",
PullRequestCodeCommentsPage.class,
- PullRequestCodeCommentsPage.paramsOf(getPullRequest(), "unresolved"));
+ PullRequestCodeCommentsPage.paramsOf(getPullRequest()));
link.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
@Override
protected String load() {
Date updateDate = getPullRequest().getCodeCommentsUpdateDate();
@@ -1664,11 +1677,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
}));
- link.add(new WebSocketObserver() {
+ link.add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
@@ -1716,4 +1729,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return new ViewStateAwarePageLink<Void>(componentId, ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));
}
+ private void notifyPullRequestChange(AjaxRequestTarget target) {
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
+ }
+
}
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 cdfacfea7f..19f3ef1a50 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
@@ -16,11 +16,12 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.behavior.WebSocketObserver;
+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;
@@ -249,9 +250,11 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
activitiesView.add(newSinceChangesRow(activitiesView.newChildId(), sinceDate));
}
+ var user = SecurityUtils.getUser();
for (PullRequestActivity activity: newActivities) {
Component row = newActivityRow(activitiesView.newChildId(), activity);
- row.add(AttributeAppender.append("class", "new"));
+ if (user == null || !user.equals(activity.getUser()))
+ row.add(AttributeAppender.append("class", "new"));
activitiesView.add(row);
}
@@ -316,6 +319,8 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
comment.setUser(getLoginUser());
comment.setContent(input.getModelObject());
OneDev.getInstance(PullRequestCommentManager.class).create(comment, new ArrayList<>());
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
input.clearMarkdown();
target.add(fragment);
@@ -343,11 +348,11 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
container.add(fragment);
}
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
@@ -382,10 +387,12 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
Collection<ObjectId> commitIds = new HashSet<>();
-
+
+ var user = SecurityUtils.getUser();
for (PullRequestActivity activity: newActivities) {
Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);
- newActivityRow.add(AttributeAppender.append("class", "new"));
+ if (user == null || !user.equals(activity.getUser()))
+ newActivityRow.add(AttributeAppender.append("class", "new"));
activitiesView.add(newActivityRow);
String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java
index badfbcec59..515c592e1c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java
@@ -12,7 +12,7 @@ import com.google.common.collect.Sets;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
@@ -57,11 +57,11 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {
protected void onInitialize() {
super.onInitialize();
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
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/PullRequestCommentedPanel.java
index 5c76970566..cd26f6b3cd 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/PullRequestCommentedPanel.java
@@ -1,17 +1,5 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-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.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
@@ -25,10 +13,22 @@ import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.facade.UserCache;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
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.page.project.pullrequests.detail.activities.SinceChangesLink;
import io.onedev.server.web.util.DeleteCallback;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+
+import java.util.ArrayList;
+import java.util.List;
@SuppressWarnings("serial")
class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
@@ -78,8 +78,10 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
protected void onSaveComment(AjaxRequestTarget target, String comment) {
if (comment.length() > PullRequestComment.MAX_CONTENT_LEN)
throw new ExplicitException("Comment too long");
- PullRequestCommentedPanel.this.getComment().setContent(comment);
- OneDev.getInstance(PullRequestCommentManager.class).update(PullRequestCommentedPanel.this.getComment());
+ var entity = PullRequestCommentedPanel.this.getComment();
+ entity.setContent(comment);
+ OneDev.getInstance(PullRequestCommentManager.class).update(entity);
+ notifyPullRequestChange(target);
}
@Override
@@ -114,19 +116,15 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
@Override
protected ContentVersionSupport getContentVersionSupport() {
- return new ContentVersionSupport() {
-
- @Override
- public long getVersion() {
- return 0;
- }
-
- };
+ return () -> 0;
}
@Override
protected DeleteCallback getDeleteCallback() {
- return deleteCallback;
+ return target -> {
+ notifyPullRequestChange(target);
+ deleteCallback.onDelete(target);
+ };
}
});
@@ -138,4 +136,8 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
return getModelObject();
}
+ private void notifyPullRequestChange(AjaxRequestTarget target) {
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getComment().getRequest().getId()));
+ }
}
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
index f0b8ef3e99..4827d067db 100644
--- 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
@@ -13,6 +13,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.facade.UserCache;
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;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
@@ -49,6 +50,8 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
OneDev.getInstance(PullRequestChangeManager.class).changeDescription(getPullRequest(), comment);
+ ((BasePage)getPage()).notifyObservableChange(target,
+ PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
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/PullRequestUpdatedPanel.java
index b1b80a5343..32f5e0be80 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/PullRequestUpdatedPanel.java
@@ -8,7 +8,7 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.gitsignature.SignatureStatusPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -117,11 +117,11 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
});
- add(new WebSocketObserver() {
+ add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getUpdate().getRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getUpdate().getRequest().getId()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index 3a7292c6cf..f2f1ba4d43 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -23,7 +23,7 @@ import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;
import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.floating.FloatingPanel;
@@ -270,11 +270,11 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
WebMarkupContainer head;
fragment.add(head = new WebMarkupContainer("changesHead"));
- head.add(new WebSocketObserver() {
+ head.add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
@@ -553,11 +553,11 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
Component content;
if (isOutdated()) {
content = new Fragment("content", "waitingFrag", this);
- content.add(new WebSocketObserver() {
+ content.add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
index 0b16941f8c..e10f219c24 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
@@ -21,7 +21,7 @@ import io.onedev.server.infomanager.VisitInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -107,11 +107,11 @@ public class PullRequestCodeCommentsPage extends PullRequestDetailPage {
});
- commentList.add(new WebSocketObserver() {
+ commentList.add(new ChangeObserver() {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));
+ return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java
index 53fdfa4a9d..780ff8eb24 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/OperationConfirmPanel.java
@@ -96,7 +96,7 @@ public abstract class OperationConfirmPanel extends Panel {
PullRequestUpdate latestUpdate = getLatestUpdate();
PullRequest request = latestUpdate.getRequest();
if (latestUpdate.equals(request.getLatestUpdate())) {
- var errorMessage = operate();
+ var errorMessage = operate(target);
if (errorMessage == null) {
modal.close();
} else {
@@ -143,7 +143,7 @@ public abstract class OperationConfirmPanel extends Panel {
}
@Nullable
- protected abstract String operate();
+ protected abstract String operate(AjaxRequestTarget target);
protected final Form<?> getForm() {
return form;
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 da6135d37e..900b43eb81 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
@@ -16,12 +16,11 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Link<Void>("test") {
-
+
+ add(new Link("test") {
@Override
public void onClick() {
}
-
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
index 4065e0b1e1..58b02d47e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/BuildEventBroadcaster.java
@@ -1,12 +1,10 @@
package io.onedev.server.web.websocket;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
import io.onedev.server.event.Listen;
import io.onedev.server.event.project.build.BuildEvent;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Project;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
@Singleton
public class BuildEventBroadcaster {
@@ -20,16 +18,7 @@ public class BuildEventBroadcaster {
@Listen
public void on(BuildEvent event) {
- Project project = event.getProject();
- Build build = event.getBuild();
-
- webSocketManager.notifyObservableChange(Build.getWebSocketObservable(build.getId()));
-
- String observable = "commit-status:" + project.getId() + ":" + build.getCommitHash();
- webSocketManager.notifyObservableChange(observable);
-
- observable = "job-status:" + project.getId() + ":" + build.getCommitHash() + ":" + build.getJobName();
- webSocketManager.notifyObservableChange(observable);
+ webSocketManager.notifyObservablesChange(event.getBuild().getChangeObservables(), event.getSourcePage());
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java
index 6b674d2e51..d7492d9361 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java
@@ -19,7 +19,7 @@ public class CodeCommentEventBroadcaster {
@Listen
public void on(CodeCommentEvent event) {
- webSocketManager.notifyObservableChange(CodeComment.getWebSocketObservable(event.getComment().getId()));
+ webSocketManager.notifyObservableChange(CodeComment.getChangeObservable(event.getComment().getId()), event.getSourcePage());
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
index 6f3ea5a9a6..32a398d3e1 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
@@ -18,7 +18,7 @@ public class CommitIndexedBroadcaster {
@Listen
public void on(CommitIndexed event) {
- webSocketManager.notifyObservableChange(CommitIndexed.getWebSocketObservable(event.getCommitId().name()));
+ webSocketManager.notifyObservableChange(CommitIndexed.getChangeObservable(event.getCommitId().name()), event.getSourcePage());
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java
index ef8416b86e..73c0a37978 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java
@@ -1,38 +1,10 @@
package io.onedev.server.web.websocket;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.wicket.Application;
-import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
-import org.apache.wicket.protocol.ws.api.registry.IKey;
-import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
-import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
-import org.apache.wicket.protocol.ws.api.registry.SimpleWebSocketConnectionRegistry;
-import org.joda.time.DateTime;
-import org.quartz.ScheduleBuilder;
-import org.quartz.SimpleScheduleBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.collect.Sets;
-
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.cluster.ClusterRunnable;
-import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.event.Listen;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
@@ -41,6 +13,27 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
import io.onedev.server.web.page.base.BasePage;
+import org.apache.wicket.Application;
+import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
+import org.apache.wicket.protocol.ws.api.registry.IKey;
+import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
+import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
+import org.apache.wicket.protocol.ws.api.registry.SimpleWebSocketConnectionRegistry;
+import org.joda.time.DateTime;
+import org.quartz.ScheduleBuilder;
+import org.quartz.SimpleScheduleBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static io.onedev.server.util.CollectionUtils.containsAny;
@Singleton
public class DefaultWebSocketManager implements WebSocketManager, Serializable {
@@ -92,7 +85,7 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
registeredObservables.put(sessionId, sessionPages);
}
IKey pageKey = new PageIdKey(page.getPageId());
- Collection<String> observables = page.findWebSocketObservables();
+ Collection<String> observables = page.findChangeObservables();
Collection<String> prevObservables = sessionPages.put(pageKey, observables);
if (prevObservables != null && !prevObservables.containsAll(observables)) {
IWebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, pageKey);
@@ -109,8 +102,8 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
@Nullable
private Collection<String> getRegisteredObservables(IWebSocketConnection connection) {
- PageKey pageKey = ((WebSocketConnection) connection).getPageKey();
if (connection.isOpen()) {
+ PageKey pageKey = ((WebSocketConnection) connection).getPageKey();
Map<IKey, Collection<String>> sessionPages = registeredObservables.get(pageKey.getSessionId());
if (sessionPages != null)
return sessionPages.get(pageKey.getPageId());
@@ -130,9 +123,14 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
}
}
+ @Override
+ public void notifyObservableChange(String observable, PageKey sourcePageKey) {
+ notifyObservablesChange(Sets.newHashSet(observable), sourcePageKey);
+ }
+
@Sessional
@Override
- public void notifyObservableChange(String observable) {
+ public void notifyObservablesChange(Collection<String> observables, @Nullable PageKey sourcePageKey) {
transactionManager.runAfterCommit(new ClusterRunnable() {
private static final long serialVersionUID = 1L;
@@ -140,11 +138,15 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
@Override
public void run() {
clusterManager.submitToAllServers(() -> {
- notifiedObservables.put(observable, new Date());
+ for (var observable: observables)
+ notifiedObservables.put(observable, new Date());
for (IWebSocketConnection connection: connectionRegistry.getConnections(application)) {
- Collection<String> registeredObservables = getRegisteredObservables(connection);
- if (registeredObservables != null && registeredObservables.contains(observable))
- notifyObservables(connection, Sets.newHashSet(observable));
+ PageKey pageKey = ((WebSocketConnection) connection).getPageKey();
+ if (sourcePageKey == null || !sourcePageKey.equals(pageKey)) {
+ Collection<String> registeredObservables = getRegisteredObservables(connection);
+ if (registeredObservables != null && containsAny(registeredObservables, observables))
+ notifyObservables(connection, observables);
+ }
}
return null;
});
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
index 3589bb6ffe..3746d30b81 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
@@ -1,13 +1,12 @@
package io.onedev.server.web.websocket;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
import io.onedev.server.event.Listen;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.project.issue.IssueEvent;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
@Singleton
public class IssueEventBroadcaster {
@@ -21,22 +20,15 @@ public class IssueEventBroadcaster {
@Listen
public void on(IssueEvent event) {
- webSocketManager.notifyObservableChange(Issue.getWebSocketObservable(event.getIssue().getId()));
- if (event.affectsListing())
- notifyIssueListObservableChange(event.getIssue().getProject());
+ webSocketManager.notifyObservablesChange(event.getIssue().getChangeObservables(event.affectsListing()), event.getSourcePage());
}
- private void notifyIssueListObservableChange(Project project) {
- do {
- webSocketManager.notifyObservableChange(Issue.getListWebSocketObservable(project.getId()));
- project = project.getParent();
- } while (project != null);
- }
-
@Listen
public void on(EntityRemoved event) {
- if (event.getEntity() instanceof Issue)
- notifyIssueListObservableChange(((Issue) event.getEntity()).getProject());
+ if (event.getEntity() instanceof Issue) {
+ var project = ((Issue) event.getEntity()).getProject();
+ webSocketManager.notifyObservablesChange(project.getIssueListObservables(), event.getSourcePage());
+ }
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/PageKey.java b/server-core/src/main/java/io/onedev/server/web/websocket/PageKey.java
index 914834d407..6089aacf7f 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/PageKey.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/PageKey.java
@@ -5,7 +5,11 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.wicket.protocol.ws.api.registry.IKey;
import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
-public class PageKey {
+import java.io.Serializable;
+
+public class PageKey implements Serializable {
+
+ private static final long serialVersionUID = 1L;
private final String sessionId;
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
index 9709dc5e8a..386ea1e41e 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
@@ -1,12 +1,12 @@
package io.onedev.server.web.websocket;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
import io.onedev.server.event.Listen;
import io.onedev.server.event.project.pullrequest.PullRequestEvent;
import io.onedev.server.model.PullRequest;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
@Singleton
public class PullRequestEventBroadcaster {
@@ -19,8 +19,7 @@ public class PullRequestEventBroadcaster {
@Listen
public void on(PullRequestEvent event) {
- webSocketManager.notifyObservableChange(PullRequest.getWebSocketObservable(event.getRequest().getId()));
- webSocketManager.notifyObservableChange(PullRequest.getClosedWebSocketObservable(event.getRequest().getId()));
+ webSocketManager.notifyObservableChange(PullRequest.getChangeObservable(event.getRequest().getId()), event.getSourcePage());
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java
index d02455b3e1..139d5c6022 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java
@@ -4,13 +4,18 @@ import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import io.onedev.server.web.page.base.BasePage;
+import javax.annotation.Nullable;
+import java.util.Collection;
+
public interface WebSocketManager {
void observe(BasePage page);
void onDestroySession(String sessionId);
- void notifyObservableChange(String observable);
+ void notifyObservablesChange(Collection<String> observables, @Nullable PageKey sourcePageKey);
+
+ void notifyObservableChange(String observable, @Nullable PageKey sourcePageKey);
void onConnect(IWebSocketConnection connection);
}