chore: update imports

Author: iobuhov

packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts

@@ -1,4 +1,4 @@
-import { compactArray, fromCompactArray, isAnd } from "@mendix/filter-commons/condition-utils.js";
+import { compactArray, fromCompactArray, isAnd } from "@mendix/filter-commons/condition-utils";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
 import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
 import { FilterCondition } from "mendix/filters";

packages/pluggableWidgets/datagrid-web/src/helpers/state/ColumnGroupStore.ts

@@ -1,5 +1,5 @@
-import { disposeFx } from "@mendix/widget-plugin-filtering/mobx-utils";
-import { FiltersSettingsMap } from "@mendix/widget-plugin-filtering/typings/settings";
+import { FiltersSettingsMap } from "@mendix/filter-commons/typings/settings";
+import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
 import { FilterCondition } from "mendix/filters";
 import { action, computed, makeObservable, observable } from "mobx";
 import { DatagridContainerProps } from "../../../typings/DatagridProps";
@@ -83,17 +83,16 @@ export class ColumnGroupStore implements IColumnGroupStore, IColumnParentStore {
     }
 
     setup(): () => void {
-        const [disposers, dispose] = disposeFx();
+        const [add, dispose] = disposeBatch();
         for (const filter of this.columnFilters) {
-            disposers.push(filter.setup());
+            add(filter.setup());
         }
         return dispose;
     }
 
     updateProps(props: Pick<DatagridContainerProps, "columns">): void {
         props.columns.forEach((columnProps, i) => {
             this._allColumns[i].updateProps(columnProps);
-            this.columnFilters[i].updateProps(columnProps);
         });
 
         if (this.visibleColumns.length < 1) {
@@ -145,7 +144,7 @@ export class ColumnGroupStore implements IColumnGroupStore, IColumnParentStore {
 
     get conditions(): Array<FilterCondition | undefined> {
         return this.columnFilters.map((store, index) => {
-            return this._allColumns[index].isHidden ? undefined : store.condition2;
+            return this._allColumns[index].isHidden ? undefined : store.condition;
         });
     }
 

packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts

@@ -1,6 +1,6 @@
+import { FiltersSettingsMap } from "@mendix/filter-commons/typings/settings";
 import { error, Result, value } from "@mendix/widget-plugin-filtering/result-meta";
 import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver";
-import { FiltersSettingsMap } from "@mendix/widget-plugin-filtering/typings/settings";
 import { action, comparer, computed, IReactionDisposer, makeObservable, reaction } from "mobx";
 import { DatagridContainerProps } from "../../../typings/DatagridProps";
 import { ColumnId } from "../../typings/GridColumn";

packages/pluggableWidgets/datagrid-web/src/typings/personalization-settings.ts

@@ -1,4 +1,4 @@
-import { FilterData } from "@mendix/widget-plugin-filtering/typings/settings";
+import { FilterData } from "@mendix/filter-commons/typings/settings";
 import { ColumnId } from "./GridColumn";
 import { SortDirection, SortRule } from "./sorting";
 

packages/pluggableWidgets/datagrid-web/src/utils/test-utils.tsx

@@ -29,9 +29,7 @@ export const column = (header = "Test", patch?: (col: ColumnsType) => void): Col
         visible: dynamicValue(true),
         minWidth: "auto",
         minWidthLimit: 100,
-        allowEventPropagation: true,
-        fetchOptionsLazy: true,
-        filterCaptionType: "attribute"
+        allowEventPropagation: true
     };
 
     if (patch) {