feat(datagrid-web): refactor, remove duplicate logic, move new controller to helpers

Author: rahmanunver

packages/pluggableWidgets/datagrid-web/src/components/CheckboxColumnHeader.tsx

@@ -23,18 +23,19 @@ export function CheckboxColumnHeader(): ReactElement {
                 return;
             }
 
-            if (selectActionHelper.canSelectAllPages && selectionStatus !== "none") {
-                // Toggle off still uses normal flow
-                onSelectAll();
-                return;
-            }
-
-            if (selectActionHelper.canSelectAllPages && selectionStatus === "none") {
-                // Delegate to root store orchestration
-                await rootStore?.startMultiPageSelectAll(selectActionHelper);
+            // When multi-page selection is enabled, handle both select and unselect across all pages
+            if (selectActionHelper.canSelectAllPages) {
+                if (selectionStatus === "none") {
+                    // Select all pages
+                    await rootStore?.startMultiPageSelectAll(selectActionHelper);
+                } else {
+                    // Unselect all pages (both "all" and "some" states)
+                    await rootStore?.clearAllPages();
+                }
                 return;
             }
 
+            // Fallback to normal single-page toggle
             onSelectAll();
         };
 

packages/pluggableWidgets/datagrid-web/src/features/multi-page-selection/MultiPageSelectionController.ts

@@ -4,6 +4,7 @@ import { CustomFilterHost } from "@mendix/widget-plugin-filtering/stores/generic
 import { DatasourceController } from "@mendix/widget-plugin-grid/query/DatasourceController";
 import { QueryController } from "@mendix/widget-plugin-grid/query/query-controller";
 import { RefreshController } from "@mendix/widget-plugin-grid/query/RefreshController";
+import { clearAllPages, selectAllPages } from "@mendix/widget-plugin-grid/selection/select-all-pages";
 import { SelectionCountStore } from "@mendix/widget-plugin-grid/selection/stores/SelectionCountStore";
 import { BaseControllerHost } from "@mendix/widget-plugin-mobx-kit/BaseControllerHost";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
@@ -17,11 +18,10 @@ import { DerivedLoaderController } from "../../controllers/DerivedLoaderControll
 import { PaginationController } from "../../controllers/PaginationController";
 import { ProgressStore } from "../../features/data-export/ProgressStore";
 import { SelectAllProgressStore } from "../../features/multi-page-selection/SelectAllProgressStore";
-import { MultiPageSelectionController } from "../../features/multi-page-selection/MultiPageSelectionController";
 import { StaticInfo } from "../../typings/static-info";
+import { SelectActionHelper } from "../SelectActionHelper";
 import { ColumnGroupStore } from "./ColumnGroupStore";
 import { GridPersonalizationStore } from "./GridPersonalizationStore";
-import { SelectActionHelper } from "../SelectActionHelper";
 
 type RequiredProps = Pick<
     DatagridContainerProps,
@@ -55,7 +55,8 @@ export class RootGridStore extends BaseControllerHost {
     staticInfo: StaticInfo;
     exportProgressCtrl: ProgressStore;
     selectAllProgressStore: SelectAllProgressStore;
-    multiPageSelectionCtrl: MultiPageSelectionController;
+    private selectAllAbortController?: AbortController;
+    private selectAllLocked = false;
     loaderCtrl: DerivedLoaderController;
     paginationCtrl: PaginationController;
     readonly filterAPI: FilterAPI;
@@ -103,11 +104,6 @@ export class RootGridStore extends BaseControllerHost {
 
         this.selectAllProgressStore = new SelectAllProgressStore();
 
-        this.multiPageSelectionCtrl = new MultiPageSelectionController(this, {
-            query,
-            progressStore: this.selectAllProgressStore
-        });
-
         new DatasourceParamsController(this, {
             query,
             filterHost: combinedFilter,
@@ -146,33 +142,45 @@ export class RootGridStore extends BaseControllerHost {
     }
 
     async startMultiPageSelectAll(selectActionHelper: SelectActionHelper): Promise<void> {
-        const ds = this.gate.props.datasource;
-        const selectionHelper = this.basicData.currentSelectionHelper;
-
-        if (!selectionHelper) {
+        if (this.selectAllLocked) {
             return;
         }
 
         // Check if multi-page selection is possible
-        const canSelect = this.multiPageSelectionCtrl.canSelectAllPages(
-            selectActionHelper.canSelectAllPages,
-            selectActionHelper.selectionType
-        );
+        const canSelect = selectActionHelper.canSelectAllPages;
 
         if (!canSelect) {
             selectActionHelper.onSelectAll("selectAll");
             return;
         }
 
-        // Delegate to the controller
-        const success = await this.multiPageSelectionCtrl.selectAllPages(ds, selectionHelper);
+        this.selectAllLocked = true;
+        this.selectAllAbortController = new AbortController();
+        const success = await selectAllPages({
+            query: this.query as QueryController,
+            gate: this.gate as any,
+            progress: this.selectAllProgressStore,
+            bufferSize: selectActionHelper.selectAllPagesBufferSize,
+            signal: this.selectAllAbortController.signal
+        });
 
         if (!success) {
             selectActionHelper.onSelectAll("selectAll");
         }
+        this.selectAllLocked = false;
+        this.selectAllAbortController = undefined;
+    }
+
+    async clearAllPages(): Promise<void> {
+        clearAllPages(this.gate);
     }
 
     abortMultiPageSelect(): void {
-        this.multiPageSelectionCtrl.abort();
+        if (this.selectAllAbortController) {
+            this.selectAllAbortController.abort();
+            this.selectAllProgressStore.oncancel();
+            this.selectAllLocked = false;
+            this.selectAllAbortController = undefined;
+        }
     }
 }