The Unified and Autonomous Development Platform
fix: several extraneous useless refresh in kanban board (#1502)
Robin Shena28ba83bc708
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex d31eebc7a0..5e97d67a2c 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -585,6 +585,10 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentreturn Issue.class.getName() + ":" + issueId;}+ public static String getListChangeObservable(Long projectId, Long issueId) {+ return Issue.class.getName() + ":list:" + projectId + ":" + issueId;+ }+public static String getListChangeObservable(Long projectId) {return Issue.class.getName() + ":list:" + projectId;}@@ -592,7 +596,7 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentpublic Collection<String> getChangeObservables(boolean withList) {Collection<String> observables = Sets.newHashSet(getDetailChangeObservable(getId()));if (withList)- observables.addAll(getProject().getIssueListObservables());+ observables.add(getListChangeObservable(getProject().getId(), getId()));return observables;}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex fe3ebed511..8162df3009 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -1677,14 +1677,4 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelreturn builds;}- public Collection<String> getIssueListObservables() {- Collection<String> observables = new HashSet<>();- var current = this;- do {- observables.add(Issue.getListChangeObservable(current.getId()));- current = current.getParent();- } while (current != null);-- return observables;- }}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java b/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.javaindex af90629c5c..8a7c87dc92 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ChangeObserver.java@@ -1,11 +1,12 @@package io.onedev.server.web.behavior;-import java.util.Collection;-import org.apache.wicket.Component;import org.apache.wicket.behavior.Behavior;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import java.util.Collection;+import java.util.HashSet;+public abstract class ChangeObserver extends Behavior {private static final long serialVersionUID = 1L;@@ -34,9 +35,31 @@ public abstract class ChangeObserver extends Behavior {return observables;}- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler,+ Collection<String> changedObservables) {if (component.isVisibleInHierarchy())handler.add(component);}+ public static Collection<String> filterObservables(Collection<String> observingObservables,+ Collection<String> changedObservables) {+ Collection<String> observingChangedObservables = new HashSet<>();+ for (var observingObservable: observingObservables) {+ for (var changedObservable: changedObservables) {+ if (containsObservable(observingObservable, changedObservable))+ observingChangedObservables.add(changedObservable);+ }+ }+ return observingChangedObservables;+ }++ public static boolean containsObservable(String observingObservable, String changedObservable) {+ if (changedObservable.startsWith(observingObservable)) {+ var remaining = changedObservable.substring(observingObservable.length());+ return remaining.length() == 0 || remaining.startsWith(":");+ } else {+ return false;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.javaindex 4a1821fd6c..a894c3d90d 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java@@ -47,14 +47,9 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {int count = params.getParameterValue("count").toInt();if (offset == 0) {WebMarkupContainer container = (WebMarkupContainer) getComponent();- container.visitChildren(RepeatingView.class, new IVisitor<RepeatingView, Void>() {-- @Override- public void component(RepeatingView component, IVisit<Void> visit) {- component.removeAll();- visit.stop();- }-+ container.visitChildren(RepeatingView.class, (IVisitor<RepeatingView, Void>) (component, visit) -> {+ component.removeAll();+ visit.stop();});}@@ -77,6 +72,11 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {getComponent().getMarkupId()));}+ public void check(IPartialPageRequestHandler handler) {+ handler.appendJavaScript(String.format("onedev.server.infiniteScroll.check('%s', false);",+ getComponent().getMarkupId()));+ }+@Overridepublic void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.jsindex 214d6e1be7..2cfeb9012a 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js+++ b/server-core/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js@@ -20,7 +20,7 @@ onedev.server.infiniteScroll = {refresh: function(containerId) {var $container = $("#" + containerId);if (!$container.data("appending")) {- $container.data("scrollTop", $container.scrollTop());+ $container.data("scrollTop", 0);var $items = onedev.server.infiniteScroll.getItems($container);$items.remove();$container.scrollTop(0);@@ -38,8 +38,8 @@ onedev.server.infiniteScroll = {var tolerate = 5;return $item.offset().top>$container.offset().top-tolerate&& $item.offset().top+$item.outerHeight()<$container.offset().top+$container.outerHeight()+tolerate;- };-+ }+var $items = onedev.server.infiniteScroll.getItems($container);var $lastItem = $items.last();@@ -53,14 +53,16 @@ onedev.server.infiniteScroll = {$container.data("prevItems", $items.length);$container.data("callback")($items.length, pageSize);$container.data("appending", true);- if ($lastItem.is("li")) {- $lastItem.after("<li class='loading-indicator' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></li>");- } else if ($lastItem.is("tr")) {- var colspan = $lastItem.children().length;- $lastItem.after("<tr class='loading-indicator'><td colspan='" + colspan + "' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></td></tr>");- } else {- $lastItem.after("<div class='loading-indicator' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></div>");- }+ if (showIndicator) {+ if ($lastItem.is("li")) {+ $lastItem.after("<li class='loading-indicator' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></li>");+ } else if ($lastItem.is("tr")) {+ var colspan = $lastItem.children().length;+ $lastItem.after("<tr class='loading-indicator'><td colspan='" + colspan + "' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></td></tr>");+ } else {+ $lastItem.after("<div class='loading-indicator' style='text-align:center;'><img src='/~img/" + ajaxIndicator + "'></img></div>");+ }+ }} else if (scrollTop) {if (scrollTop > $container.scrollTop())$container.scrollTop(scrollTop);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.javaindex ef1ab4264e..cf2ca21fae 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@@ -61,7 +61,7 @@ public class BuildLogPanel extends GenericPanel<Build> {}@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {appendRecentLogEntries(handler);}@@ -75,7 +75,7 @@ public class BuildLogPanel extends GenericPanel<Build> {add(new ChangeObserver() {@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {handler.appendJavaScript(String.format("onedev.server.buildLog.buildUpdated('%s', %b)",getMarkupId(), getBuild().isPaused()));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.javaindex 0741a6f751..1f6542f22c 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@@ -430,7 +430,7 @@ public abstract class CodeCommentPanel extends Panel {@Override@SuppressWarnings("deprecation")- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {Component prevActivityContainer;if (activitiesView.size() > 0)prevActivityContainer = activitiesView.get(activitiesView.size()-1);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.javaindex 5f85354bd1..7dce15da61 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@@ -175,7 +175,7 @@ public abstract class IssueActivitiesPanel extends Panel {add(new ChangeObserver() {@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {updateActivities(handler);}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.javaindex 5c0e175392..e734f70371 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@@ -1432,7 +1432,7 @@ public abstract class IssueListPanel extends Panel {fragment.add(new ChangeObserver() {@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {Component detail = newIssueDetail(componentId, issueId, cursor);fragment.replaceWith(detail);handler.add(detail);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.javaindex 37546d03d5..a681310c6f 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@@ -1,20 +1,30 @@package io.onedev.server.web.page.base;-import static io.onedev.server.web.page.admin.ssosetting.SsoProcessPage.MOUNT_PATH;-import static io.onedev.server.web.page.admin.ssosetting.SsoProcessPage.STAGE_INITIATE;-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;--import java.io.File;-import java.io.Serializable;-import java.util.Collection;-import java.util.HashSet;-import java.util.List;--import javax.annotation.Nullable;-import javax.servlet.http.Cookie;-+import com.google.common.base.Joiner;+import com.google.common.base.Splitter;+import com.google.common.collect.Sets;+import io.onedev.commons.bootstrap.Bootstrap;+import io.onedev.commons.loader.AppLoader;+import io.onedev.server.OneDev;+import io.onedev.server.commandhandler.Upgrade;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.CryptoUtils;+import io.onedev.server.web.asset.icon.IconScope;+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.behavior.ForceOrdinaryStyleBehavior;+import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;+import io.onedev.server.web.page.help.IncompatibilitiesPage;+import io.onedev.server.web.page.simple.SimplePage;+import io.onedev.server.web.page.simple.security.LoginPage;+import io.onedev.server.web.page.simple.serverinit.ServerInitPage;+import io.onedev.server.web.websocket.WebSocketManager;+import io.onedev.server.web.websocket.WebSocketMessages;import org.apache.commons.codec.binary.Base64;-import org.apache.commons.collections.CollectionUtils;import org.apache.commons.lang3.SerializationUtils;import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.Component;@@ -50,50 +60,37 @@ import org.apache.wicket.util.visit.IVisitor;import org.eclipse.jetty.servlet.ServletContextHandler;import org.unbescape.javascript.JavaScriptEscape;-import com.google.common.base.Joiner;-import com.google.common.base.Splitter;-import com.google.common.collect.Sets;+import javax.annotation.Nullable;+import javax.servlet.http.Cookie;+import java.io.File;+import java.io.Serializable;+import java.util.Collection;+import java.util.HashSet;+import java.util.List;-import io.onedev.commons.bootstrap.Bootstrap;-import io.onedev.commons.loader.AppLoader;-import io.onedev.server.OneDev;-import io.onedev.server.commandhandler.Upgrade;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.CryptoUtils;-import io.onedev.server.web.asset.icon.IconScope;-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;-import io.onedev.server.web.behavior.ForceOrdinaryStyleBehavior;-import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;-import io.onedev.server.web.page.help.IncompatibilitiesPage;-import io.onedev.server.web.page.simple.SimplePage;-import io.onedev.server.web.page.simple.security.LoginPage;-import io.onedev.server.web.page.simple.serverinit.ServerInitPage;-import io.onedev.server.web.websocket.WebSocketManager;-import io.onedev.server.web.websocket.WebSocketMessages;+import static io.onedev.server.web.behavior.ChangeObserver.filterObservables;+import static io.onedev.server.web.page.admin.ssosetting.SsoProcessPage.MOUNT_PATH;+import static io.onedev.server.web.page.admin.ssosetting.SsoProcessPage.STAGE_INITIATE;+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@SuppressWarnings("serial")public abstract class BasePage extends WebPage {private static final String COOKIE_DARK_MODE = "darkMode";-+private boolean darkMode;-+private FeedbackPanel sessionFeedback;-+private RepeatingView rootComponents;-+public BasePage(PageParameters params) {super(params);checkReady();-+WebRequest request = (WebRequest) RequestCycle.get().getRequest();Cookie cookie = request.getCookie(COOKIE_DARK_MODE);- if (cookie != null)+ if (cookie != null)darkMode = cookie.getValue().equals("yes");elsedarkMode = false;@@ -102,20 +99,20 @@ public abstract class BasePage extends WebPage {public boolean isDarkMode() {return darkMode;}-+public void toggleDarkMode() {darkMode = !darkMode;WebResponse response = (WebResponse) RequestCycle.get().getResponse();Cookie cookie;- if (darkMode)+ if (darkMode)cookie = new Cookie(COOKIE_DARK_MODE, "yes");- else+ elsecookie = new Cookie(COOKIE_DARK_MODE, "no");cookie.setPath("/");cookie.setMaxAge(Integer.MAX_VALUE);response.addCookie(cookie);}-+@Overrideprotected void onInitialize() {super.onInitialize();@@ -130,20 +127,20 @@ public abstract class BasePage extends WebPage {throw new RedirectToUrlException(redirectUrl);}}-+if (!isPermitted())unauthorized();-+if (!(getPage() instanceof IncompatibilitiesPage)&& !(getPage() instanceof ServerInitPage)&& SecurityUtils.isAdministrator()&& new File(Bootstrap.installDir, Upgrade.INCOMPATIBILITIES_SINCE_UPGRADED_VERSION).exists()) {throw new RestartResponseAtInterceptPageException(IncompatibilitiesPage.class);}-+AbstractPostAjaxBehavior popStateBehavior;add(popStateBehavior = new AbstractPostAjaxBehavior() {-+@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);@@ -154,7 +151,7 @@ public abstract class BasePage extends WebPage {protected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();String encodedData = params.getParameterValue("data").toString();-+byte[] bytes = Base64.decodeBase64(encodedData.getBytes());Serializable data = (Serializable) SerializationUtils.deserialize(CryptoUtils.decrypt(bytes));onPopState(target, data);@@ -163,25 +160,25 @@ public abstract class BasePage extends WebPage {}});-+add(new Label("pageTitle", getPageTitle()) {-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);-+response.render(JavaScriptHeaderItem.forReference(new BaseResourceReference()));response.render(OnDomReadyHeaderItem.forScript(- String.format("onedev.server.onDomReady('%s', '%s', %s);",- String.valueOf(OneDev.getInstance().getBootDate().getTime()),- SpriteImage.getVersionedHref(IconScope.class, null),- popStateBehavior.getCallbackFunction(explicit("data")).toString())));+ String.format("onedev.server.onDomReady('%s', '%s', %s);",+ String.valueOf(OneDev.getInstance().getBootDate().getTime()),+ SpriteImage.getVersionedHref(IconScope.class, null),+ popStateBehavior.getCallbackFunction(explicit("data")).toString())));response.render(OnLoadHeaderItem.forScript("onedev.server.onWindowLoad();"));}-+});-+add(new WebMarkupContainer("pageRefresh") {@Override@@ -197,28 +194,28 @@ public abstract class BasePage extends WebPage {}});-+add(new WebMarkupContainer("robots") {-+@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);tag.put("content", getRobotsMeta());}-+});-+add(new WebMarkupContainer("siteIcon") {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);-+File logoFile = new File(Bootstrap.getSiteDir(), "assets/logo.png");if (logoFile.exists())tag.put("href", "/logo.png?v=" + logoFile.lastModified());}-+});add(new Label("script", new LoadableDetachableModel<String>() {@@ -231,14 +228,14 @@ public abstract class BasePage extends WebPage {builder.append(clazz.getSimpleName()).append(" ");clazz = clazz.getSuperclass();}-+builder.append(" ").append(Joiner.on(' ').join(getCssClasses()));-+if (darkMode)builder.append(" dark-mode");IVisitor<BeanEditor, BeanEditor> visitor = new IVisitor<BeanEditor, BeanEditor>() {-+@Overridepublic void component(BeanEditor object, IVisit<BeanEditor> visit) {if (!object.getBehaviors(ForceOrdinaryStyleBehavior.class).isEmpty())@@ -246,62 +243,60 @@ public abstract class BasePage extends WebPage {}};-- if (getPage() instanceof SimplePage && getPage().visitChildren(BeanEditor.class, visitor) != null)++ if (getPage() instanceof SimplePage && getPage().visitChildren(BeanEditor.class, visitor) != null)builder.append("force-ordinary-style ");-+return String.format("$('html').addClass('%s');", builder.toString());}-+}).setEscapeModelStrings(false));-+sessionFeedback = new SessionFeedbackPanel("sessionFeedback");- add(sessionFeedback);+ add(sessionFeedback);sessionFeedback.setOutputMarkupId(true);add(rootComponents = new RepeatingView("rootComponents"));-+int sessionTimeout = AppLoader.getInstance(ServletContextHandler.class).getSessionHandler().getMaxInactiveInterval();add(new WebMarkupContainer("keepSessionAlive").add(new AjaxSelfUpdatingTimerBehavior(Duration.milliseconds(sessionTimeout*500L))));-+add(new WebSocketBehavior() {@Overrideprotected void onMessage(WebSocketRequestHandler handler, TextMessage message) {super.onMessage(handler, message);-+if (message.getText().startsWith(WebSocketMessages.OBSERVABLE_CHANGED)) {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))- observer.onObservableChanged(handler);- }- }-+ notifyObservablesChange(handler, observables);+ }}-+});}-+public void notifyObservablesChange(IPartialPageRequestHandler handler, Collection<String> observables) {for (ChangeObserver observer: findChangeObservers()) {- if (CollectionUtils.containsAny(observer.getObservables(), observables))- observer.onObservableChanged(handler);+ Collection<String> observingChangedObservables =+ filterObservables(observer.getObservables(), observables);+ if (!observingChangedObservables.isEmpty())+ observer.onObservableChanged(handler, observingChangedObservables);}}public void notifyObservableChange(IPartialPageRequestHandler handler, String observable) {notifyObservablesChange(handler, Sets.newHashSet(observable));}-+public FeedbackPanel getSessionFeedback() {return sessionFeedback;}-+@Overrideprotected void onBeforeRender() {rootComponents.removeAll();@@ -310,21 +305,21 @@ public abstract class BasePage extends WebPage {public void pushState(IPartialPageRequestHandler handler, String url, Serializable data) {String encodedData = new String(Base64.encodeBase64(CryptoUtils.encrypt(SerializationUtils.serialize(data))));- String script = String.format("onedev.server.history.pushState('%s', '%s', '%s');",+ String script = String.format("onedev.server.history.pushState('%s', '%s', '%s');",url, encodedData, JavaScriptEscape.escapeJavaScript(getPageTitle()));handler.prependJavaScript(script);}public void replaceState(IPartialPageRequestHandler handler, String url, Serializable data) {String encodedData = new String(Base64.encodeBase64(CryptoUtils.encrypt(SerializationUtils.serialize(data))));- String script = String.format("onedev.server.history.replaceState('%s', '%s', '%s');",+ String script = String.format("onedev.server.history.replaceState('%s', '%s', '%s');",url, encodedData, JavaScriptEscape.escapeJavaScript(getPageTitle()));handler.prependJavaScript(script);}-+protected void onPopState(AjaxRequestTarget target, Serializable data) {}-+public RepeatingView getRootComponents() {return rootComponents;}@@ -334,7 +329,7 @@ public abstract class BasePage extends WebPage {AppLoader.getInstance(WebSocketManager.class).observe(this);super.onAfterRender();}-+private Collection<ChangeObserver> findChangeObservers() {Collection<ChangeObserver> observers = new HashSet<>();observers.addAll(getBehaviors(ChangeObserver.class));@@ -357,23 +352,23 @@ public abstract class BasePage extends WebPage {protected boolean isPermitted() {return true;}-+protected String getRobotsMeta() {return "";}-+@Nullableprotected final User getLoginUser() {return SecurityUtils.getUser();}-+public void unauthorized() {- if (getLoginUser() != null)+ if (getLoginUser() != null)throw new UnauthorizedException("You are not allowed to perform this operation");- else+ elsethrow new RestartResponseAtInterceptPageException(LoginPage.class);}-+protected String getPageTitle() {return "OneDev: Self-hosted Git Server with Built-in CI/CD";}@@ -381,13 +376,13 @@ public abstract class BasePage extends WebPage {protected int getPageRefreshInterval() {return 0;}-+protected Collection<String> getCssClasses() {return Sets.newHashSet();}-+public void resizeWindow(IPartialPageRequestHandler handler) {handler.appendJavaScript("$(window).resize();");}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex fb38026997..05cd561193 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -628,7 +628,7 @@ public abstract class LayoutPage extends BasePage {topbar.add(new ChangeObserver() {@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {var count = getAlertManager().count();if (count != 0 && !alertsLink.isVisible() || count == 0 && alertsLink.isVisible())handler.add(alertsLink);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.javaindex afd9823b5e..0e0e68b2d0 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@@ -248,8 +248,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,revisionIndexing.add(new ChangeObserver() {@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- super.onObservableChanged(handler);+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {+ super.onObservableChanged(handler, changedObservables);resizeWindow(handler);}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.javaindex 1936bfe4ab..2dca58d877 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@@ -167,8 +167,8 @@ public abstract class BuildDetailPage extends ProjectPagereturn new ChangeObserver() {@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- super.onObservableChanged(handler);+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {+ super.onObservableChanged(handler, changedObservables);handler.appendJavaScript("$(window).resize();");}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 6427b11979..47da7990ba 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -1,21 +1,35 @@package io.onedev.server.web.page.project.issues.boards;-import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;-+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.MilestoneCriteria;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.criteria.NotCriteria;+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.create.CreateIssuePanel;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.base.BasePage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import org.apache.commons.lang3.SerializationUtils;import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.CallbackParameter;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;@@ -24,23 +38,9 @@ import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.IssueChangeManager;-import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Milestone;-import io.onedev.server.model.Project;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.MilestoneCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.ProjectScope;-import io.onedev.server.util.criteria.Criteria;-import io.onedev.server.util.criteria.NotCriteria;-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;+import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.List;@SuppressWarnings("serial")abstract class BacklogColumnPanel extends Panel {@@ -63,7 +63,7 @@ abstract class BacklogColumnPanel extends Panel {};- private final IModel<Integer> countModel = new LoadableDetachableModel<Integer>() {+ private final IModel<Integer> countModel = new LoadableDetachableModel<>() {@Overrideprotected Integer load() {@@ -77,11 +77,13 @@ abstract class BacklogColumnPanel extends Panel {return 0;}}-+};private AbstractPostAjaxBehavior ajaxBehavior;+ private Component countLabel;+public BacklogColumnPanel(String id) {super(id);}@@ -136,19 +138,7 @@ abstract class BacklogColumnPanel extends Panel {add(new WebMarkupContainer("viewAsList").setVisible(false));}- add(new CardCountLabel("count") {-- @Override- protected Project getProject() {- return BacklogColumnPanel.this.getProject();- }-- @Override- protected int getCount() {- return countModel.getObject();- }-- });+ add(countLabel = new Label("count", countModel).setOutputMarkupId(true));add(ajaxBehavior = new AbstractPostAjaxBehavior() {@@ -158,9 +148,9 @@ abstract class BacklogColumnPanel extends Panel {Issue issue = getIssueManager().load(params.getParameterValue("issue").toLong());if (!SecurityUtils.canScheduleIssues(issue.getProject()))throw new UnauthorizedException("Permission denied");- OneDev.getInstance(IssueChangeManager.class).removeSchedule(issue, getMilestone());+ getIssueChangeManager().removeSchedule(issue, getMilestone());notifyIssueChange(target, issue);- target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, true);", issue.getId()));+ target.appendJavaScript("$('.issue-boards').data('accepted', true);");}});@@ -215,6 +205,11 @@ abstract class BacklogColumnPanel extends Panel {return countModel.getObject();}+ @Override+ protected void onUpdate(IPartialPageRequestHandler handler) {+ handler.add(countLabel);+ }+});super.onBeforeRender();@@ -235,6 +230,10 @@ abstract class BacklogColumnPanel extends Panel {return OneDev.getInstance(IssueManager.class);}+ private IssueChangeManager getIssueChangeManager() {+ return OneDev.getInstance(IssueChangeManager.class);+ }+private Project getProject() {return getProjectScope().getProject();}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.javaindex 11aa79928f..4db2412386 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@@ -48,10 +48,23 @@ import java.util.List;@SuppressWarnings("serial")public abstract class BoardCardPanel extends GenericPanel<Issue> {+ private final Long issueId;+private AbstractPostAjaxBehavior ajaxBehavior;- public BoardCardPanel(String id, IModel<Issue> model) {- super(id, model);+ public BoardCardPanel(String id, Long issueId) {+ super(id);+ this.issueId = issueId;+ setModel(new LoadableDetachableModel<Issue>() {+ @Override+ protected Issue load() {+ return OneDev.getInstance(IssueManager.class).load(issueId);+ }+ });+ }++ public Long getIssueId() {+ return issueId;}private Issue getIssue() {@@ -192,6 +205,7 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {@Overrideprotected void onDeletedIssue(AjaxRequestTarget target) {modal.close();+ BoardCardPanel.this.onDeleteIssue(target);}@Override@@ -314,6 +328,12 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {setOutputMarkupId(true);}+ @Override+ protected void onBeforeRender() {+ replace(newContent("content", getModel(), getCursor()));+ super.onBeforeRender();+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -328,4 +348,6 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {protected abstract Project getProject();+ protected abstract void onDeleteIssue(AjaxRequestTarget target);+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 37391ae6dc..0109ada2b1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -65,7 +65,7 @@ import java.util.concurrent.atomic.AtomicReference;@SuppressWarnings("serial")abstract class BoardColumnPanel extends Panel implements EditContext {- private final IModel<IssueQuery> queryModel = new LoadableDetachableModel<IssueQuery>() {+ private final IModel<IssueQuery> queryModel = new LoadableDetachableModel<>() {@Overrideprotected IssueQuery load() {@@ -82,7 +82,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (identifyField.equals(Issue.NAME_STATE)) {criterias.add(new StateCriteria(getColumn(), IssueQueryLexer.Is));} else if (getColumn() != null) {- criterias.add(new ChoiceFieldCriteria(identifyField,+ criterias.add(new ChoiceFieldCriteria(identifyField,getColumn(), -1, IssueQueryLexer.Is, false));} else {criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty, false));@@ -92,7 +92,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {return null;}}-+};private final IModel<Integer> countModel = new LoadableDetachableModel<Integer>() {@@ -112,6 +112,8 @@ abstract class BoardColumnPanel extends Panel implements EditContext {private AbstractPostAjaxBehavior ajaxBehavior;+ private Component countLabel;+public BoardColumnPanel(String id) {super(id);}@@ -207,6 +209,11 @@ abstract class BoardColumnPanel extends Panel implements EditContext {return countModel.getObject();}+ @Override+ protected void onUpdate(IPartialPageRequestHandler handler) {+ handler.add(countLabel);+ }+});super.onBeforeRender();@@ -312,25 +319,12 @@ abstract class BoardColumnPanel extends Panel implements EditContext {});- head.add(new CardCountLabel("count") {-- @Override- protected Project getProject() {- return BoardColumnPanel.this.getProject();- }-- @Override- protected int getCount() {- return countModel.getObject();- }-- });+ head.add(countLabel = new Label("count", countModel).setOutputMarkupId(true));add(ajaxBehavior = new AbstractPostAjaxBehavior() {- private void markAccepted(AjaxRequestTarget target, Issue issue, boolean accepted) {- target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, %b);",- issue.getId(), accepted));+ private void markAccepted(AjaxRequestTarget target, boolean accepted) {+ target.appendJavaScript(String.format("$('.issue-boards').data('accepted', %b);", accepted));}@Override@@ -343,9 +337,9 @@ abstract class BoardColumnPanel extends Panel implements EditContext {// move a backlog issue to boardif (!SecurityUtils.canScheduleIssues(issue.getProject()))throw new UnauthorizedException("Permission denied");- OneDev.getInstance(IssueChangeManager.class).addSchedule(issue, getMilestone());+ getIssueChangeManager().addSchedule(issue, getMilestone());notifyIssueChange(target, issue);- markAccepted(target, issue, true);+ markAccepted(target, true);} else if (fieldName.equals(Issue.NAME_STATE)) {AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);for (TransitionSpec transition: getIssueSetting().getTransitionSpecs()) {@@ -379,13 +373,13 @@ abstract class BoardColumnPanel extends Panel implements EditContext {@Overrideprotected void onSaved(AjaxRequestTarget target) {- markAccepted(target, getIssue(), true);+ markAccepted(target, true);close();}@Overrideprotected void onCancelled(AjaxRequestTarget target) {- markAccepted(target, getIssue(), false);+ markAccepted(target, false);close();}@@ -404,10 +398,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {};} else {- OneDev.getInstance(IssueChangeManager.class).changeState(issue, getColumn(),+ getIssueChangeManager().changeState(issue, getColumn(),new HashMap<>(), transitionRef.get().getRemoveFields(), null);notifyIssueChange(target, issue);- markAccepted(target, issue, true);+ markAccepted(target, true);}} else {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);@@ -465,24 +459,24 @@ abstract class BoardColumnPanel extends Panel implements EditContext {fieldValues.putAll(FieldUtils.getFieldValues(FieldUtils.newBeanComponentContext(beanDescriptor, bean),bean, FieldUtils.getEditableFields(getProject(), dependentFields)));- notifyIssueChange(target, issue);close();Issue issue = getIssueManager().load(issueId);- OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues);- markAccepted(target, issue, true);+ getIssueChangeManager().changeFields(issue, fieldValues);+ notifyIssueChange(target, issue);+ markAccepted(target, true);}@Overrideprotected void onCancel(AjaxRequestTarget target) {- markAccepted(target, getIssueManager().load(issueId), false);+ markAccepted(target, false);}}new DependentFieldsEditor(target, fieldBean, propertyNames, false, "Dependent Fields");} else {- OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues);+ getIssueChangeManager().changeFields(issue, fieldValues);notifyIssueChange(target, issue);- markAccepted(target, issue, true);+ markAccepted(target, true);}}}@@ -492,6 +486,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {setOutputMarkupId(true);}+ private IssueChangeManager getIssueChangeManager() {+ return OneDev.getInstance(IssueChangeManager.class);+ }+private IssueManager getIssueManager() {return OneDev.getInstance(IssueManager.class);}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.javadeleted file mode 100644index c7788945a3..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java+++ /dev/null@@ -1,47 +0,0 @@-package io.onedev.server.web.page.project.issues.boards;--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.markup.html.basic.Label;-import org.apache.wicket.model.LoadableDetachableModel;--import java.util.Collection;--@SuppressWarnings("serial")-abstract class CardCountLabel extends Label {-- public CardCountLabel(String id) {- super(id);-- setDefaultModel(new LoadableDetachableModel<String>() {-- @Override- protected String load() {- return String.valueOf(getCount());- }-- });- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ChangeObserver() {-- @Override- public Collection<String> findObservables() {- return Sets.newHashSet(Issue.getListChangeObservable(getProject().getId()));- }-- });-- setOutputMarkupId(true);- }-- protected abstract Project getProject();-- protected abstract int getCount();-}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.javaindex 0da4a59c1d..5b5b35ede8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -1,32 +1,13 @@package io.onedev.server.web.page.project.issues.boards;-import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;--import io.onedev.server.web.page.base.BasePage;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Url;-import org.apache.wicket.request.cycle.IRequestCycleListener;-import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.InputContext;+import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.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.buildspecmodel.inputspec.InputSpec;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.FixedIssueCriteria;@@ -51,6 +32,22 @@ import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.util.CursorSupport;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.IRequestHandler;+import org.apache.wicket.request.Url;+import org.apache.wicket.request.cycle.IRequestCycleListener;+import org.apache.wicket.request.cycle.RequestCycle;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.List;@SuppressWarnings("serial")abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContext {@@ -232,7 +229,6 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overridepublic void onClick(AjaxRequestTarget target) {OneDev.getInstance(IssueManager.class).delete(getIssue());- ((BasePage)getPage()).notifyObservablesChange(target, getProject().getIssueListObservables());onDeletedIssue(target);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex ff7eb909fb..b447dca072 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -1,9 +1,9 @@package io.onedev.server.web.page.project.issues.boards;-import com.google.common.collect.Sets;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;@@ -17,17 +17,23 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;import javax.annotation.Nullable;import java.util.ArrayList;import java.util.Collection;+import java.util.HashSet;import java.util.List;+import static java.lang.Long.parseLong;+import static org.apache.commons.lang3.StringUtils.substringAfterLast;+@SuppressWarnings("serial")abstract class CardListPanel extends Panel {+ private RepeatingView cardsView;++ private InfiniteScrollBehavior behavior;+public CardListPanel(String id) {super(id);}@@ -38,22 +44,14 @@ abstract class CardListPanel extends Panel {add(new FencedFeedbackPanel("feedback", this));- RepeatingView cardsView = new RepeatingView("cards");+ cardsView = new RepeatingView("cards");int index = 0;try {List<Issue> issues = queryIssues(0, WebConstants.PAGE_SIZE);for (Issue issue: issues) {- Long issueId = issue.getId();- IModel<Issue> model = new LoadableDetachableModel<Issue>() {-- @Override- protected Issue load() {- return OneDev.getInstance(IssueManager.class).load(issueId);- }-- };int cardOffset = index;- cardsView.add(new BoardCardPanel(cardsView.newChildId(), model) {+ var issueId = issue.getId();+ cardsView.add(new BoardCardPanel(cardsView.newChildId(), issueId) {@Overrideprotected Cursor getCursor() {@@ -68,7 +66,12 @@ abstract class CardListPanel extends Panel {protected Project getProject() {return CardListPanel.this.getProject();}-++ @Override+ protected void onDeleteIssue(AjaxRequestTarget target) {+ removeCard(target, issueId);+ }+});index++;}@@ -77,7 +80,6 @@ abstract class CardListPanel extends Panel {}add(cardsView);- InfiniteScrollBehavior behavior;add(behavior = new InfiniteScrollBehavior(WebConstants.PAGE_SIZE) {@Override@@ -89,17 +91,9 @@ abstract class CardListPanel extends Panel {protected void appendMore(AjaxRequestTarget target, int offset, int count) {int index = offset;for (Issue issue: queryIssues(offset, count)) {- Long issueId = issue.getId();- IModel<Issue> model = new LoadableDetachableModel<Issue>() {-- @Override- protected Issue load() {- return OneDev.getInstance(IssueManager.class).load(issueId);- }-- };int cardOffset = index;- BoardCardPanel card = new BoardCardPanel(cardsView.newChildId(), model) {+ var issueId = issue.getId();+ BoardCardPanel card = new BoardCardPanel(cardsView.newChildId(), issueId) {@Overrideprotected Cursor getCursor() {@@ -114,7 +108,12 @@ abstract class CardListPanel extends Panel {protected Project getProject() {return CardListPanel.this.getProject();}-++ @Override+ protected void onDeleteIssue(AjaxRequestTarget target) {+ removeCard(target, issueId);+ }+};cardsView.add(card);String script = String.format("$('#%s').append('<div id=\"%s\"></div>');",@@ -130,19 +129,52 @@ abstract class CardListPanel extends Panel {add(new ChangeObserver() {@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- behavior.refresh(handler);+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {+ Project.push(getProject());+ try {+ for (var observable : changedObservables) {+ var issueId = parseLong(substringAfterLast(observable, ":"));+ var issue = getIssueManager().load(issueId);+ if (getQuery() == null || getQuery().matches(issue)) {+ boolean found = false;+ for (var card : cardsView) {+ if (((BoardCardPanel) card).getIssueId().equals(issueId)) {+ handler.add(card);+ found = true;+ break;+ }+ }+ if (!found) {+ behavior.refresh(handler);+ onUpdate(handler);+ }+ } else {+ removeCard(handler, issueId);+ }+ }+ } finally {+ Project.pop();+ }}@Overridepublic Collection<String> findObservables() {- return Sets.newHashSet(Issue.getListChangeObservable(getProject().getId()));+ Collection<String> observables = new HashSet<>();+ for (var projectId: getProjectManager().getSubtreeIds(getProject().getId()))+ observables.add(Issue.getListChangeObservable(projectId));+ for (var ancestor: getProject().getAncestors())+ observables.add(Issue.getListChangeObservable(ancestor.getId()));+ return observables;}});}+ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }+private IssueManager getIssueManager() {return OneDev.getInstance(IssueManager.class);}@@ -166,4 +198,17 @@ abstract class CardListPanel extends Panel {protected abstract int getCardCount();+ protected abstract void onUpdate(IPartialPageRequestHandler handler);++ private void removeCard(IPartialPageRequestHandler handler, Long issueId) {+ for (var card: cardsView) {+ if (((BoardCardPanel)card).getIssueId().equals(issueId)) {+ cardsView.remove(card);+ handler.appendJavaScript(String.format("$('#%s').remove();", card.getMarkupId()));+ behavior.check(handler);+ onUpdate(handler);+ break;+ }+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex d713088edf..bcc019a2c1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -119,14 +119,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {};private IFeedbackMessageFilter newFeedbackMessageFilter(boolean backlog) {- return new IFeedbackMessageFilter() {-- @Override- public boolean accept(FeedbackMessage message) {- return ((QueryParseMessage)message.getMessage()).backlog == backlog;- }-- };+ return message -> ((QueryParseMessage)message.getMessage()).backlog == backlog;}@Nullable@@ -664,7 +657,8 @@ public class IssueBoardsPage extends ProjectIssuesPage {});- IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);+ IssueQueryParseOption option = new IssueQueryParseOption()+ .withCurrentUserCriteria(true).withCurrentProjectCriteria(true);queryInput.add(new IssueQueryBehavior(projectModel, option, true));queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.jsindex b7155e8a38..e84022dfa7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js@@ -29,7 +29,7 @@ onedev.server.issueBoards = {scroll: false,start: function(event, ui) {// pretend that we are in ajax operation to prevent websocket auto-update while dragging- onedev.server.ajaxRequests.count++;+ onedev.server.ajaxRequests.count++;$card.addClass("issue-dragging");$(ui.helper).outerWidth($card.outerWidth());containerContentWidth = $container.prop("scrollWidth");@@ -72,30 +72,26 @@ onedev.server.issueBoards = {* cancel the dialog and the accept flag will be set to false*/function checkAccepted() {- var accepted = $card.data("accepted");+ var accepted = $(".issue-boards").data("accepted");if (accepted != undefined) {if (!accepted) {$card.removeClass("issue-dragging");}- onedev.server.ajaxRequests.count--;+ onedev.server.ajaxRequests.count--;+ $(".issue-boards").removeData("accepted");} else {- setTimeout(checkAccepted, 10);+ setTimeout(checkAccepted, 100);}- $card.removeData("accepted");}checkAccepted();} else {$card.removeClass("issue-dragging");- onedev.server.ajaxRequests.count--;+ onedev.server.ajaxRequests.count--;}$card.removeData("droppedTo");$(".issue-boards .body .body").removeClass("issue-droppable");}});}- },- markAccepted: function(issueId, accepted) {- var $card = $(".issue-boards .column .body .ui-draggable.issue-dragging[data-issue='" + issueId + "']");- $card.data("accepted", accepted);}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex fbda4270a1..7a4e7b97ea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -258,7 +258,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {fragment.add(new ChangeObserver() {@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {Component content = newContent(componentId, issueId);fragment.replaceWith(content);handler.add(content);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.javaindex 54a0519dea..fea0965627 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@@ -1308,8 +1308,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- super.onObservableChanged(handler);+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {+ super.onObservableChanged(handler, changedObservables);handler.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}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.javaindex 3e455de18e..d8ffb31ccb 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@@ -356,7 +356,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {}@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {@SuppressWarnings("deprecation")Component prevActivityRow = activitiesView.get(activitiesView.size()-1);PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();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.javaindex 7000f616ec..9158d65d29 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@@ -551,7 +551,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev}@Override- public void onObservableChanged(IPartialPageRequestHandler handler) {+ public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {newContent(handler);}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.javaindex 4286ca045f..0fde9dfb27 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@@ -13,6 +13,7 @@ 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.behavior.ChangeObserver;import io.onedev.server.web.page.base.BasePage;import org.apache.wicket.Application;import org.apache.wicket.protocol.ws.api.IWebSocketConnection;@@ -34,7 +35,8 @@ import java.io.Serializable;import java.util.*;import java.util.concurrent.ConcurrentHashMap;-import static io.onedev.server.util.CollectionUtils.containsAny;+import static io.onedev.server.web.behavior.ChangeObserver.containsObservable;+import static io.onedev.server.web.behavior.ChangeObserver.filterObservables;@Singletonpublic class DefaultWebSocketManager implements WebSocketManager, Serializable {@@ -88,7 +90,7 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {IKey pageKey = new PageIdKey(page.getPageId());Collection<String> observables = page.findChangeObservables();Collection<String> prevObservables = observablesOfSession.put(pageKey, observables);- if (prevObservables != null && !prevObservables.containsAll(observables)) {+ if (prevObservables != null && !observables.stream().allMatch(it -> prevObservables.stream().anyMatch(it2 -> containsObservable(it2, it)))) {IWebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, pageKey);if (connection != null)notifyPastObservables(connection);@@ -145,8 +147,12 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {PageKey pageKey = ((WebSocketConnection) connection).getPageKey();if (sourcePageKey == null || !sourcePageKey.equals(pageKey)) {Collection<String> registeredObservables = getRegisteredObservables(connection);- if (registeredObservables != null && containsAny(registeredObservables, observables))- notifyObservables(connection, observables);+ if (registeredObservables != null) {+ var registeredChangedObservables =+ filterObservables(registeredObservables, observables);+ if (!registeredChangedObservables.isEmpty())+ notifyObservables(connection, registeredChangedObservables);+ }}}return null;@@ -229,8 +235,8 @@ public class DefaultWebSocketManager implements WebSocketManager, Serializable {for (var entry: notifiedObservables.entrySet()) {var observable = entry.getKey();var sourcePageKey = entry.getValue().getLeft();- if (registeredObservables.contains(observable)- && (sourcePageKey == null || !sourcePageKey.equals(pageKey))) {+ if ((sourcePageKey == null || !sourcePageKey.equals(pageKey))+ && registeredObservables.stream().anyMatch(it-> containsObservable(it, observable))) {observables.add(observable);}}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.javaindex 3746d30b81..5422a73b90 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java@@ -1,9 +1,7 @@package io.onedev.server.web.websocket;import io.onedev.server.event.Listen;-import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.project.issue.IssueEvent;-import io.onedev.server.model.Issue;import javax.inject.Inject;import javax.inject.Singleton;@@ -22,13 +20,5 @@ public class IssueEventBroadcaster {public void on(IssueEvent event) {webSocketManager.notifyObservablesChange(event.getIssue().getChangeObservables(event.affectsListing()), event.getSourcePage());}-- @Listen- public void on(EntityRemoved event) {- if (event.getEntity() instanceof Issue) {- var project = ((Issue) event.getEntity()).getProject();- webSocketManager.notifyObservablesChange(project.getIssueListObservables(), event.getSourcePage());- }- }}\ No newline at end of file