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 e72d3ea1b65 CAUSEWAY-3831: fixes dynamic visibility of search-bar based e72d3ea1b65 is described below commit e72d3ea1b65cebdc4445a89cfd5ab24e41bc06c2 Author: Andi Huber <ahu...@apache.org> AuthorDate: Thu Nov 21 22:44:30 2024 +0100 CAUSEWAY-3831: fixes dynamic visibility of search-bar based - by getting the number of table rows directly from the underlying model --- .../wicket/ui/components/table/DataTableWithPagesAndFilter.java | 8 ++++++++ .../viewer/wicket/ui/components/table/filter/FilterToolbar.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java index 9fe21783a8a..4a0664a1e49 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java @@ -105,6 +105,14 @@ public abstract class DataTableWithPagesAndFilter<T, S> extends DataTable<T, S> honorPageNumberHint(); } + /** + * Gets the number of table rows (unfiltered) directly from the underlying model. + * While {@link #getRowCount()} might return zero, when the component was no yet populated. + */ + public int elementCount() { + return _TableUtils.interactive(this).dataElementsObservable().getValue().size(); + } + // -- SELECTABLE /** diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/filter/FilterToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/filter/FilterToolbar.java index 7a8f9bafc26..c47ef42af46 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/filter/FilterToolbar.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/filter/FilterToolbar.java @@ -55,7 +55,7 @@ public class FilterToolbar extends Panel { protected void onConfigure() { super.onConfigure(); buildGui(); - setVisible(getTable().getRowCount() > 1); + setVisible(table.elementCount() > 1); } // -- HELPER