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/11/20 20:49:49 UTC

(causeway) branch v3 updated: CAUSEWAY-3830: limit scope of bulk toggle to filtered data-rows

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 7ec3335ee51 CAUSEWAY-3830: limit scope of bulk toggle to filtered data-rows
7ec3335ee51 is described below

commit 7ec3335ee519cabead0bb7583686a8cd5f45d021
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 20 21:49:43 2024 +0100

    CAUSEWAY-3830: limit scope of bulk toggle to filtered data-rows
---
 .../commons/internal/collections/_Streams.java     | 36 ++++++++++-----
 .../metamodel/tabular/DataTableInteractive.java    |  3 +-
 .../tabular/internal/DataTableInternal.java        | 49 ++++++++++----------
 .../interact/CollectionInteractionTest.java        |  5 +--
 viewers/wicket/ui/src/main/java/module-info.java   |  1 -
 .../ui/components/collection/CollectionPanel.java  | 23 +---------
 .../collection/bulk/MultiselectToggleProvider.java | 28 ------------
 .../CollectionContentsAsAjaxTablePanel.css         |  5 +++
 .../CollectionContentsAsAjaxTablePanel.java        | 30 ++++++-------
 .../ajaxtable/columns/BulkToggleWkt.java           | 52 ----------------------
 .../ajaxtable/columns/GenericColumnAbstract.java   |  2 +-
 .../ajaxtable/columns/ToggleboxColumn.java         | 36 ++++-----------
 .../table/DataTableWithPagesAndFilter.java         | 34 +++++++++-----
 .../ui/components/table/filter/FilterToolbar.java  |  2 +-
 .../ui/components/table/head/HeadersToolbar.html   |  2 +-
 .../table/head/HeadersToolbarAbstract.java         | 15 ++-----
 .../ui/components/table/nav/NavigationToolbar.html |  1 -
 .../ui/components/table/nav/NavigationToolbar.java |  5 ---
 .../widgets/checkbox/ContainedToggleboxPanel.java  | 24 +---------
 19 files changed, 111 insertions(+), 242 deletions(-)

diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Streams.java b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Streams.java
index 8a82b383b3a..61fbdea7368 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Streams.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/collections/_Streams.java
@@ -18,8 +18,11 @@
  */
 package org.apache.causeway.commons.internal.collections;
 
+import java.util.Comparator;
 import java.util.stream.Stream;
 
+import org.springframework.lang.Nullable;
+
 /**
  * <h1>- internal use only -</h1>
  * <p>
@@ -41,7 +44,7 @@ public final class _Streams {
     /**
      * 3 param variant of {@link Stream#concat(Stream, Stream)}
      */
