You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/12/16 11:19:01 UTC
(causeway) branch v3 updated: CAUSEWAY-2297: fixes regression re. simplified empty table rendering (part2)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v3 by this push:
new 0d56634d21d CAUSEWAY-2297: fixes regression re. simplified empty table rendering (part2)
0d56634d21d is described below
commit 0d56634d21d88a67c4a1d03cb62d8239188c2fd4
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Dec 16 12:18:55 2024 +0100
CAUSEWAY-2297: fixes regression re. simplified empty table rendering
(part2)
---
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 11 +++++++----
.../multiple/CollectionContentsMultipleViewsPanel.java | 16 ++++++++++++----
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index d3dcb186e69..f536e47b7a0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -20,6 +20,7 @@ package org.apache.causeway.viewer.wicket.ui.components.collection.present.ajaxt
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
@@ -78,10 +79,12 @@ implements CollectionCountProvider {
return getModel().getDataTableModel().getFilteredElementCount();
}
+ // supports partial page updates (AJAX)
@Override
- protected void onInitialize() {
- super.onInitialize();
+ protected void onConfigure() {
+ super.onConfigure();
buildGui();
+ Wkt.ajaxEnable(this);
}
@Override
@@ -92,7 +95,6 @@ implements CollectionCountProvider {
@Override
protected void onModelChanged() {
- //buildGui();
}
// -- HELPER
@@ -113,7 +115,8 @@ implements CollectionCountProvider {
return;
}
- var elementType = collectionModel.getElementType();
+ var elementType = Objects.requireNonNull(collectionModel.getElementType(),
+ ()->"invalid: CollectionModel without element type");
var columns = new ArrayList<GenericColumn>();
// first create property columns, so we know how many columns there are
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/multiple/CollectionContentsMultipleViewsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/multiple/CollectionContentsMultipleViewsPanel.java
index 87ec6a238aa..b5b22ab6474 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/multiple/CollectionContentsMultipleViewsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/multiple/CollectionContentsMultipleViewsPanel.java
@@ -19,7 +19,6 @@
package org.apache.causeway.viewer.wicket.ui.components.collection.present.multiple;
import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.event.IEvent;
import org.apache.causeway.commons.collections.Can;
@@ -152,6 +151,7 @@ implements CollectionCountProvider {
String selectedView = selectorEvent.hintFor(selectorDropdownPanel, UIHINT_VIEW);
if (selectedView == null) return;
+ var ajaxTarget = selectorEvent.getTarget();
int underlyingViewNum = selectorHelper.lookup(selectedView);
for(int i=0; i<MAX_NUM_UNDERLYING_VIEWS; i++) {
@@ -160,16 +160,24 @@ implements CollectionCountProvider {
final boolean isSelected = i == underlyingViewNum;
setVisible(component, isSelected);
+
component.setDefaultModel(isSelected
? getModel()
: CollectionModel.empty());
+
+ if(isSelected
+ && ajaxTarget != null
+ && component.getOutputMarkupId()) {
+ // triggers re-rendering of the underlying table component (if it supports AJAX updates)
+ ajaxTarget.add(component);
+ }
+
}
this.selectedComponent = underlyingViews[underlyingViewNum];
- final AjaxRequestTarget target = selectorEvent.getTarget();
- if(target != null) {
- target.add(this, selectorDropdownPanel);
+ if(ajaxTarget != null) {
+ ajaxTarget.add(this, selectorDropdownPanel);
}
}