(causeway) branch master updated: CAUSEWAY-3652: wkt vwr: page reload fix

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new 1b5d2b5923 CAUSEWAY-3652: wkt vwr: page reload fix
1b5d2b5923 is described below

commit 1b5d2b5923bb07569767da8a55521f3086c9d35f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Dec 3 11:05:18 2023 +0100

    CAUSEWAY-3652: wkt vwr: page reload fix
---
 .../collection/selector/CollectionPresentationSelectorPanel.java  | 3 ++-
 .../apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java    | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
index 2cc6790131..b02646155e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
@@ -41,6 +41,7 @@ import org.apache.causeway.viewer.wicket.model.hints.CausewaySelectorEvent;
 import org.apache.causeway.viewer.wicket.model.links.Menuable;
 import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
 import org.apache.causeway.viewer.wicket.model.util.ComponentHintKey;
+import org.apache.causeway.viewer.wicket.model.util.PageUtils;
 import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
 import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryKey;
 import org.apache.causeway.viewer.wicket.ui.components.widgets.links.AjaxLinkNoPropagate;
@@ -186,7 +187,7 @@ extends PanelAbstract<DataTableInteractive, EntityCollectionModel> {
                 /* [CAUSEWAY-3415] do a full page reload when required,
                  * to properly trigger all client side java-script, that decorates HTML (datatable.net, vega, ...) */
                 if(linkEntry.isPageReloadRequiredOnTableViewActivation()) {
-                    linksSelectorPanel.reloadPage();
+                    PageUtils.pageReload();
                 } else {
                     target.add(linksSelectorPanel, views);
                 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
index b40c2b3243..4f1fad17f4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
@@ -22,7 +22,6 @@ import org.apache.wicket.Component;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.cycle.RequestCycle;
 import org.springframework.lang.Nullable;
 
 import org.apache.causeway.applib.annotation.TableDecorator;
@@ -31,8 +30,6 @@ import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.viewer.commons.model.components.UiComponentType;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
 
-import lombok.val;
-
 /**
  * Convenience adapter for {@link Panel}s built up using {@link UiComponentType}s.
  *
@@ -99,9 +96,4 @@ extends PanelBase<T> {
             .ifPresent(response::render);
     }
 
-    protected void reloadPage() {
-        val currentPage = getPage();
-        RequestCycle.get().setResponsePage(currentPage.getPageClass(), currentPage.getPageParameters());
-    }
-
 }