feat: update datagrid deps

iobuhov · iobuhov · commit c88352b8f613 · 2025-10-28T11:43:02.000+01:00
diff --git a/packages/pluggableWidgets/datagrid-web/src/Datagrid.depsContainer.ts b/packages/pluggableWidgets/datagrid-web/src/Datagrid.depsContainer.ts
@@ -1,16 +1,15 @@
 import { FilterAPI, WidgetFilterAPI } from "@mendix/widget-plugin-filtering/context";
 import { CombinedFilter, CombinedFilterConfig } from "@mendix/widget-plugin-filtering/stores/generic/CombinedFilter";
 import { CustomFilterHost } from "@mendix/widget-plugin-filtering/stores/generic/CustomFilterHost";
-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 { DatasourceService, QueryService, RefreshController } from "@mendix/widget-plugin-grid/main";
+
 import { SelectionCountStore } from "@mendix/widget-plugin-grid/selection/stores/SelectionCountStore";
 import { ClosableGateProvider } from "@mendix/widget-plugin-mobx-kit/ClosableGateProvider";
 import { GateProvider } from "@mendix/widget-plugin-mobx-kit/GateProvider";
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
+import { DerivedPropsGate, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main";
 import { useConst } from "@mendix/widget-plugin-mobx-kit/react/useConst";
 import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup";
-import { ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+
 import { generateUUID } from "@mendix/widget-plugin-platform/framework/generate-uuid";
 import { Container, injected, token } from "brandi";
 import { useEffect } from "react";
@@ -64,11 +63,11 @@ export const TOKENS = {
     paramsService: token<DatasourceParamsController>("DatagridParamsService"),
     parentChannelName: token<string>("parentChannelName"),
     personalizationService: token<GridPersonalizationStore>("GridPersonalizationStore"),
-    query: token<QueryController>("QueryService"),
+    query: token<QueryService>("QueryService"),
     refreshInterval: token<number>("refreshInterval"),
     refreshService: token<RefreshController>("DatagridRefreshService"),
     selectionCounter: token<SelectionCountStore>("SelectionCountStore"),
-    setupService: token<ReactiveControllerHost>("DatagridSetupHost"),
+    setupService: token<SetupComponentHost>("DatagridSetupHost"),
     staticInfo: token<StaticInfo>("StaticInfo")
 };
 
@@ -119,8 +118,8 @@ class DatagridContainer extends Container {
         );
 
         // Query service
-        this.bind(TOKENS.query).toInstance(DatasourceController).inSingletonScope();
-        injected(DatasourceController, TOKENS.setupService, TOKENS.mainGate);
+        this.bind(TOKENS.query).toInstance(DatasourceService).inSingletonScope();
+        injected(DatasourceService, TOKENS.setupService, TOKENS.mainGate);
 
         // Pagination service
         this.bind(TOKENS.paginationService).toInstance(PaginationController).inSingletonScope();
diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts b/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts
@@ -1,6 +1,6 @@
-import { QueryController } from "@mendix/widget-plugin-grid/query/query-controller";
+import { QueryService } from "@mendix/widget-plugin-grid/main";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
-import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+import { SetupComponent, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main";
 import { FilterCondition } from "mendix/filters";
 import { reaction } from "mobx";
 import { SortInstruction } from "../typings/sorting";
@@ -13,14 +13,14 @@ interface ObservableSortStore {
     sortInstructions: SortInstruction[] | undefined;
 }
 
-export class DatasourceParamsController implements ReactiveController {
+export class DatasourceParamsController implements SetupComponent {
     constructor(
-        host: ReactiveControllerHost,
-        private query: QueryController,
+        host: SetupComponentHost,
+        private query: QueryService,
         private filterHost: ObservableFilterStore,
         private sortHost: ObservableSortStore
     ) {
-        host.addController(this);
+        host.add(this);
     }
 
     setup(): () => void {
diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/DerivedLoaderController.ts b/packages/pluggableWidgets/datagrid-web/src/controllers/DerivedLoaderController.ts
@@ -1,4 +1,4 @@
-import { QueryController } from "@mendix/widget-plugin-grid/query/query-controller";
+import { QueryService } from "@mendix/widget-plugin-grid/main";
 import { computed, makeObservable } from "mobx";
 import { ProgressStore } from "../features/data-export/ProgressStore";
 import { IColumnGroupStore } from "../helpers/state/ColumnGroupStore";
@@ -10,7 +10,7 @@ export interface DerivedLoaderControllerConfig {
 
 export class DerivedLoaderController {
     constructor(
-        private query: QueryController,
+        private query: QueryService,
         private exp: ProgressStore,
         private cols: IColumnGroupStore,
         private config: DerivedLoaderControllerConfig
diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/PaginationController.ts b/packages/pluggableWidgets/datagrid-web/src/controllers/PaginationController.ts
@@ -1,5 +1,5 @@
-import { QueryController } from "@mendix/widget-plugin-grid/query/query-controller";
-import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+import { QueryService } from "@mendix/widget-plugin-grid/main";
+import { SetupComponent, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main";
 import { PaginationEnum, ShowPagingButtonsEnum } from "../../typings/DatagridProps";
 
 export interface PaginationConfig {
@@ -11,16 +11,16 @@ export interface PaginationConfig {
 
 type PaginationKind = `${PaginationEnum}.${ShowPagingButtonsEnum}`;
 
-export class PaginationController implements ReactiveController {
+export class PaginationController implements SetupComponent {
     readonly pagination: PaginationEnum;
     readonly paginationKind: PaginationKind;
 
     constructor(
-        host: ReactiveControllerHost,
+        host: SetupComponentHost,
         private config: PaginationConfig,
-        private query: QueryController
+        private query: QueryService
     ) {
-        host.addController(this);
+        host.add(this);
         this.pagination = config.pagination;
         this.paginationKind = `${this.pagination}.${config.showPagingButtons}`;
         this.setInitParams();
@@ -60,7 +60,7 @@ export class PaginationController implements ReactiveController {
             this.query.requestTotalCount(true);
         }
 
-        this.query.setPageSize(this.pageSize);
+        this.query.setBaseLimit(this.pageSize);
     }
 
     setup(): void {}
diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/ColumnGroupStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/ColumnGroupStore.ts
@@ -4,8 +4,8 @@ import { ConditionWithMeta } from "@mendix/widget-plugin-filtering/typings/Condi
 import { ObservableFilterHost } from "@mendix/widget-plugin-filtering/typings/ObservableFilterHost";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
 
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
-import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+import { DerivedPropsGate, SetupComponent, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main";
+
 import { action, autorun, computed, makeObservable, observable, trace } from "mobx";
 import { DatagridContainerProps } from "../../../typings/DatagridProps";
 import { ColumnId, GridColumn } from "../../typings/GridColumn";
@@ -44,7 +44,7 @@ interface DynamicProps {
     datasource: DatagridContainerProps["datasource"];
 }
 
-export class ColumnGroupStore implements IColumnGroupStore, IColumnParentStore, ReactiveController {
+export class ColumnGroupStore implements IColumnGroupStore, IColumnParentStore, SetupComponent {
     readonly _allColumns: ColumnStore[];
     readonly _allColumnsById: Map<ColumnId, ColumnStore> = new Map();
 
@@ -56,12 +56,12 @@ export class ColumnGroupStore implements IColumnGroupStore, IColumnParentStore,
     isResizing = false;
 
     constructor(
-        host: ReactiveControllerHost,
+        host: SetupComponentHost,
         private gate: DerivedPropsGate<DynamicProps>,
         info: StaticInfo,
         filterHost: ObservableFilterHost
     ) {
-        host.addController(this);
+        host.add(this);
         const { props } = gate;
         this._allColumns = [];
         this.columnFilters = [];
diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridBasicData.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridBasicData.ts
@@ -1,5 +1,5 @@
 import { SelectionHelper, SelectionStatus } from "@mendix/widget-plugin-grid/selection";
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
+import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/main";
 import { makeAutoObservable } from "mobx";
 import { DatagridContainerProps } from "../../../typings/DatagridProps";
 
diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts
@@ -2,8 +2,7 @@ import { FiltersSettingsMap } from "@mendix/filter-commons/typings/settings";
 import { error, Result, value } from "@mendix/widget-plugin-filtering/result-meta";
 import { ObservableFilterHost } from "@mendix/widget-plugin-filtering/typings/ObservableFilterHost";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
-import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+import { DerivedPropsGate, SetupComponent, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main";
 import { action, autorun, comparer, computed, IReactionDisposer, makeObservable, reaction } from "mobx";
 import { DatagridContainerProps } from "../../../typings/DatagridProps";
 import { ColumnId } from "../../typings/GridColumn";
@@ -23,20 +22,20 @@ type RequiredProps = Pick<
     "name" | "configurationStorageType" | "storeFiltersInPersonalization" | "configurationAttribute"
 >;
 
-export class GridPersonalizationStore implements ReactiveController {
+export class GridPersonalizationStore implements SetupComponent {
     private readonly gridName: string;
     private readonly gridColumnsHash: string;
     private readonly schemaVersion: GridPersonalizationStorageSettings["schemaVersion"] = 3;
     private readonly storeFilters: boolean;
     private readonly storage: PersonalizationStorage;
 
     constructor(
-        host: ReactiveControllerHost,
+        host: SetupComponentHost,
         private gate: DerivedPropsGate<RequiredProps>,
         private columnsStore: ColumnGroupStore,
         private customFilters: ObservableFilterHost
     ) {
-        host.addController(this);
+        host.add(this);
         const { props } = this.gate;
         this.gridName = props.name;
         this.gridColumnsHash = getHash(this.columnsStore._allColumns, this.gridName);
diff --git a/packages/pluggableWidgets/datagrid-web/src/services/DatagridSetupService.ts b/packages/pluggableWidgets/datagrid-web/src/services/DatagridSetupService.ts
@@ -1,4 +1,4 @@
-import { BaseControllerHost } from "@mendix/widget-plugin-mobx-kit/BaseControllerHost";
+import { SetupHost } from "@mendix/widget-plugin-mobx-kit/SetupHost";
 
 /** Host for components implemented setup hook */
-export class DatagridSetupService extends BaseControllerHost {}
+export class DatagridSetupService extends SetupHost {}
