Skip to content

The Unified and Autonomous Development Platform

Fix the issue that newly created branch/tag does not reflect commit status

Robin Shen8e18fbb58143
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 f3e1f2a8ec..c8e5ecfcef 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
@@ -246,7 +246,7 @@ public abstract class BasePage extends WebPage {
@Override
protected void onAfterRender() {
- AppLoader.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ AppLoader.getInstance(WebSocketManager.class).observe(this);
super.onAfterRender();
}
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 5ad08971fe..1f383aaa26 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
@@ -851,7 +851,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
resolvedRevision = null;
resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ OneDev.getInstance(WebSocketManager.class).observe(this);
newRevisionPicker(target);
newCommitStatus(target);
target.add(revisionIndexing);
@@ -1057,7 +1057,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
newBuildSupportNote(target);
newBlobContent(target);
resizeWindow(target);
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ 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
@@ -1102,14 +1102,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
state.commentId = null;
state.position = null;
}
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ OneDev.getInstance(WebSocketManager.class).observe(this);
pushState(target);
}
@Override
public void onAddComment(AjaxRequestTarget target, PlanarRange range) {
state.commentId = null;
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ OneDev.getInstance(WebSocketManager.class).observe(this);
state.position = SourceRendererProvider.getPosition(range);
pushState(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 2503c22cd9..728e32acae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -19,8 +19,11 @@ import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.PercentValidator;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.AjaxRequestTarget.IJavaScriptResponse;
import org.apache.wicket.ajax.IAjaxIndicatorAware;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -90,6 +93,7 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
public class ProjectBranchesPage extends ProjectPage {
@@ -446,6 +450,24 @@ public class ProjectBranchesPage extends ProjectPage {
modal.close();
target.add(branchesContainer);
newPagingNavigation(target);
+
+ target.addListener(new AjaxRequestTarget.IListener() {
+
+ @Override
+ public void onBeforeRespond(Map<String, Component> map, AjaxRequestTarget target) {
+ }
+
+ @Override
+ public void onAfterRespond(Map<String, Component> map, IJavaScriptResponse response) {
+ OneDev.getInstance(WebSocketManager.class).observe(ProjectBranchesPage.this);
+ }
+
+ @Override
+ public void updateAjaxAttributes(AbstractDefaultAjaxBehavior behavior,
+ AjaxRequestAttributes attributes) {
+ }
+
+ });
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 819846df26..b639874d2a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -652,7 +652,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
super.onPopState(target, data);
state = (State) data;
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ OneDev.getInstance(WebSocketManager.class).observe(this);
newTabPanel(target);
target.add(tabbable);
@@ -752,7 +752,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
state.mark = null;
}
pushState(target);
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ OneDev.getInstance(WebSocketManager.class).observe(this);
}
@Override
@@ -771,7 +771,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
state.commentId = null;
state.mark = mark;
pushState(target);
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ OneDev.getInstance(WebSocketManager.class).observe(this);
}
@Override
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 6c77c50b81..31c9d20437 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
@@ -130,7 +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());
+ OneDev.getInstance(WebSocketManager.class).observe((BasePage) BoardCardPanel.this.getPage());
}
@Override
@@ -164,12 +164,12 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected void onDeletedIssue(AjaxRequestTarget target) {
modal.close();
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange((BasePage) BoardCardPanel.this.getPage());
+ OneDev.getInstance(WebSocketManager.class).observe((BasePage) BoardCardPanel.this.getPage());
}
@Override
protected void onAfterRender() {
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange((BasePage) getPage());
+ OneDev.getInstance(WebSocketManager.class).observe((BasePage) getPage());
super.onAfterRender();
}
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 0966999ce1..4cb94a2a7f 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
@@ -301,7 +301,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
private void notifyWebSocketObserverChange() {
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ OneDev.getInstance(WebSocketManager.class).observe(this);
}
private Component newSinceChangesRow(String id, Date sinceDate) {
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 faa61d5023..255c9bd0b0 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
@@ -133,7 +133,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
}
private void onRegionChange() {
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);
+ OneDev.getInstance(WebSocketManager.class).observe(this);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
index b03d14a9c7..f601cbdd7d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
@@ -148,7 +148,7 @@ public class MergePreviewPage extends PullRequestDetailPage {
if (event.getPayload() instanceof PageDataChanged) {
PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
pageDataChanged.getHandler().add(this);
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(MergePreviewPage.this);
+ OneDev.getInstance(WebSocketManager.class).observe(MergePreviewPage.this);
}
}
@@ -235,7 +235,7 @@ public class MergePreviewPage extends PullRequestDetailPage {
if (event.getPayload() instanceof PageDataChanged) {
PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
newContent(pageDataChanged.getHandler());
- OneDev.getInstance(WebSocketManager.class).notifyObserverChange(MergePreviewPage.this);
+ OneDev.getInstance(WebSocketManager.class).observe(MergePreviewPage.this);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index 9b29d86eba..f4b83ca51f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -3,11 +3,14 @@ package io.onedev.server.web.page.project.tags;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.AjaxRequestTarget.IJavaScriptResponse;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -65,6 +68,7 @@ import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
public class ProjectTagsPage extends ProjectPage {
@@ -251,6 +255,23 @@ public class ProjectTagsPage extends ProjectPage {
modal.close();
target.add(tagsContainer);
newPagingNavigation(target);
+ target.addListener(new AjaxRequestTarget.IListener() {
+
+ @Override
+ public void onBeforeRespond(Map<String, Component> map, AjaxRequestTarget target) {
+ }
+
+ @Override
+ public void onAfterRespond(Map<String, Component> map, IJavaScriptResponse response) {
+ OneDev.getInstance(WebSocketManager.class).observe(ProjectTagsPage.this);
+ }
+
+ @Override
+ public void updateAjaxAttributes(AbstractDefaultAjaxBehavior behavior,
+ AjaxRequestAttributes attributes) {
+ }
+
+ });
}
}
}
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 fcaa82157a..9e6cf190af 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
@@ -62,7 +62,7 @@ public class DefaultWebSocketManager implements WebSocketManager, SchedulableTas
}
@Override
- public void notifyObserverChange(BasePage page) {
+ public void observe(BasePage page) {
String sessionId = page.getSession().getId();
if (sessionId != null) {
Map<IKey, Collection<String>> sessionPages = observables.get(sessionId);
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java
index 79a8cb298a..2095940a73 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java
@@ -14,7 +14,7 @@ public interface WebSocketManager {
static final String KEEP_ALIVE = "KeepAlive";
- void notifyObserverChange(BasePage page);
+ void observe(BasePage page);
void onDestroySession(String sessionId);