-    public static <T> Stream<T> concat(Stream<? extends T> a, Stream<? extends T> b, Stream<? extends T> c) {
+    public static <T> Stream<T> concat(final Stream<? extends T> a, final Stream<? extends T> b, final Stream<? extends T> c) {
         return Stream.concat(Stream.concat(a, b), c);
     }
 
@@ -49,7 +52,7 @@ public final class _Streams {
      * 4 param variant of {@link Stream#concat(Stream, Stream)}
      */
     public static <T> Stream<T> concat(
-            Stream<? extends T> a, Stream<? extends T> b, Stream<? extends T> c, Stream<? extends T> d) {
+            final Stream<? extends T> a, final Stream<? extends T> b, final Stream<? extends T> c, final Stream<? extends T> d) {
 
         return Stream.concat(Stream.concat(a, b), Stream.concat(c, d));
     }
@@ -58,8 +61,8 @@ public final class _Streams {
      * 5 param variant of {@link Stream#concat(Stream, Stream)}
      */
     public static <T> Stream<T> concat(
-            Stream<? extends T> a, Stream<? extends T> b, Stream<? extends T> c, Stream<? extends T> d,
-            Stream<? extends T> e) {
+            final Stream<? extends T> a, final Stream<? extends T> b, final Stream<? extends T> c, final Stream<? extends T> d,
+            final Stream<? extends T> e) {
 
         return Stream.concat(
                 Stream.concat(Stream.concat(a, b), Stream.concat(c, d)),
@@ -70,8 +73,8 @@ public final class _Streams {
      * 6 param variant of {@link Stream#concat(Stream, Stream)}
      */
     public static <T> Stream<T> concat(
-            Stream<? extends T> a, Stream<? extends T> b, Stream<? extends T> c, Stream<? extends T> d,
-            Stream<? extends T> e, Stream<? extends T> f) {
+            final Stream<? extends T> a, final Stream<? extends T> b, final Stream<? extends T> c, final Stream<? extends T> d,
+            final Stream<? extends T> e, final Stream<? extends T> f) {
 
         return Stream.concat(
                 Stream.concat(Stream.concat(a, b), Stream.concat(c, d)),
@@ -82,8 +85,8 @@ public final class _Streams {
      * 7 param variant of {@link Stream#concat(Stream, Stream)}
      */
     public static <T> Stream<T> concat(
-            Stream<? extends T> a, Stream<? extends T> b, Stream<? extends T> c, Stream<? extends T> d,
-            Stream<? extends T> e, Stream<? extends T> f, Stream<? extends T> g) {
+            final Stream<? extends T> a, final Stream<? extends T> b, final Stream<? extends T> c, final Stream<? extends T> d,
+            final Stream<? extends T> e, final Stream<? extends T> f, final Stream<? extends T> g) {
 
         return Stream.concat(
                 Stream.concat(Stream.concat(a, b), Stream.concat(c, d)),
@@ -94,11 +97,24 @@ public final class _Streams {
      * 8 param variant of {@link Stream#concat(Stream, Stream)}
      */
     public static <T> Stream<T> concat(
-            Stream<? extends T> a, Stream<? extends T> b, Stream<? extends T> c, Stream<? extends T> d,
-            Stream<? extends T> e, Stream<? extends T> f, Stream<? extends T> g, Stream<? extends T> h) {
+            final Stream<? extends T> a, final Stream<? extends T> b, final Stream<? extends T> c, final Stream<? extends T> d,
+            final Stream<? extends T> e, final Stream<? extends T> f, final Stream<? extends T> g, final Stream<? extends T> h) {
 
         return Stream.concat(
                 Stream.concat(Stream.concat(a, b), Stream.concat(c, d)),
                 Stream.concat(Stream.concat(e, f), Stream.concat(g, h)));
     }
+
+    /**
+     * Conditionally sorts the stream based on presence of a comparator.
+     * @return null for null
+     */
+    public static <T> Stream<T> sortConditionally(
+        @Nullable final Stream<T> input,
+        @Nullable final Comparator<? super T> comparator) {
+        if(comparator==null) return input;
+        if(input==null) return null;
+        return input.sorted(comparator);
+    }
+
 }
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/DataTableInteractive.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/DataTableInteractive.java
index 7bb711371fb..cc78c3a5b10 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/DataTableInteractive.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/DataTableInteractive.java
@@ -120,11 +120,12 @@ public interface DataTableInteractive extends MultiselectChoices {
 
     // -- SELECTION
 
-    Bindable<Boolean> getSelectAllToggle();
     void doProgrammaticToggle(Runnable runnable);
     Set<Integer> getSelectedRowIndexes();
     Observable<Can<DataRow>> getDataRowsSelected();
     void selectRangeOfRowsByIndex(IntStream range, boolean select);
+    void selectAllFiltered(boolean select);
+    void selectAll(boolean select);
 
     // -- EXPORTING
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/internal/DataTableInternal.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/internal/DataTableInternal.java
index 583846fbcf9..c70036630b0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/internal/DataTableInternal.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/internal/DataTableInternal.java
@@ -39,6 +39,7 @@ import org.apache.causeway.commons.internal.binding._BindableAbstract;
 import org.apache.causeway.commons.internal.binding._Bindables;
 import org.apache.causeway.commons.internal.binding._Observables;
 import org.apache.causeway.commons.internal.binding._Observables.LazyObservable;
+import org.apache.causeway.commons.internal.collections._Streams;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 import org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
 import org.apache.causeway.core.metamodel.interactions.managed.CollectionInteraction;
@@ -108,7 +109,6 @@ implements DataTableInteractive {
     @Getter private final @NonNull LazyObservable<Can<DataRow>> dataRows;
     @Getter private final @NonNull LazyObservable<Can<DataRow>> dataRowsFilteredAndSorted;
     @Getter private final @NonNull LazyObservable<Can<DataRow>> dataRowsSelected;
-    @Getter private final _BindableAbstract<Boolean> selectAllToggle;
     @Getter private final _BindableAbstract<ColumnSort> columnSort;
 
     @Getter private final @NonNull LazyObservable<Can<DataColumn>> dataColumns;
@@ -150,10 +150,9 @@ implements DataTableInteractive {
                 .collect(Can.toCan()));
 
         this.dataRowsFilteredAndSorted = _Observables.lazy(()->
-            dataRows.getValue().stream()
-                .filter(adaptSearchPredicate())
-                .sorted(sortingComparator()
-                        .orElseGet(()->(a, b)->0)) // else don't sort (no-op comparator for streams)
+            _Streams.sortConditionally(
+                    dataRows.getValue().stream().filter(adaptSearchPredicate()),
+                    sortingComparator().orElse(null))
                 .collect(Can.toCan()));
 
         this.dataRowsSelected = _Observables.lazy(()->
@@ -162,15 +161,6 @@ implements DataTableInteractive {
                 .collect(Can.toCan()));
 
         this.selectionChanges = _Bindables.forValue(Boolean.FALSE);
-        this.selectAllToggle = _Bindables.forValue(Boolean.FALSE);
-        this.selectAllToggle.addListener((e,o,isAllOn)->{
-            //_Debug.onClearToggleAll(o, isAllOn, isClearToggleAllEvent.get());
-            if(isClearToggleAllEvent.get()) return;
-
-            doProgrammaticToggle(()->{
-                dataRows.getValue().forEach(dataRow->dataRow.getSelectToggle().setValue(isAllOn));
-            });
-        });
 
         this.searchArgument.addListener((e,o,n)->{
             dataRowsFilteredAndSorted.invalidate();
@@ -272,15 +262,6 @@ implements DataTableInteractive {
     // -- TOGGLE ALL
 
     private final AtomicBoolean isProgrammaticToggle = new AtomicBoolean();
-    private final AtomicBoolean isClearToggleAllEvent = new AtomicBoolean();
-    public void clearToggleAll() {
-        try {
-            isClearToggleAllEvent.set(true);
-            selectAllToggle.setValue(Boolean.FALSE);
-        } finally {
-            isClearToggleAllEvent.set(false);
-        }
-    }
 
     @Override
     public void doProgrammaticToggle(final @NonNull Runnable runnable) {
@@ -297,8 +278,6 @@ implements DataTableInteractive {
 
     void handleRowSelectToggle() {
         if(isProgrammaticToggle.get()) return;
-        // in any case, if we have a toggle state change, clear the toggle all bindable
-        clearToggleAll();
         invalidateSelectionThenNotifyListeners();
     }
 
@@ -308,6 +287,26 @@ implements DataTableInteractive {
         selectionChanges.setValue(!selectionChanges.getValue());
     }
 
+    @Override
+    public void selectAll(final boolean select) {
+        doProgrammaticToggle(()->{
+            dataRows.getValue()
+                .forEach(dataRow->{
+                    dataRow.getSelectToggle().setValue(select);
+                });
+        });
+    }
+
+    @Override
+    public void selectAllFiltered(final boolean select) {
+        doProgrammaticToggle(()->{
+            dataRowsFilteredAndSorted.getValue()
+                .forEach(dataRow->{
+                    dataRow.getSelectToggle().setValue(select);
+                });
+        });
+    }
+
     @Override
     public void selectRangeOfRowsByIndex(final IntStream range, final boolean select) {
         doProgrammaticToggle(()->{
diff --git a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
index 1f7a0d51bd2..fe68c794204 100644
--- a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
+++ b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CollectionInteractionTest.java
@@ -85,13 +85,12 @@ class CollectionInteractionTest extends InteractionTestAbstract {
                 expectedElements.get(3)));
 
         // toggle all on
-        tableTester.getDataTable().getSelectAllToggle().setValue(true);
+        tableTester.getDataTable().selectAll(true);
         tableTester.assertDataRowSelectionIsAll();
 
         // toggle all off
-        tableTester.getDataTable().getSelectAllToggle().setValue(false);
+        tableTester.getDataTable().selectAll(false);
         tableTester.assertDataRowSelectionIsEmpty();
-
     }
 
     @Test
diff --git a/viewers/wicket/ui/src/main/java/module-info.java b/viewers/wicket/ui/src/main/java/module-info.java
index 1e1e0a5647f..0f5764c96bf 100644
--- a/viewers/wicket/ui/src/main/java/module-info.java
+++ b/viewers/wicket/ui/src/main/java/module-info.java
@@ -77,7 +77,6 @@ module org.apache.causeway.viewer.wicket.ui {
     exports org.apache.causeway.viewer.wicket.ui.components.layout.bs.col;
     exports org.apache.causeway.viewer.wicket.ui.components.widgets.bootstrap;
     exports org.apache.causeway.viewer.wicket.ui.components.actioninfo;
-    exports org.apache.causeway.viewer.wicket.ui.components.collection.bulk;
     exports org.apache.causeway.viewer.wicket.ui.pages.entity;
     exports org.apache.causeway.viewer.wicket.ui.components.scalars.bool;
     exports org.apache.causeway.viewer.wicket.ui.pages.accmngt.register;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
index 58c647c2bc1..b1d67110d06 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -18,8 +18,6 @@
  */
 package org.apache.causeway.viewer.wicket.ui.components.collection;
 
-import java.util.Optional;
-
 import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
 
 import org.apache.causeway.commons.collections.Can;
@@ -27,10 +25,8 @@ import org.apache.causeway.core.metamodel.tabular.DataTableInteractive;
 import org.apache.causeway.viewer.commons.model.components.UiComponentType;
 import org.apache.causeway.viewer.wicket.model.models.ActionModel;
 import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelParented;
-import org.apache.causeway.viewer.wicket.ui.components.collection.bulk.MultiselectToggleProvider;
 import org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorPanel;
 import org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorProvider;
-import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ToggleboxColumn;
 import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
 import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
 
@@ -46,8 +42,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
 public class CollectionPanel
 extends PanelAbstract<DataTableInteractive, EntityCollectionModelParented>
 implements
-    CollectionPresentationSelectorProvider,
-    MultiselectToggleProvider {
+    CollectionPresentationSelectorProvider {
 
     private static final long serialVersionUID = 1L;
 
@@ -85,20 +80,4 @@ implements
         setOutputMarkupId(true);
     }
 
-    // -- MULTI SELECTION SUPPORT
-
-    private transient Optional<ToggleboxColumn> toggleboxColumn;
-
-    @Override
-    public ToggleboxColumn getToggleboxColumn() {
-        if(toggleboxColumn == null) {
-            var collModel = getModel();
-            var collMetaModel = collModel.getMetaModel();
-            toggleboxColumn =  collMetaModel.hasAssociatedActionsWithChoicesFromThisCollection()
-                    ? Optional.of(new ToggleboxColumn(collModel.getElementType(), collModel.delegate()))
-                    : Optional.empty();
-        }
-        return toggleboxColumn.orElse(null);
-    }
-
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/bulk/MultiselectToggleProvider.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/bulk/MultiselectToggleProvider.java
deleted file mode 100644
index 0aef2962736..00000000000
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/bulk/MultiselectToggleProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.viewer.wicket.ui.components.collection.bulk;
-
-import java.io.Serializable;
-
-import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ToggleboxColumn;
-
-public interface MultiselectToggleProvider extends Serializable {
-
-    ToggleboxColumn getToggleboxColumn();
-}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
index 90a18f4d690..a6c4bb3eb24 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
@@ -119,7 +119,12 @@
 
 .collectionContentsAsAjaxTablePanel table.contents tbody .togglebox-column {
     width: 2%;
+    text-align: center;
+}
+.collectionContentsAsAjaxTablePanel table.contents thead .togglebox-column .dropdown-item li {
+	opacity:1;
 }
+
 .collectionContentsAsAjaxTablePanel table.contents thead .title-column,
 .collectionContentsAsAjaxTablePanel table.contents tbody .title-column {
     text-align: center;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 294b0bc955f..8b7b095bf95 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -21,7 +21,6 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
@@ -38,7 +37,7 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.causeway.core.metamodel.tabular.DataTableInteractive;
 import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
 import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel.Variant;
-import org.apache.causeway.viewer.wicket.ui.components.collection.bulk.MultiselectToggleProvider;
+import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelParented;
 import org.apache.causeway.viewer.wicket.ui.components.collection.count.CollectionCountProvider;
 import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ActionColumn;
 import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ColumnAbbreviationOptions;
@@ -49,6 +48,7 @@ import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxta
 import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.TitleColumn;
 import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ToggleboxColumn;
 import org.apache.causeway.viewer.wicket.ui.components.table.CausewayAjaxDataTable;
+import org.apache.causeway.viewer.wicket.ui.components.table.DataTableWithPagesAndFilter;
 import org.apache.causeway.viewer.wicket.ui.components.table.filter.FilterToolbar;
 import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
@@ -121,10 +121,6 @@ implements CollectionCountProvider {
                 getWicketViewerSettings(),
                 columns);
 
-        // prepend toggle-box column (left most), if enabled
-        getToggleboxColumn()
-            .ifPresent(toggleboxColumn->columns.add(0, toggleboxColumn));
-
         // last append action column
         //TODO[CAUSEWAY-3815] disabled until action column rendering is fleshed out
         addActionsColumnIfRequired(elementType, columns);
@@ -134,21 +130,21 @@ implements CollectionCountProvider {
                 ID_TABLE, columns, dataProvider, collectionModel.getPageSize());
         addOrReplace(dataTable);
 
+        // prepend toggle-box column (left most), if enabled
+        createToggleboxColumn(dataTable)
+            .ifPresent(toggleboxColumn->columns.add(0, toggleboxColumn));
+
         addFilterToolbar(dataTable);
     }
 
-    private Optional<ToggleboxColumn> getToggleboxColumn() {
-        return getMultiselectToggleProvider()
-                .map(MultiselectToggleProvider::getToggleboxColumn);
-    }
+    // -- MULTI SELECTION SUPPORT
 
-    private Optional<MultiselectToggleProvider> getMultiselectToggleProvider() {
-        Component component = this;
-        while(component != null) {
-            if(component instanceof MultiselectToggleProvider) {
-                return Optional.of((MultiselectToggleProvider) component);
-            }
-            component = component.getParent();
+    private Optional<ToggleboxColumn> createToggleboxColumn(final DataTableWithPagesAndFilter<?, ?> dataTable) {
+        if(entityCollectionModel() instanceof EntityCollectionModelParented collModel) {
+            var collMetaModel = collModel.getMetaModel();
+            return collMetaModel.hasAssociatedActionsWithChoicesFromThisCollection()
+                    ? Optional.of(new ToggleboxColumn(collModel.getElementType(), dataTable))
+                    : Optional.empty();
         }
         return Optional.empty();
     }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java
deleted file mode 100644
index 1141d6618c2..00000000000
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/BulkToggleWkt.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns;
-
-import java.util.Optional;
-
-import org.apache.wicket.model.IModel;
-
-import org.springframework.lang.Nullable;
-
-import org.apache.causeway.commons.binding.Bindable;
-import org.apache.causeway.core.metamodel.tabular.DataTableInteractive;
-import org.apache.causeway.viewer.wicket.model.models.binding.BooleanBinding;
-
-/**
- * Boolean {@link IModel} to bind to the associated {@link DataTableInteractive}'s
- * select-all-toggle model to handle bulk check-box selection.
- */
-public class BulkToggleWkt
-extends BooleanBinding<DataTableInteractive> {
-
-    private static final long serialVersionUID = 1L;
-
-    public BulkToggleWkt(final IModel<DataTableInteractive> dataTableModelHolder) {
-        super(dataTableModelHolder);
-    }
-
-    @Override
-    protected Optional<Bindable<Boolean>> getBindable(
-            final @Nullable DataTableInteractive dataTable) {
-        return dataTable!=null
-                ? Optional.ofNullable(dataTable.getSelectAllToggle())
-                : Optional.empty();
-    }
-
-}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericColumnAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericColumnAbstract.java
index 24c7603de2b..1bd7d43243e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericColumnAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericColumnAbstract.java
@@ -118,7 +118,7 @@ implements GenericColumn, HasMetaModelContext {
     }
 
     protected String translate(final String raw) {
-        return getMetaModelContext().getTranslationService().translate(TranslationContext.empty(), raw);
+        return getTranslationService().translate(TranslationContext.empty(), raw);
     }
 
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ToggleboxColumn.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ToggleboxColumn.java
index 96af6228994..609ac9ad51b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ToggleboxColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ToggleboxColumn.java
@@ -21,14 +21,13 @@ package org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxt
 import java.util.List;
 
 import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.IModel;
 
 import org.apache.causeway.commons.internal.collections._Lists;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-import org.apache.causeway.core.metamodel.tabular.DataTableInteractive;
 import org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataRowToggleWkt;
 import org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataRowWkt;
+import org.apache.causeway.viewer.wicket.ui.components.table.DataTableWithPagesAndFilter;
+import org.apache.causeway.viewer.wicket.ui.components.table.nav.pageact.PageActionChooser;
 import org.apache.causeway.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
 
@@ -45,14 +44,14 @@ extends GenericColumnAbstract {
         public boolean isSetAll() { return this == SET_ALL; }
     }
 
-    private final IModel<DataTableInteractive> dataTableModelHolder;
     private final List<ContainedToggleboxPanel> rowToggles = _Lists.newArrayList();
+    private DataTableWithPagesAndFilter<?, ?> table;
 
     public ToggleboxColumn(
             final ObjectSpecification elementType,
-            final IModel<DataTableInteractive> dataTableModelHolder) {
+            final DataTableWithPagesAndFilter<?, ?> table) {
         super(elementType, "");
-        this.dataTableModelHolder = dataTableModelHolder;
+        this.table = table;
     }
 
     public void removeToggles() {
@@ -64,31 +63,14 @@ extends GenericColumnAbstract {
         var dataRowToggle = new DataRowToggleWkt(dataRowWkt);
         var rowToggle = new ContainedToggleboxPanel(componentId, dataRowToggle);
         rowToggles.add(rowToggle);
-        return rowToggle.setOutputMarkupId(true);
+        return rowToggle;
     }
 
     @Override
     public Component getHeader(final String componentId) {
-        var bulkToggle = new ContainedToggleboxPanel(
-                componentId,
-                new BulkToggleWkt(dataTableModelHolder),
-                    this::onBulkUpdate);
-        Wkt.cssAppend(bulkToggle, "togglebox-column");
-        return bulkToggle;
-    }
-
-    // -- HELPER
-
-    private void onBulkUpdate(final Boolean isChecked, final AjaxRequestTarget target) {
-        var dataTableInteractive = dataTableModelHolder.getObject();
-
-        dataTableInteractive.doProgrammaticToggle(()->{
-            var bulkToggle = BulkToggle.valueOf(isChecked);
-            for (ContainedToggleboxPanel rowToggle : rowToggles) {
-                rowToggle.set(bulkToggle, target);
-            }
-        });
-
+        var pageActionChooser = new PageActionChooser(componentId, table);
+        Wkt.cssAppend(pageActionChooser, "togglebox-column");
+        return pageActionChooser;
     }
 
 }
\ No newline at end of file
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 bd860523d5c..024b4391144 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
@@ -161,8 +161,10 @@ public abstract class DataTableWithPagesAndFilter<T, S> extends DataTable<T, S>
     public List<PageActionChoice> getPageActionChoices() {
         return isRowSelectionEnabled()
                 ? List.of(
-                    new PageActionChoice("PAGE_SEL", translate("select all rows of this page")),
-                    new PageActionChoice("PAGE_UNSEL", translate("unselect all rows of this page")))
+                    new PageActionChoice("SEL_ALL", translate("select ALL (filtered) rows of this table")),
+                    new PageActionChoice("CLEAR", translate("CLEAR selection")),
+                    new PageActionChoice("PAGE_SEL", translate("select ALL rows of this PAGE")),
+                    new PageActionChoice("PAGE_UNSEL", translate("unselect ALL rows of this PAGE")))
                 : Collections.emptyList();
     }
 
@@ -174,16 +176,24 @@ public abstract class DataTableWithPagesAndFilter<T, S> extends DataTable<T, S>
      */
     public boolean executePageAction(final PageActionChoice pageActionChoice) {
         switch(pageActionChoice.getKey()) {
-        case "PAGE_SEL": {
-            _TableUtils.interactive(this).selectRangeOfRowsByIndex(getCurrentPageRowIndexes(), true);
-            return true;
-        }
-        case "PAGE_UNSEL": {
-            _TableUtils.interactive(this).selectRangeOfRowsByIndex(getCurrentPageRowIndexes(), false);
-            return true;
-        }
-        default:
-            return false; // ignore, bale out
+            case "SEL_ALL": {
+                _TableUtils.interactive(this).selectAllFiltered(true);
+                return true;
+            }
+            case "CLEAR": {
+                _TableUtils.interactive(this).selectAll(false);
+                return true;
+            }
+            case "PAGE_SEL": {
+                _TableUtils.interactive(this).selectRangeOfRowsByIndex(getCurrentPageRowIndexes(), true);
+                return true;
+            }
+            case "PAGE_UNSEL": {
+                _TableUtils.interactive(this).selectRangeOfRowsByIndex(getCurrentPageRowIndexes(), false);
+                return true;
+            }
+            default:
+                return false; // ignore, bale out
         }
     }
 
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 df38605be40..b18472f2710 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
@@ -49,7 +49,7 @@ public class FilterToolbar extends Panel {
     }
 
     /**
-     * Only shows this search bar when there are more than 1 rows.
+     * Only shows this search bar when there are more than 1 rows (unfiltered).
      */
     @Override
     protected void onConfigure() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/head/HeadersToolbar.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/head/HeadersToolbar.html
index b393acee4ec..c01ae0aa14c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/head/HeadersToolbar.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/head/HeadersToolbar.html
@@ -20,7 +20,7 @@
         <wicket:container wicket:id="headers">
             <th wicket:id="header">
                 <div>
-                    <strong wicket:id="label" class="column-header-label">[header-label]</strong>
+                    <strong wicket:id="label">[header-label]</strong>
 					<span wicket:id="sortIcon" class="table-header-sortIcon" style="margin-left: 0.2em"></span>
                 </div>
             </th>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/head/HeadersToolbarAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/head/HeadersToolbarAbstract.java
index 04aa245032f..f14c87e1180 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/head/HeadersToolbarAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/head/HeadersToolbarAbstract.java
@@ -41,15 +41,12 @@ import org.apache.wicket.markup.repeater.RefreshingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
-import org.apache.causeway.applib.services.i18n.TranslationContext;
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.core.config.CausewayConfiguration;
-import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.TitleColumn;
 import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ToggleboxColumn;
 import org.apache.causeway.viewer.wicket.ui.components.table.CausewayAjaxDataTable;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
 
 import de.agilecoders.wicket.core.util.Attributes;
 
@@ -136,9 +133,8 @@ abstract class HeadersToolbarAbstract<S> extends AbstractToolbar {
                 Component sortIcon = newSortIcon("sortIcon", column, stateLocator);
                 header.add(label, sortIcon);
 
-                if(column instanceof ToggleboxColumn) {
-                    WktTooltips.addTooltip(header, 
-                            translate("Toggle select/unselect all rows across all pages."));
+                if(!(column instanceof ToggleboxColumn)) {
+                    Wkt.cssAppend(label, "column-header-label");
                 }
                 if(column instanceof TitleColumn) {
                     Wkt.cssAppend(header, "title-column");
@@ -147,12 +143,7 @@ abstract class HeadersToolbarAbstract<S> extends AbstractToolbar {
                         ? "column-sortable"
                         : "column-nonsortable");
             }
-            
-            private String translate(String text) {
-                return MetaModelContext.translationServiceOrFallback()
-                        .translate(TranslationContext.named("Table"), text);
-            }
-            
+
         };
         add(headers);
     }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.html
index 098dfd817d1..91ed8c9f657 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.html
@@ -18,7 +18,6 @@
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
     <tr class="navigation">
         <td wicket:id="span">
-			<div class="pageActionChooser"><div wicket:id="pageActionChooser">[pageActionChooser]</div></div>
 			<div class="pagesizeChooser"><div wicket:id="pagesizeChooser">[pagesizeChooser]</div></div>
             <div class="navigatorLabel">
                 <span wicket:id="navigatorLabel">[navigator-label]</span>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java
index 315d701f5c5..85e1f86a2b8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java
@@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
 import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
 import org.apache.causeway.viewer.wicket.model.timetaken.TimeTakenModel;
 import org.apache.causeway.viewer.wicket.ui.components.table.DataTableWithPagesAndFilter;
-import org.apache.causeway.viewer.wicket.ui.components.table.nav.pageact.PageActionChooser;
 import org.apache.causeway.viewer.wicket.ui.components.table.nav.pagesize.PagesizeChooser;
 import org.apache.causeway.viewer.wicket.ui.components.table.nav.paging.PageNavigator;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
@@ -36,7 +35,6 @@ implements HasCommonContext {
     private static final long serialVersionUID = 1L;
 
     private static final String NAVIGATOR_CONTAINER_ID = "span";
-    private static final String ID_PAGE_ACTION_CHOOSER = "pageActionChooser";
     private static final String ID_PAGESIZE_CHOOSER = "pagesizeChooser";
 
     /**
@@ -63,9 +61,6 @@ implements HasCommonContext {
     private void buildGui() {
         var navigatorContainer = navigatorContainer();
 
-        Wkt.add(navigatorContainer,
-                new PageActionChooser(ID_PAGE_ACTION_CHOOSER, getTable()));
-
         Wkt.add(navigatorContainer,
                 new PagesizeChooser(ID_PAGESIZE_CHOOSER, getTable()));
 
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
index 89252df17e5..122fc6e3f46 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
@@ -18,13 +18,9 @@
  */
 package org.apache.causeway.viewer.wicket.ui.components.widgets.checkbox;
 
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
-import org.danekja.java.util.function.serializable.SerializableBiConsumer;
 
-import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ToggleboxColumn.BulkToggle;
 import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
 
@@ -40,31 +36,13 @@ extends PanelAbstract<Boolean, Model<Boolean>> {
     private static final String ID_FORM = "form";
     private static final String ID_TOGGLEBOX = "togglebox";
 
-    private final AjaxCheckBox checkbox;
-
     public ContainedToggleboxPanel(
             final String id,
             final IModel<Boolean> model) {
-        this(id, model, (x,y)->{/*noop*/});
-    }
-
-    public ContainedToggleboxPanel(
-            final String id,
-            final IModel<Boolean> model,
-            final SerializableBiConsumer<Boolean, AjaxRequestTarget> onUpdate) {
         super(id);
         var markupContainer = Wkt.containerAdd(this, ID_CONTAINER);
         var form = Wkt.formAdd(markupContainer, ID_FORM);
-        this.checkbox = Wkt.checkboxAdd(
-                form, ID_TOGGLEBOX, model, ajaxTarget->
-                    onUpdate.accept(model.getObject(), ajaxTarget));
-    }
-
-    public void set(
-            final BulkToggle bulkToggle,
-            final AjaxRequestTarget target) {
-        checkbox.setModelObject(bulkToggle.isSetAll());
-        target.add(this);
+        Wkt.checkboxAdd(form, ID_TOGGLEBOX, model, ajaxTarget->{/*noop*/});
     }
 
 }