Skip to content

The Unified and Autonomous Development Platform

Auto-update issue page upon state or field change

Robin Shenc365d0bb3775
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 453603ae07..8af52aeb2d 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
@@ -188,8 +188,6 @@ public abstract class IssueActivitiesPanel extends Panel {
return row;
}
-
-
@Override
protected void onInitialize() {
super.onInitialize();
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 4931476e44..6ff17bddf6 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
@@ -14,6 +14,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
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.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -47,6 +48,7 @@ import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.query.IssueQueryConstants;
+import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
@@ -72,16 +74,14 @@ public abstract class IssueOperationsPanel extends Panel {
replace(actionOptions);
target.add(actionOptions);
} else {
- add(actionOptions);
+ addOrReplace(actionOptions);
}
}
@Override
- protected void onInitialize() {
- super.onInitialize();
-
+ protected void onBeforeRender() {
WebMarkupContainer stateContainer = new WebMarkupContainer("state");
- add(stateContainer);
+ addOrReplace(stateContainer);
stateContainer.add(new IssueStateLabel("state", new AbstractReadOnlyModel<Issue>() {
@Override
@@ -153,7 +153,7 @@ public abstract class IssueOperationsPanel extends Panel {
editor.newComponentContext(), fieldBean, trigger.getPromptFields());
IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);
manager.changeState(getIssue(), transition.getToState(), fieldValues, comment);
- onStateChanged(target);
+ target.add(IssueOperationsPanel.this);
}
});
@@ -179,7 +179,7 @@ public abstract class IssueOperationsPanel extends Panel {
}
}
- add(transitionsView);
+ addOrReplace(transitionsView);
List<String> criterias = new ArrayList<>();
if (getIssue().getMilestone() != null) {
@@ -216,7 +216,7 @@ public abstract class IssueOperationsPanel extends Panel {
query = null;
Component createIssueButton = newCreateIssueButton("newIssue", query);
- add(createIssueButton);
+ addOrReplace(createIssueButton);
stateContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
@@ -231,11 +231,39 @@ public abstract class IssueOperationsPanel extends Panel {
}));
- add(new SideInfoLink("moreInfo"));
+ addOrReplace(new SideInfoLink("moreInfo"));
newEmptyActionOptions(null);
+
+ super.onBeforeRender();
}
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new WebSocketObserver() {
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler, String observable) {
+ handler.add(IssueOperationsPanel.this);
+ }
+
+ @Override
+ public void onConnectionOpened(IPartialPageRequestHandler handler) {
+ handler.add(IssueOperationsPanel.this);
+ }
+
+ @Override
+ public Collection<String> getObservables() {
+ return Lists.newArrayList(Issue.getWebSocketObservable(getIssue().getId()));
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -244,8 +272,6 @@ public abstract class IssueOperationsPanel extends Panel {
protected abstract Issue getIssue();
- protected abstract void onStateChanged(AjaxRequestTarget target);
-
protected abstract Component newCreateIssueButton(String componentId, String templateQuery);
}
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 6a4fc9eade..2aae935bcd 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,6 +19,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -36,6 +37,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
+import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueManager;
@@ -57,6 +60,7 @@ import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.ajaxlistener.AppendLoadingIndicatorListener;
+import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
@@ -81,10 +85,8 @@ public abstract class IssueSidePanel extends Panel {
}
@Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new EntityNavPanel<Issue>("issueNav") {
+ protected void onBeforeRender() {
+ addOrReplace(new EntityNavPanel<Issue>("issueNav") {
@Override
protected EntityQuery<Issue> parse(String queryString) {
@@ -108,11 +110,11 @@ public abstract class IssueSidePanel extends Panel {
});
- add(newFieldsContainer());
- add(newMilestoneContainer());
- add(newVotesContainer());
+ addOrReplace(newFieldsContainer());
+ addOrReplace(newMilestoneContainer());
+ addOrReplace(newVotesContainer());
- add(new EntityWatchesPanel("watches") {
+ addOrReplace(new EntityWatchesPanel("watches") {
@Override
protected void onSaveWatch(EntityWatch watch) {
@@ -131,7 +133,33 @@ public abstract class IssueSidePanel extends Panel {
});
- add(newDeleteLink("delete"));
+ addOrReplace(newDeleteLink("delete"));
+
+ super.onBeforeRender();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new WebSocketObserver() {
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler, String observable) {
+ handler.add(IssueSidePanel.this);
+ }
+
+ @Override
+ public void onConnectionOpened(IPartialPageRequestHandler handler) {
+ handler.add(IssueSidePanel.this);
+ }
+
+ @Override
+ public Collection<String> getObservables() {
+ return Lists.newArrayList(Issue.getWebSocketObservable(getIssue().getId()));
+ }
+
+ });
setOutputMarkupId(true);
}
@@ -159,7 +187,6 @@ public abstract class IssueSidePanel extends Panel {
}
};
-
fragment.setOutputMarkupId(true);
fragment.add(new ListView<Input>("fields", fieldsModel) {
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 96ac1ec2a5..6c77c50b81 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
@@ -34,10 +34,12 @@ import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.user.avatar.UserAvatar;
import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
import io.onedev.server.web.util.ReferenceTransformer;
+import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
abstract class BoardCardPanel extends GenericPanel<Issue> {
@@ -128,6 +130,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected void onClose(AjaxRequestTarget target) {
modal.close();
+ OneDev.getInstance(WebSocketManager.class).notifyObserverChange((BasePage) BoardCardPanel.this.getPage());
}
@Override
@@ -161,6 +164,13 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected void onDeletedIssue(AjaxRequestTarget target) {
modal.close();
+ OneDev.getInstance(WebSocketManager.class).notifyObserverChange((BasePage) BoardCardPanel.this.getPage());
+ }
+
+ @Override
+ protected void onAfterRender() {
+ OneDev.getInstance(WebSocketManager.class).notifyObserverChange((BasePage) getPage());
+ super.onAfterRender();
}
};
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 fabcc33ae0..b88d57e3b0 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
@@ -78,8 +78,10 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
}
@Override
- protected void onBeforeRender() {
- addOrReplace(new IssueTitlePanel("title") {
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new IssueTitlePanel("title") {
@Override
protected Issue getIssue() {
@@ -88,25 +90,20 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
});
- addOrReplace(new IssueOperationsPanel("operations") {
+ add(new IssueOperationsPanel("operations") {
@Override
protected Issue getIssue() {
return CardDetailPanel.this.getIssue();
}
- @Override
- protected void onStateChanged(AjaxRequestTarget target) {
- target.add(CardDetailPanel.this);
- }
-
@Override
protected Component newCreateIssueButton(String componentId, String templateQuery) {
return new WebMarkupContainer(componentId).setVisible(false);
}
});
-
+
List<Tab> tabs = new ArrayList<>();
tabs.add(new AjaxActionTab(Model.of("Activities")) {
@@ -153,9 +150,9 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
});
}
- addOrReplace(new Tabbable("tabs", tabs).setOutputMarkupId(true));
+ add(new Tabbable("tabs", tabs).setOutputMarkupId(true));
- addOrReplace(new SideInfoPanel("moreInfo") {
+ add(new SideInfoPanel("moreInfo") {
@Override
protected Component newContent(String componentId) {
@@ -196,15 +193,23 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
}
});
- addOrReplace(activities = newActivitiesPanel());
+ add(activities = newActivitiesPanel());
- super.onBeforeRender();
- }
+ add(new AjaxLink<Void>("close") {
- @Override
- protected void onInitialize() {
- super.onInitialize();
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ }
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onClose(target);
+ }
+
+ });
+
RequestCycle.get().getListeners().add(new IRequestCycleListener() {
@Override
@@ -248,21 +253,6 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
});
- add(new AjaxLink<Void>("close") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
-
setOutputMarkupId(true);
}
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 c98bf05cb1..7a3db6f19e 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
@@ -113,11 +113,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
return IssueDetailPage.this.getIssue();
}
- @Override
- protected void onStateChanged(AjaxRequestTarget target) {
- setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));
- }
-
@Override
protected Component newCreateIssueButton(String componentId, String templateQuery) {
return new BookmarkablePageLink<Void>(componentId, NewIssuePage.class, NewIssuePage.paramsOf(getProject(), templateQuery));
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 e560db2251..25f0bf3416 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
@@ -7,7 +7,6 @@ import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.issue.BoardSpec;
import io.onedev.server.model.Issue;
-import io.onedev.server.web.util.WicketUtils;
@Singleton
public class IssueEventBroadcaster {
@@ -21,7 +20,7 @@ public class IssueEventBroadcaster {
@Listen
public void on(IssueEvent event) {
- webSocketManager.notifyObservableChange(Issue.getWebSocketObservable(event.getIssue().getId()), WicketUtils.getPageKey());
+ webSocketManager.notifyObservableChange(Issue.getWebSocketObservable(event.getIssue().getId()), null);
if (event.affectsBoards())
webSocketManager.notifyObservableChange(BoardSpec.getWebSocketObservable(event.getIssue().getProject().getId()), null);
}