refactor: remove header filter

Author: iobuhov

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

@@ -1,4 +1,4 @@
-import { compactArray, fromCompactArray, isAnd } from "@mendix/widget-plugin-filtering/condition-utils";
+import { compactArray, fromCompactArray, isAnd } from "@mendix/filter-commons/condition-utils.js";
 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";
@@ -19,34 +19,27 @@ interface FiltersInput {
 type DatasourceParamsControllerSpec = {
     query: QueryController;
     columns: Columns;
-    header: FiltersInput;
     customFilters: FiltersInput;
 };
 
 export class DatasourceParamsController implements ReactiveController {
     private columns: Columns;
-    private header: FiltersInput;
     private query: QueryController;
     private customFilters: FiltersInput;
 
     constructor(host: ReactiveControllerHost, spec: DatasourceParamsControllerSpec) {
         host.addController(this);
         this.columns = spec.columns;
-        this.header = spec.header;
         this.query = spec.query;
         this.customFilters = spec.customFilters;
 
         makeAutoObservable(this, { setup: false });
     }
 
     private get derivedFilter(): FilterCondition | undefined {
-        const { columns, header, customFilters } = this;
+        const { columns, customFilters } = this;
 
-        return and(
-            compactArray(columns.conditions),
-            compactArray(header.conditions),
-            compactArray(customFilters.conditions)
-        );
+        return and(compactArray(columns.conditions), compactArray(customFilters.conditions));
     }
 
     private get derivedSortOrder(): SortInstruction[] | undefined {
@@ -75,22 +68,18 @@ export class DatasourceParamsController implements ReactiveController {
 
     static unzipFilter(
         filter?: FilterCondition
-    ): [
-        columns: Array<FilterCondition | undefined>,
-        header: Array<FilterCondition | undefined>,
-        sharedFilter: Array<FilterCondition | undefined>
-    ] {
+    ): [columns: Array<FilterCondition | undefined>, sharedFilter: Array<FilterCondition | undefined>] {
         if (!filter) {
-            return [[], [], []];
+            return [[], []];
         }
         if (!isAnd(filter)) {
-            return [[], [], []];
+            return [[], []];
         }
-        if (filter.args.length !== 3) {
-            return [[], [], []];
+        if (filter.args.length !== 2) {
+            return [[], []];
         }
 
-        const [columns, header, shared] = filter.args;
-        return [fromCompactArray(columns), fromCompactArray(header), fromCompactArray(shared)];
+        const [columns, shared] = filter.args;
+        return [fromCompactArray(columns), fromCompactArray(shared)];
     }
 }

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

@@ -1,5 +1,4 @@
 import { CustomFilterHost } from "@mendix/widget-plugin-filtering/stores/generic/CustomFilterHost";
-import { HeaderFiltersStore } from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore";
 import { BaseControllerHost } from "@mendix/widget-plugin-mobx-kit/BaseControllerHost";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
 import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
@@ -25,7 +24,6 @@ type Spec = {
 
 export class RootGridStore extends BaseControllerHost {
     columnsStore: ColumnGroupStore;
-    headerFiltersStore: HeaderFiltersStore;
     settingsStore: GridPersonalizationStore;
     staticInfo: StaticInfo;
     exportProgressCtrl: ProgressStore;
@@ -38,9 +36,7 @@ export class RootGridStore extends BaseControllerHost {
         super();
 
         const { props } = gate;
-        const [columnsInitFilter, headerInitFilter, sharedInitFilter] = DatasourceParamsController.unzipFilter(
-            props.datasource.filter
-        );
+        const [columnsInitFilter, sharedInitFilter] = DatasourceParamsController.unzipFilter(props.datasource.filter);
 
         this.gate = gate;
         this.staticInfo = {
@@ -53,21 +49,13 @@ export class RootGridStore extends BaseControllerHost {
             customFilterHost,
             sharedInitFilter
         }));
-        const header = (this.headerFiltersStore = new HeaderFiltersStore({
-            filterList: props.filterList,
-            filterChannelName: this.staticInfo.filtersChannelName,
-            headerInitFilter,
-            sharedInitFilter,
-            customFilterHost
-        }));
         this.settingsStore = new GridPersonalizationStore(props, this.columnsStore, customFilterHost);
         this.paginationCtrl = new PaginationController(this, { gate, query });
         this.exportProgressCtrl = exportCtrl;
 
         new DatasourceParamsController(this, {
             query,
             columns,
-            header,
             customFilters: customFilterHost
         });
 
@@ -87,7 +75,6 @@ export class RootGridStore extends BaseControllerHost {
         const [add, disposeAll] = disposeBatch();
         add(super.setup());
         add(this.columnsStore.setup());
-        add(this.headerFiltersStore.setup());
         add(() => this.settingsStore.dispose());
         add(autorun(() => this.updateProps(this.gate.props)));