Skip to content

The Unified and Autonomous Development Platform

chore: refactor change observer

Robin Shen3d10294d5656
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java b/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
index e5a902df03..af90629c5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java
@@ -10,16 +10,33 @@ public abstract class ChangeObserver extends Behavior {
private static final long serialVersionUID = 1L;
+ private Collection<String> observables;
+
protected Component component;
@Override
public void bind(Component component) {
super.bind(component);
this.component = component;
+ component.setOutputMarkupId(true);
+ observables = findObservables();
+ }
+
+ @Override
+ public void beforeRender(Component component) {
+ observables = findObservables();
+ super.beforeRender(component);
}
- public abstract Collection<String> getObservables();
+ protected abstract Collection<String> findObservables();
- public abstract void onObservableChanged(IPartialPageRequestHandler handler);
+ public final Collection<String> getObservables() {
+ return observables;
+ }
+
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ if (component.isVisibleInHierarchy())
+ handler.add(component);
+ }
}
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 77f6ef3a1e..c92b1a40e0 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
@@ -72,7 +72,6 @@ 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;
@@ -1314,12 +1313,7 @@ public abstract class BuildListPanel extends Panel {
return new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 c8f249c943..ef1ab4264e 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
@@ -66,7 +66,7 @@ public class BuildLogPanel extends GenericPanel<Build> {
}
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(Build.getLogChangeObservable(getBuild().getId()));
}
@@ -82,7 +82,7 @@ public class BuildLogPanel extends GenericPanel<Build> {
}
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 9452cc40c2..13a2eadb06 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
@@ -1,32 +1,6 @@
package io.onedev.server.web.component.build.side;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.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.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
-
import com.google.common.collect.Sets;
-
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
@@ -61,6 +35,30 @@ import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSp
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.editablebean.LabelsBean;
+import org.apache.wicket.Component;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.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.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
@SuppressWarnings("serial")
public abstract class BuildSidePanel extends Panel {
@@ -326,12 +324,7 @@ public abstract class BuildSidePanel extends Panel {
general.add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 4fb363d02a..28781b2de8 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
@@ -1,23 +1,19 @@
package io.onedev.server.web.component.build.status;
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
+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.ChangeObserver;
+import io.onedev.server.web.component.svg.SpriteImage;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-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.ChangeObserver;
-import io.onedev.server.web.component.svg.SpriteImage;
+import javax.annotation.Nullable;
+import java.util.Collection;
@SuppressWarnings("serial")
public class BuildStatusIcon extends SpriteImage {
@@ -52,12 +48,7 @@ public class BuildStatusIcon extends SpriteImage {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return getChangeObservables();
}
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 2d0be9ef55..7664e55c0d 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
@@ -1,68 +1,17 @@
package io.onedev.server.web.component.codecomment;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-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;
-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;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.link.ExternalLink;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-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 com.google.common.collect.Sets;
-
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
import io.onedev.server.entitymanager.UrlManager;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentStatusChange;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAssignment;
-import io.onedev.server.model.PullRequestReview;
-import io.onedev.server.model.User;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
+import io.onedev.server.search.entity.codecomment.UnresolvedCriteria;
import io.onedev.server.search.entitytext.CodeCommentTextManager;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
@@ -70,6 +19,7 @@ import io.onedev.server.util.Provider;
import io.onedev.server.util.UrlUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.behavior.CodeCommentQueryBehavior;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.datatable.DefaultDataTable;
@@ -87,9 +37,45 @@ 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.project.codecomments.InvalidCodeCommentPage;
+import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+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 javax.annotation.Nullable;
+import java.util.*;
+import java.util.stream.Collectors;
@SuppressWarnings("serial")
public abstract class CodeCommentListPanel extends Panel {
@@ -793,14 +779,10 @@ public abstract class CodeCommentListPanel extends Panel {
super.onInitialize();
add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(CodeComment.getChangeObservable(commentId));
}
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
});
setOutputMarkupId(true);
setEscapeModelStrings(false);
@@ -862,14 +844,10 @@ public abstract class CodeCommentListPanel extends Panel {
var commentId = comment.getId();
item.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 ec9bf41a71..0741a6f751 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
@@ -470,7 +470,7 @@ public abstract class CodeCommentPanel extends Panel {
}
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(CodeComment.getChangeObservable(commentId));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html
index 5969be99b3..2cc9f12dad 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="command-palette" data-shit="">
+ <div class="command-palette">
<div class="modal-header">
<h5 class="modal-title">Command Palette</h5>
<button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
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 13e0860c7e..f8697eee9b 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
@@ -37,8 +37,8 @@ import io.onedev.server.web.WebConstants;
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.ChangeObserver;
+import io.onedev.server.web.behavior.PatternSetAssistBehavior;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
import io.onedev.server.web.component.comment.CommentInput;
@@ -65,7 +65,6 @@ 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;
@@ -359,12 +358,7 @@ public abstract class RevisionDiffPanel extends Panel {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return getChangeObservables();
}
});
@@ -1408,12 +1402,7 @@ public abstract class RevisionDiffPanel extends Panel {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
Set<String> observables = new HashSet<>();
if (annotationSupport != null && annotationSupport.getOpenComment() != null)
observables.add(CodeComment.getChangeObservable(annotationSupport.getOpenComment().getId()));
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 cee84c3ad2..5e9f778053 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
@@ -2,14 +2,12 @@ package io.onedev.server.web.component.issue;
import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueManager;
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;
@@ -19,20 +17,12 @@ import java.util.Collection;
@SuppressWarnings("serial")
public class IssueStateBadge extends Label {
+
+ private final IModel<Issue> issueModel;
- private final Long issueId;
-
- private final IModel<Issue> issueModel = new LoadableDetachableModel<Issue>() {
- @Override
- protected Issue load() {
- return OneDev.getInstance(IssueManager.class).load(issueId);
- }
-
- };
-
- public IssueStateBadge(String id, Long issueId) {
+ public IssueStateBadge(String id, IModel<Issue> issueModel) {
super(id);
- this.issueId = issueId;
+ this.issueModel = issueModel;
setDefaultModel(new LoadableDetachableModel<>() {
@Override
@@ -67,15 +57,10 @@ public class IssueStateBadge extends Label {
add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(Issue.getDetailChangeObservable(issueModel.getObject().getId()));
}
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
});
add(AttributeAppender.append("class", "issue-state badge"));
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 f23d9171a4..5f85354bd1 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
@@ -205,7 +205,7 @@ public abstract class IssueActivitiesPanel extends Panel {
}
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 333cdae3b2..733c03a83e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -81,6 +81,8 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
private String lastDescriptionTemplate;
+ private String editingTitle;
+
private AbstractPostAjaxBehavior ajaxBehavior;
public NewIssueEditor(String id) {
@@ -125,12 +127,11 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
@Override
protected List<Issue> load() {
- String title = titleInput.getInput();
- if (StringUtils.isNotBlank(title)) {
+ if (StringUtils.isNotBlank(editingTitle)) {
IssueTextManager issueTextManager = OneDev.getInstance(IssueTextManager.class);
return issueTextManager.query(
- new ProjectScope(getProject(), true, true),
- title, false, 0, 5);
+ new ProjectScope(getProject(), true, true),
+ editingTitle, false, 0, 5);
} else {
return new ArrayList<>();
}
@@ -150,12 +151,14 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
@Override
protected void onTypingDone(AjaxRequestTarget target) {
+ editingTitle = titleInput.getInput();
target.add(similarIssuesContainer);
}
@Override
protected void onError(AjaxRequestTarget target, RuntimeException e) {
super.onError(target, e);
+ editingTitle = null;
target.add(similarIssuesContainer);
}
@@ -167,7 +170,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
@Override
protected void populateItem(ListItem<Issue> item) {
- item.add(new IssueStateBadge("state", item.getModel().getObject().getId()));
+ item.add(new IssueStateBadge("state", item.getModel()));
item.add(new IssueLinkPanel("numberAndTitle") {
@Override
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 9554fcb295..2c9008c735 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
@@ -1392,7 +1392,7 @@ public abstract class IssueListPanel extends Panel {
};
- transitLink.add(new IssueStateBadge("state", ((Issue) fragment.getDefaultModelObject()).getId()));
+ transitLink.add(new IssueStateBadge("state", (IModel<Issue>) fragment.getDefaultModel()));
stateFragment.add(transitLink);
fieldsView.add(stateFragment.setOutputMarkupId(true));
@@ -1479,7 +1479,7 @@ public abstract class IssueListPanel extends Panel {
}
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(Issue.getDetailChangeObservable(issueId));
}
@@ -1507,14 +1507,10 @@ public abstract class IssueListPanel extends Panel {
var issueId = model.getObject().getId();
item.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 55b8b734a0..4a9eae5df8 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
@@ -16,7 +16,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -58,7 +57,12 @@ public abstract class IssueOperationsPanel extends Panel {
protected void onBeforeRender() {
WebMarkupContainer stateContainer = new WebMarkupContainer("state");
addOrReplace(stateContainer);
- stateContainer.add(new IssueStateBadge("state", getIssue().getId()));
+ stateContainer.add(new IssueStateBadge("state", new LoadableDetachableModel<>() {
+ @Override
+ protected Issue load() {
+ return getIssue();
+ }
+ }));
RepeatingView transitionsView = new RepeatingView("transitions");
@@ -162,12 +166,7 @@ public abstract class IssueOperationsPanel extends Panel {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(IssueOperationsPanel.this);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
index 58f0f082e8..807121ce62 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
@@ -33,7 +33,7 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
protected void onInitialize() {
super.onInitialize();
- add(new IssueStateBadge("state", getModel().getObject().getId()));
+ add(new IssueStateBadge("state", getModel()));
Project project = ((ProjectPage)getPage()).getProject();
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 ae69cbe6d6..0aa46c41a7 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
@@ -156,12 +156,7 @@ public abstract class IssueSidePanel extends Panel {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(IssueSidePanel.this);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
}
@@ -524,7 +519,12 @@ public abstract class IssueSidePanel extends Panel {
};
- stateLink.add(new IssueStateBadge("badge", linkedIssueId).add(AttributeAppender.append("class", "badge-sm")));
+ stateLink.add(new IssueStateBadge("badge", new LoadableDetachableModel<>() {
+ @Override
+ protected Issue load() {
+ return getIssueManager().load(linkedIssueId);
+ }
+ }).add(AttributeAppender.append("class", "badge-sm")));
fragment.add(stateLink);
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 d3f9674886..7ce745a0a2 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
@@ -1,29 +1,6 @@
package io.onedev.server.web.component.job.jobinfo;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-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;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.google.common.collect.Lists;
-
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.entitymanager.BuildManager;
@@ -40,6 +17,20 @@ import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.RunJobLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.annotation.Nullable;
+import java.util.*;
@SuppressWarnings("serial")
public abstract class JobInfoButton extends Panel {
@@ -128,12 +119,7 @@ public abstract class JobInfoButton extends Panel {
detailLink.add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 12b46dbd23..c255cd4313 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
@@ -15,7 +15,6 @@ 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;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -163,12 +162,7 @@ public abstract class JobListPanel extends Panel {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return getChangeObservables();
}
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 e14b5cf8fd..840019edb4 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
@@ -1,16 +1,20 @@
package io.onedev.server.web.component.pullrequest.assignment;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
+import com.google.common.collect.Sets;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestAssignmentManager;
+import io.onedev.server.model.PullRequest;
+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.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;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.list.ListItem;
@@ -19,18 +23,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.google.common.collect.Sets;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestAssignmentManager;
-import io.onedev.server.model.PullRequest;
-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.ChangeObserver;
-import io.onedev.server.web.component.user.ident.Mode;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import java.util.*;
@SuppressWarnings("serial")
public abstract class AssignmentListPanel extends Panel {
@@ -158,13 +151,7 @@ public abstract class AssignmentListPanel extends Panel {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- if (isVisibleInHierarchy())
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 f553ccc32c..acb8c33478 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
@@ -1,23 +1,18 @@
package io.onedev.server.web.component.pullrequest.build;
-import static io.onedev.server.model.Build.NAME_COMMIT;
-import static io.onedev.server.model.Build.NAME_JOB;
-import static io.onedev.server.model.Build.NAME_PULL_REQUEST;
-import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
-import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
-import static io.onedev.server.util.criteria.Criteria.quote;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.google.common.collect.Sets;
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.server.model.Build;
+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.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;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
import org.apache.wicket.Component;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -31,34 +26,28 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.unbescape.html.HtmlEscape;
-import com.google.common.collect.Sets;
+import java.util.*;
+import java.util.stream.Collectors;
-import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.server.model.Build;
-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.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;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
+import static io.onedev.server.model.Build.*;
+import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
+import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
+import static io.onedev.server.util.criteria.Criteria.quote;
@SuppressWarnings("serial")
public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInfo>> {
public PullRequestJobsPanel(String id) {
super(id);
- setModel(new LoadableDetachableModel<List<JobBuildInfo>>() {
+ setModel(new LoadableDetachableModel<>() {
@Override
protected List<JobBuildInfo> load() {
List<JobBuildInfo> listOfJobBuildInfo = new ArrayList<>();
PullRequest request = getPullRequest();
Map<String, List<Build>> map = new HashMap<>();
- for (Build build: request.getCurrentBuilds()) {
+ for (Build build : request.getCurrentBuilds()) {
String jobName = build.getJobName();
List<Build> list = map.get(jobName);
if (list == null) {
@@ -67,7 +56,7 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
}
list.add(build);
}
- for (Map.Entry<String, List<Build>> entry: map.entrySet()) {
+ for (Map.Entry<String, List<Build>> entry : map.entrySet()) {
String jobName = entry.getKey();
if (SecurityUtils.canAccess(getPullRequest().getTargetProject(), jobName)) {
List<Build> builds = new ArrayList<>(entry.getValue());
@@ -76,17 +65,10 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
listOfJobBuildInfo.add(new JobBuildInfo(jobName, required, builds));
}
}
- Collections.sort(listOfJobBuildInfo, new Comparator<JobBuildInfo>() {
-
- @Override
- public int compare(JobBuildInfo o1, JobBuildInfo o2) {
- return o1.getBuilds().iterator().next().getId().compareTo(o2.getBuilds().iterator().next().getId());
- }
-
- });
+ Collections.sort(listOfJobBuildInfo, (Comparator<JobBuildInfo>) (o1, o2) -> o1.getBuilds().iterator().next().getId().compareTo(o2.getBuilds().iterator().next().getId()));
return listOfJobBuildInfo;
}
-
+
});
}
@@ -94,7 +76,7 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
protected void onInitialize() {
super.onInitialize();
- add(new ListView<JobBuildInfo>("jobs", getModel()) {
+ add(new ListView<>("jobs", getModel()) {
@Override
protected void populateItem(ListItem<JobBuildInfo> item) {
@@ -103,9 +85,9 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
String jobName = jobBuilds.getJobName();
Status status = Status.getOverallStatus(jobBuilds.getBuilds()
.stream()
- .map(it->it.getStatus())
+ .map(it -> it.getStatus())
.collect(Collectors.toSet()));
-
+
WebMarkupContainer link = new DropdownLink("job") {
@Override
@@ -116,26 +98,26 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
protected List<Build> load() {
return item.getModelObject().getBuilds();
}
-
+
}) {
-
+
@Override
protected Component newListLink(String componentId) {
MergePreview mergePreview = getPullRequest().checkMergePreview();
if (mergePreview != null && mergePreview.getMergeCommitHash() != null) {
- String query = ""
+ String query = ""
+ quote(NAME_PULL_REQUEST) + " " + getRuleName(Is) + " " + quote("#" + getPullRequest().getNumber())
+ " " + getRuleName(And) + " "
+ quote(NAME_COMMIT) + " " + getRuleName(Is) + " " + quote(mergePreview.getMergeCommitHash())
+ " " + getRuleName(And) + " "
+ quote(NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);
- return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,
+ return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,
ProjectBuildsPage.paramsOf(getPullRequest().getTargetProject(), query, 0));
} else {
return super.newListLink(componentId);
}
}
-
+
};
}
@@ -145,22 +127,22 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
String title;
if (status != null) {
if (status != Status.SUCCESSFUL)
- title = "Some builds are ";
+ title = "Some builds are ";
else
- title = "Builds are ";
+ title = "Builds are ";
title += status.toString().toLowerCase() + ", click for details";
} else {
title = "No builds";
}
tag.put("title", title);
}
-
+
};
-
+
link.add(new BuildStatusIcon("status", Model.of(status)));
item.add(link);
- if (jobBuilds.isRequired())
+ if (jobBuilds.isRequired())
link.add(new Label("name", HtmlEscape.escapeHtml5(jobName) + " <span class='text-danger'>*</span>").setEscapeModelStrings(false));
else
link.add(new Label("name", jobName));
@@ -172,20 +154,13 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf
super.onConfigure();
setVisible(!getModelObject().isEmpty());
}
-
+
});
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- component.configure();
- if (component.isVisible())
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index e2845736b3..0e3783ae31 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -47,7 +47,7 @@
</div>
<div class="secondary d-flex flex-wrap row-gap-3">
<div class="status flex-shrink-0 mr-3"><span wicket:id="status"></span></div>
- <div class="review mr-3" wicket:id="reviews"></div>
+ <div class="reviews mr-3" wicket:id="reviews"></div>
<div class="jobs mr-3" wicket:id="jobs"></div>
<div class="last-update ml-auto d-none d-lg-block text-muted font-size-sm">
<a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
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 d8b6b49757..100b096e55 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
@@ -54,7 +54,6 @@ 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;
@@ -859,16 +858,11 @@ public abstract class PullRequestListPanel extends Panel {
var requestId = request.getId();
item.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 87ad6a5890..eac436cf1b 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
@@ -17,7 +17,6 @@ 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;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -211,13 +210,7 @@ public abstract class ReviewListPanel extends Panel {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- if (isVisibleInHierarchy())
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(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 e1740d39aa..37546d03d5 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
@@ -276,7 +276,7 @@ public abstract class BasePage extends WebPage {
List<String> observables = Splitter.on('\n').splitToList(
message.getText().substring(WebSocketMessages.OBSERVABLE_CHANGED.length()+1));
for (ChangeObserver observer: findChangeObservers()) {
- if (CollectionUtils.containsAny(observer.getObservables(), observables))
+ if (CollectionUtils.containsAny(observer.getObservables(), observables))
observer.onObservableChanged(handler);
}
}
@@ -338,14 +338,7 @@ public abstract class BasePage extends WebPage {
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(ChangeObserver.class));
- }
-
- });
+ visitChildren(Component.class, (IVisitor<Component, Void>) (object, visit) -> observers.addAll(object.getBehaviors(ChangeObserver.class)));
return observers;
}
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 db105b40ec..afd9823b5e 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
@@ -66,7 +66,6 @@ import io.onedev.server.web.resource.RawBlobResource;
import io.onedev.server.web.resource.RawBlobResourceReference;
import io.onedev.server.web.util.EditParamsAware;
import io.onedev.server.web.util.FileUpload;
-import io.onedev.server.web.websocket.WebSocketManager;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
@@ -250,12 +249,12 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(revisionIndexing);
+ super.onObservableChanged(handler);
resizeWindow(handler);
}
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
Set<String> observables = new HashSet<>();
if (resolvedRevision != null)
observables.add(CommitIndexed.getChangeObservable(getProject().getRevCommit(resolvedRevision, true).name()));
@@ -1015,7 +1014,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
resolvedRevision = null;
resolvedRevision = getProject().getRevCommit(state.blobIdent.revision, true).copy();
- OneDev.getInstance(WebSocketManager.class).observe(this);
newRevisionPicker(target);
newCommitStatus(target);
target.add(revisionIndexing);
@@ -1222,7 +1220,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
newBuildSupportNote(target);
newBlobContent(target);
resizeWindow(target);
- OneDev.getInstance(WebSocketManager.class).observe(this);
} else if (state.position != null) {
if (get(BLOB_CONTENT_ID) instanceof Positionable) {
// This logic is added for performance reason, we do not want to
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 b8d36e7b73..bd8b6c2530 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
@@ -74,7 +74,6 @@ 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;
@@ -370,12 +369,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
Set<String> observables = new HashSet<>();
if (context.getOpenComment() != null)
observables.add(CodeComment.getChangeObservable(context.getOpenComment().getId()));
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 0a62eb52b4..229972a6d9 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
@@ -5,6 +5,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobDependency;
import io.onedev.server.buildspec.param.spec.ParamSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.build.BuildUpdated;
@@ -16,7 +17,6 @@ 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.buildspecmodel.inputspec.InputContext;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
@@ -168,12 +168,12 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
+ super.onObservableChanged(handler);
handler.appendJavaScript("$(window).resize();");
}
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(Build.getDetailChangeObservable(buildId));
}
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 7416bbe4e8..a8e87c7b13 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
@@ -22,7 +22,6 @@ import io.onedev.server.web.component.user.ident.Mode;
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;
@@ -79,7 +78,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
};
transitLink.setVisible(displayFields.contains(Issue.NAME_STATE));
- transitLink.add(new IssueStateBadge("state", issueModel.getObject().getId()));
+ transitLink.add(new IssueStateBadge("state", issueModel));
fragment.add(transitLink);
@@ -163,7 +162,6 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected void onClose(AjaxRequestTarget target) {
modal.close();
- OneDev.getInstance(WebSocketManager.class).observe(page);
}
@Override
@@ -197,13 +195,6 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected void onDeletedIssue(AjaxRequestTarget target) {
modal.close();
- OneDev.getInstance(WebSocketManager.class).observe(page);
- }
-
- @Override
- protected void onAfterRender() {
- OneDev.getInstance(WebSocketManager.class).observe(page);
- super.onAfterRender();
}
@Override
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 150e0ac2f7..c7788945a3 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
@@ -4,7 +4,6 @@ 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;
@@ -33,12 +32,7 @@ abstract class CardCountLabel extends Label {
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(Issue.getListChangeObservable(getProject().getId()));
}
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 84d3d6fd9d..ff7eb909fb 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
@@ -135,7 +135,7 @@ abstract class CardListPanel extends Panel {
}
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(Issue.getListChangeObservable(getProject().getId()));
}
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 8f0d89c519..e637d97a8f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -1,45 +1,14 @@
package io.onedev.server.web.page.project.issues.detail;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.persistence.EntityNotFoundException;
-import javax.validation.ValidationException;
-
import com.google.common.collect.Lists;
-import io.onedev.server.web.behavior.ChangeObserver;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Page;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.cycle.IRequestCycleListener;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.server.OneDev;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.infomanager.VisitInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
@@ -48,6 +17,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;
import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;
@@ -66,6 +36,33 @@ import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.IRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import javax.persistence.EntityNotFoundException;
+import javax.validation.ValidationException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
@SuppressWarnings("serial")
public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext {
@@ -185,12 +182,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
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 1419841c93..6f73042bfa 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
@@ -23,8 +23,8 @@ import io.onedev.server.util.ProjectScopedNumber;
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.ChangeObserver;
+import io.onedev.server.web.behavior.ReferenceInputBehavior;
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;
@@ -322,15 +322,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
summaryContainer.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
});
summaryContainer.setOutputMarkupId(true);
add(summaryContainer);
@@ -1072,15 +1067,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
fragment.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
});
fragment.setOutputMarkupId(true);
@@ -1220,12 +1210,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
add(new ChangeObserver() {
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
- @Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@@ -1318,13 +1303,13 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
operationsContainer.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@Override
public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
+ super.onObservableChanged(handler);
handler.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
}
@@ -1680,14 +1665,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
link.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
});
link.setOutputMarkupId(true);
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 19f3ef1a50..3e455de18e 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
@@ -351,7 +351,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
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 515c592e1c..ab26c02eb1 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
@@ -1,20 +1,17 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities;
-import java.util.Collection;
-import java.util.Date;
-
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import com.google.common.collect.Sets;
-
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
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;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.Collection;
+import java.util.Date;
@SuppressWarnings("serial")
public class SinceChangesLink extends ViewStateAwarePageLink<Void> {
@@ -60,15 +57,10 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {
add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
-
});
setOutputMarkupPlaceholderTag(true);
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 32f5e0be80..25be1b393f 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
@@ -18,7 +18,6 @@ import io.onedev.server.web.component.user.ident.PersonIdentPanel;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
@@ -120,14 +119,9 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getUpdate().getRequest().getId()));
}
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
});
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 f2f1ba4d43..7000f616ec 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
@@ -32,7 +32,6 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.util.EditParamsAware;
import io.onedev.server.web.util.RevisionDiff;
-import io.onedev.server.web.websocket.WebSocketManager;
import org.apache.commons.lang3.tuple.ImmutableTriple;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -273,14 +272,9 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
head.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
});
head.setOutputMarkupId(true);
@@ -315,7 +309,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
state.oldCommitHash = commitsModel.getObject().get(index).name();
}
newRevisionDiff(target, fragment);
- OneDev.getInstance(WebSocketManager.class).observe(PullRequestChangesPage.this);
}
target.add(head);
pushState(target);
@@ -362,7 +355,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
index++;
state.newCommitHash = commitsModel.getObject().get(index).name();
newRevisionDiff(target, fragment);
- OneDev.getInstance(WebSocketManager.class).observe(PullRequestChangesPage.this);
}
target.add(head);
pushState(target);
@@ -389,7 +381,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
state.newCommitHash = params.getParameterValue("newCommit").toString();
target.add(head);
newRevisionDiff(target, fragment);
- OneDev.getInstance(WebSocketManager.class).observe(PullRequestChangesPage.this);
pushState(target);
dropdown.close();
}
@@ -531,7 +522,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
state.newCommitHash = getPullRequest().getLatestUpdate().getHeadCommitHash();
target.add(head);
newRevisionDiff(target, fragment);
- OneDev.getInstance(WebSocketManager.class).observe(PullRequestChangesPage.this);
pushState(target);
}
@@ -556,7 +546,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
content.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
@@ -643,8 +633,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
state = (State) data;
newContent(target);
-
- OneDev.getInstance(WebSocketManager.class).observe(this);
}
private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {
@@ -812,7 +800,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {
state.commentId = comment.getId();
state.mark = getPermanentMark(comment.getMark());
- OneDev.getInstance(WebSocketManager.class).observe(this);
pushState(target);
}
@@ -820,7 +807,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
public void onCommentClosed(AjaxRequestTarget target) {
state.commentId = null;
state.mark = null;
- OneDev.getInstance(WebSocketManager.class).observe(this);
pushState(target);
}
@@ -845,7 +831,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
state.commentId = null;
state.mark = getPermanentMark(mark);
pushState(target);
- OneDev.getInstance(WebSocketManager.class).observe(this);
}
@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 e10f219c24..d60558c7bc 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
@@ -1,21 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail.codecomments;
-import java.io.Serializable;
-import java.util.Collection;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.cycle.IRequestCycleListener;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import com.google.common.collect.Sets;
-
import io.onedev.server.OneDev;
import io.onedev.server.infomanager.VisitInfoManager;
import io.onedev.server.model.Project;
@@ -25,6 +10,17 @@ 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;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.IRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.Collection;
@SuppressWarnings("serial")
public class PullRequestCodeCommentsPage extends PullRequestDetailPage {
@@ -110,14 +106,9 @@ public class PullRequestCodeCommentsPage extends PullRequestDetailPage {
commentList.add(new ChangeObserver() {
@Override
- public Collection<String> getObservables() {
+ public Collection<String> findObservables() {
return Sets.newHashSet(PullRequest.getChangeObservable(getPullRequest().getId()));
}
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
- }
});
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 900b43eb81..131729b1a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,10 +1,11 @@
package io.onedev.server.web.page.test;
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.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class TestPage extends BasePage {
@@ -16,10 +17,10 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
-
- add(new Link("test") {
+
+ add(new AjaxLink<Void>("test") {
@Override
- public void onClick() {
+ public void onClick(AjaxRequestTarget target) {
}
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java
index 73c0a37978..4286ca045f 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
@@ -10,6 +10,7 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.util.Pair;
import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
import io.onedev.server.web.page.base.BasePage;
@@ -56,7 +57,7 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
private final IWebSocketConnectionRegistry connectionRegistry = new SimpleWebSocketConnectionRegistry();
- private final Map<String, Date> notifiedObservables = new ConcurrentHashMap<>();
+ private final Map<String, Pair<PageKey, Date>> notifiedObservables = new ConcurrentHashMap<>();
private String keepAliveTaskId;
@@ -79,14 +80,14 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
public void observe(BasePage page) {
String sessionId = page.getSession().getId();
if (sessionId != null) {
- Map<IKey, Collection<String>> sessionPages = registeredObservables.get(sessionId);
- if (sessionPages == null) {
- sessionPages = new ConcurrentHashMap<>();
- registeredObservables.put(sessionId, sessionPages);
+ Map<IKey, Collection<String>> observablesOfSession = registeredObservables.get(sessionId);
+ if (observablesOfSession == null) {
+ observablesOfSession = new ConcurrentHashMap<>();
+ registeredObservables.put(sessionId, observablesOfSession);
}
IKey pageKey = new PageIdKey(page.getPageId());
Collection<String> observables = page.findChangeObservables();
- Collection<String> prevObservables = sessionPages.put(pageKey, observables);
+ Collection<String> prevObservables = observablesOfSession.put(pageKey, observables);
if (prevObservables != null && !prevObservables.containsAll(observables)) {
IWebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, pageKey);
if (connection != null)
@@ -104,9 +105,9 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
private Collection<String> getRegisteredObservables(IWebSocketConnection connection) {
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());
+ Map<IKey, Collection<String>> observablesOfSession = registeredObservables.get(pageKey.getSessionId());
+ if (observablesOfSession != null)
+ return observablesOfSession.get(pageKey.getPageId());
else
return null;
} else {
@@ -139,7 +140,7 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
public void run() {
clusterManager.submitToAllServers(() -> {
for (var observable: observables)
- notifiedObservables.put(observable, new Date());
+ notifiedObservables.put(observable, new Pair<>(sourcePageKey, new Date()));
for (IWebSocketConnection connection: connectionRegistry.getConnections(application)) {
PageKey pageKey = ((WebSocketConnection) connection).getPageKey();
if (sourcePageKey == null || !sourcePageKey.equals(pageKey)) {
@@ -191,8 +192,8 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
@Override
public void execute() {
Date threshold = new DateTime().minusSeconds(TOLERATE_SECONDS).toDate();
- for (Iterator<Map.Entry<String, Date>> it = notifiedObservables.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().before(threshold))
+ for (var it = notifiedObservables.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getRight().before(threshold))
it.remove();
}
}
@@ -221,12 +222,17 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {
}
private void notifyPastObservables(IWebSocketConnection connection) {
+ PageKey pageKey = ((WebSocketConnection) connection).getPageKey();
Collection<String> registeredObservables = getRegisteredObservables(connection);
if (registeredObservables != null) {
Set<String> observables = new HashSet<>();
- for (String observable: notifiedObservables.keySet()) {
- if (registeredObservables.contains(observable))
+ for (var entry: notifiedObservables.entrySet()) {
+ var observable = entry.getKey();
+ var sourcePageKey = entry.getValue().getLeft();
+ if (registeredObservables.contains(observable)
+ && (sourcePageKey == null || !sourcePageKey.equals(pageKey))) {
observables.add(observable);
+ }
}
if (!observables.isEmpty())
notifyObservables(connection, observables);