From 1b5055a121fdd5455abdb14a6af0387809a64834 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Wed, 26 Feb 2025 12:52:38 +0100 Subject: [PATCH 01/27] chore: add attributes to settings --- .../src/DatagridTextFilter.editorConfig.ts | 35 +++++++++---------- .../src/DatagridTextFilter.xml | 31 ++++++++++++++-- .../typings/DatagridTextFilterProps.d.ts | 19 ++++++++-- 3 files changed, 62 insertions(+), 23 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorConfig.ts b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorConfig.ts index 2414af2eae..f69cd2de34 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorConfig.ts +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorConfig.ts @@ -1,10 +1,4 @@ -import { - ContainerProps, - ImageProps, - StructurePreviewProps, - text, - structurePreviewPalette -} from "@mendix/widget-plugin-platform/preview/structure-preview-api"; +import { hidePropertyIn, Properties } from "@mendix/pluggable-widgets-tools"; import { containsIcon, containsIconDark, @@ -29,25 +23,28 @@ import { startsWithIcon, startsWithIconDark } from "@mendix/widget-plugin-filtering/preview/editor-preview-icons"; -import { hidePropertiesIn, hidePropertyIn, Properties } from "@mendix/pluggable-widgets-tools"; +import { + ContainerProps, + ImageProps, + structurePreviewPalette, + StructurePreviewProps, + text +} from "@mendix/widget-plugin-platform/preview/structure-preview-api"; import { DatagridTextFilterPreviewProps, DefaultFilterEnum } from "../typings/DatagridTextFilterProps"; -export function getProperties( - values: DatagridTextFilterPreviewProps, - defaultProperties: Properties, - platform: "web" | "desktop" -): Properties { +export function getProperties(values: DatagridTextFilterPreviewProps, defaultProperties: Properties): Properties { if (!values.adjustable) { hidePropertyIn(defaultProperties, values, "screenReaderButtonCaption"); } - if (platform === "web") { - if (!values.advanced) { - hidePropertiesIn(defaultProperties, values, ["onChange", "valueAttribute"]); - } - } else { - hidePropertyIn(defaultProperties, values, "advanced"); + + if (values.customAttrs === "auto") { + hidePropertyIn(defaultProperties, values, "attributes"); + hidePropertyIn(defaultProperties, values, "dataKey"); } + + hidePropertyIn(defaultProperties, {} as { linkedDs: unknown }, "linkedDs"); + return defaultProperties; } diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml index d8ed8c4cfc..f06220ea88 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml @@ -8,9 +8,36 @@ - - Enable advanced options + + Filterable attributes + + Auto + Custom + + + + Datasource to Filter + + + + Attributes + Select the attributes that the end-user may use for filtering. + + + + Attribute + + + + + + + + + + Data key + Arbitrary string of letters or numbers. Required to store and retrieve filter data, must be unique. Default value diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/typings/DatagridTextFilterProps.d.ts b/packages/pluggableWidgets/datagrid-text-filter-web/typings/DatagridTextFilterProps.d.ts index dfd4193e6a..e9e2994ffb 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/typings/DatagridTextFilterProps.d.ts +++ b/packages/pluggableWidgets/datagrid-text-filter-web/typings/DatagridTextFilterProps.d.ts @@ -4,16 +4,28 @@ * @author Mendix Widgets Framework Team */ import { CSSProperties } from "react"; -import { ActionValue, DynamicValue, EditableValue } from "mendix"; +import { ActionValue, AttributeMetaData, DynamicValue, EditableValue } from "mendix"; + +export type CustomAttrsEnum = "auto" | "custom"; + +export interface AttributesType { + attribute: AttributeMetaData; +} export type DefaultFilterEnum = "contains" | "startsWith" | "endsWith" | "greater" | "greaterEqual" | "equal" | "notEqual" | "smaller" | "smallerEqual" | "empty" | "notEmpty"; +export interface AttributesPreviewType { + attribute: string; +} + export interface DatagridTextFilterContainerProps { name: string; class: string; style?: CSSProperties; tabIndex?: number; - advanced: boolean; + customAttrs: CustomAttrsEnum; + attributes: AttributesType[]; + dataKey: string; defaultValue?: DynamicValue; defaultFilter: DefaultFilterEnum; placeholder?: DynamicValue; @@ -37,6 +49,9 @@ export interface DatagridTextFilterPreviewProps { renderMode: "design" | "xray" | "structure"; translate: (text: string) => string; advanced: boolean; + customAttrs: CustomAttrsEnum; + attributes: AttributesPreviewType[]; + dataKey: string; defaultValue: string; defaultFilter: DefaultFilterEnum; placeholder: string; From 0a4df80244fe49e4d3ce7ffc00fd885e9d8694d9 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Thu, 27 Feb 2025 10:40:41 +0100 Subject: [PATCH 02/27] chore: change interface --- .../datagrid-web/src/typings/personalization-settings.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-web/src/typings/personalization-settings.ts b/packages/pluggableWidgets/datagrid-web/src/typings/personalization-settings.ts index f51a4f9b4e..6c64391741 100644 --- a/packages/pluggableWidgets/datagrid-web/src/typings/personalization-settings.ts +++ b/packages/pluggableWidgets/datagrid-web/src/typings/personalization-settings.ts @@ -19,14 +19,14 @@ interface ColumnPersonalizationStorageSettings { export type ColumnFilterSettings = Array<[key: ColumnId, data: FilterData]>; -export type GroupFilterSettings = Array<[key: string, data: FilterData]>; +export type CustomFilterSettings = Array<[key: string, data: FilterData]>; export interface GridPersonalizationStorageSettings { name: string; - schemaVersion: 2; + schemaVersion: 3; settingsHash: string; columns: ColumnPersonalizationStorageSettings[]; - groupFilters: GroupFilterSettings; + customFilters: CustomFilterSettings; columnFilters: ColumnFilterSettings; columnOrder: ColumnId[]; sortOrder: SortRule[]; From 850f1a1c11c1d6591acc39f5cead099f7726823b Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:23:22 +0100 Subject: [PATCH 03/27] chore: rename controller --- ...ateSyncController.ts => DatasourceParamsController.ts} | 6 +++--- .../src/helpers/state/GridPersonalizationStore.ts | 8 ++++---- .../datagrid-web/src/helpers/state/RootGridStore.ts | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) rename packages/pluggableWidgets/datagrid-web/src/controllers/{StateSyncController.ts => DatasourceParamsController.ts} (92%) diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/StateSyncController.ts b/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts similarity index 92% rename from packages/pluggableWidgets/datagrid-web/src/controllers/StateSyncController.ts rename to packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts index 397c73e3c6..5c3bdc2d21 100644 --- a/packages/pluggableWidgets/datagrid-web/src/controllers/StateSyncController.ts +++ b/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts @@ -16,18 +16,18 @@ interface Header { conditions: Array; } -type StateSyncControllerSpec = { +type DatasourceParamsControllerSpec = { query: QueryController; columns: Columns; header: Header; }; -export class StateSyncController implements ReactiveController { +export class DatasourceParamsController implements ReactiveController { private columns: Columns; private header: Header; private query: QueryController; - constructor(host: ReactiveControllerHost, spec: StateSyncControllerSpec) { + constructor(host: ReactiveControllerHost, spec: DatasourceParamsControllerSpec) { host.addController(this); this.columns = spec.columns; this.header = spec.header; diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts index 21c8024aca..5d1d3e1d0c 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts @@ -17,7 +17,7 @@ import { ColumnGroupStore } from "./ColumnGroupStore"; export class GridPersonalizationStore { private readonly gridName: string; private readonly gridColumnsHash: string; - private readonly schemaVersion: GridPersonalizationStorageSettings["schemaVersion"] = 2; + private readonly schemaVersion: GridPersonalizationStorageSettings["schemaVersion"] = 3; private readonly storeFilters: boolean; private storage: PersonalizationStorage; @@ -164,7 +164,7 @@ function toStorageFormat( gridColumnsHash: string, columnsSettings: ColumnPersonalizationSettings[], columnFilters: FiltersSettingsMap, - groupFilters: FiltersSettingsMap + customFilters: FiltersSettingsMap ): GridPersonalizationStorageSettings { const sortOrder = columnsSettings .filter(c => c.sortDir && c.sortWeight !== undefined) @@ -175,7 +175,7 @@ function toStorageFormat( return { name: gridName, - schemaVersion: 2, + schemaVersion: 3, settingsHash: gridColumnsHash, columns: columnsSettings.map(c => ({ columnId: c.columnId, @@ -185,7 +185,7 @@ function toStorageFormat( })), columnFilters: Array.from(columnFilters), - groupFilters: Array.from(groupFilters), + customFilters: Array.from(customFilters), sortOrder, columnOrder diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts index a98cbf7eff..56dac81e7c 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts @@ -6,10 +6,10 @@ import { generateUUID } from "@mendix/widget-plugin-platform/framework/generate- import { autorun, computed } from "mobx"; import { DatagridContainerProps } from "../../../typings/DatagridProps"; import { DatasourceController } from "../../controllers/DatasourceController"; +import { DatasourceParamsController } from "../../controllers/DatasourceParamsController"; import { DerivedLoaderController } from "../../controllers/DerivedLoaderController"; import { PaginationController } from "../../controllers/PaginationController"; import { RefreshController } from "../../controllers/RefreshController"; -import { StateSyncController } from "../../controllers/StateSyncController"; import { ProgressStore } from "../../features/data-export/ProgressStore"; import { StaticInfo } from "../../typings/static-info"; import { ColumnGroupStore } from "./ColumnGroupStore"; @@ -37,7 +37,7 @@ export class RootGridStore extends BaseControllerHost { super(); const { props } = gate; - const [columnsViewState, headerViewState] = StateSyncController.unzipFilter(props.datasource.filter); + const [columnsViewState, headerViewState] = DatasourceParamsController.unzipFilter(props.datasource.filter); this.gate = gate; this.staticInfo = { @@ -51,7 +51,7 @@ export class RootGridStore extends BaseControllerHost { this.paginationCtrl = new PaginationController(this, { gate, query }); this.exportProgressCtrl = exportCtrl; - new StateSyncController(this, { + new DatasourceParamsController(this, { query, columns, header From 4b77b387bc3568d117bfbfde68b4c1e0531378f8 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:13:27 +0100 Subject: [PATCH 04/27] refactor: rename interface --- .../src/helpers/state/column/ColumnFilterStore.tsx | 6 +++--- packages/shared/widget-plugin-filtering/src/context.ts | 8 ++++---- .../src/stores/generic/HeaderFiltersStore.ts | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx b/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx index 9d0d9ae7cb..64d8e4ea5e 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx @@ -1,4 +1,4 @@ -import { FilterAPIv2, getGlobalFilterContextObject } from "@mendix/widget-plugin-filtering/context"; +import { FilterAPI, getGlobalFilterContextObject } from "@mendix/widget-plugin-filtering/context"; import { RefFilterStore, RefFilterStoreProps } from "@mendix/widget-plugin-filtering/stores/picker/RefFilterStore"; import { StaticSelectFilterStore } from "@mendix/widget-plugin-filtering/stores/picker/StaticSelectFilterStore"; import { InputFilterStore, attrgroupFilterStore } from "@mendix/widget-plugin-filtering/stores/input/store-utils"; @@ -23,7 +23,7 @@ const { Provider } = getGlobalFilterContextObject(); export class ColumnFilterStore implements IColumnFilterStore { private _widget: ReactNode; private _filterStore: FilterStore | null = null; - private _context: FilterAPIv2; + private _context: FilterAPI; constructor(props: ColumnsType, info: StaticInfo, dsViewState: FilterCondition | null) { this._widget = props.filter; @@ -92,7 +92,7 @@ export class ColumnFilterStore implements IColumnFilterStore { return null; } - private createContext(store: FilterStore | null, info: StaticInfo): FilterAPIv2 { + private createContext(store: FilterStore | null, info: StaticInfo): FilterAPI { return { version: 2, parentChannelName: info.filtersChannelName, diff --git a/packages/shared/widget-plugin-filtering/src/context.ts b/packages/shared/widget-plugin-filtering/src/context.ts index 2a44be0ed0..e0ed1df566 100644 --- a/packages/shared/widget-plugin-filtering/src/context.ts +++ b/packages/shared/widget-plugin-filtering/src/context.ts @@ -4,7 +4,7 @@ import { Result, error, value } from "./result-meta.js"; import { InputFilterInterface } from "./typings/InputFilterInterface.js"; import { PickerFilterStore } from "./typings/PickerFilterStore.js"; -export interface FilterAPIv2 { +export interface FilterAPI { version: 2; parentChannelName: string; provider: Result; @@ -38,7 +38,7 @@ export interface LegacyProvider { get: (type: FilterType) => FilterStore | null; } -type Context_v2 = Context; +type Context_v2 = Context; const CONTEXT_OBJECT_PATH = "com.mendix.widgets.web.filterable.filterContext.v2" as const; @@ -49,10 +49,10 @@ declare global { } export function getGlobalFilterContextObject(): Context_v2 { - return (window[CONTEXT_OBJECT_PATH] ??= createContext(null)); + return (window[CONTEXT_OBJECT_PATH] ??= createContext(null)); } -export function useFilterContextValue(): Result { +export function useFilterContextValue(): Result { const context = getGlobalFilterContextObject(); const contextValue = useContext(context); diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts index 3836716e43..634b72e440 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts @@ -1,7 +1,7 @@ import { ListAttributeValue } from "mendix"; import { FilterCondition } from "mendix/filters"; import { computed, makeObservable } from "mobx"; -import { FilterAPIv2 } from "../../context"; +import { FilterAPI } from "../../context"; import { APIError } from "../../errors"; import { LegacyPv } from "../../providers/LegacyPv"; import { Result, value } from "../../result-meta"; @@ -23,7 +23,7 @@ export interface StaticInfo { export class HeaderFiltersStore { private provider: Result; - context: FilterAPIv2; + context: FilterAPI; constructor( props: HeaderFiltersStoreProps, From 537950f5b093e998b0a061b99f5d999a92344de7 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:14:13 +0100 Subject: [PATCH 05/27] feat: add filter observer --- .../src/stores/generic/CustomFilterHost.ts | 29 +++++++++++++++++++ .../src/typings/FilterObserver.ts | 16 ++++++++++ 2 files changed, 45 insertions(+) create mode 100644 packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts create mode 100644 packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts new file mode 100644 index 0000000000..596a9fc869 --- /dev/null +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts @@ -0,0 +1,29 @@ +import { FilterCondition } from "mendix/filters"; +import { Filter, FilterObserver } from "../../typings/FilterObserver"; +import { FiltersSettingsMap } from "../../typings/settings"; + +export class CustomFilterHost implements FilterObserver { + private filters: Map = new Map(); + + get settings(): FiltersSettingsMap { + return new Map([...this.filters].map(([key, filter]) => [key, filter.toJSON()])); + } + + set settings(data: FiltersSettingsMap) { + for (const [key, value] of data) { + this.filters.get(key)?.fromJSON(value); + } + } + + get condition(): Array { + return [...this.filters.values()].map(filter => filter.condition); + } + + observe(key: string, filter: Filter): void { + this.filters.set(key, filter); + } + + unobserve(key: string): void { + this.filters.delete(key); + } +} diff --git a/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts b/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts new file mode 100644 index 0000000000..2917819edf --- /dev/null +++ b/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts @@ -0,0 +1,16 @@ +import { FilterCondition } from "mendix/filters"; +import { FilterData, FiltersSettingsMap } from "./settings"; + +export interface Filter { + toJSON(): FilterData; + fromJSON(data: FilterData): void; + condition: FilterCondition | undefined; +} + +export interface FilterObserver { + get settings(): FiltersSettingsMap; + set settings(settings: FiltersSettingsMap); + condition: Array; + observe(key: string, filter: Filter): void; + unobserve(key: string): void; +} From 2619d58d3d2e1c3b638a3e5d5396d44a04be1390 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:19:05 +0100 Subject: [PATCH 06/27] refactor: rename type --- packages/shared/widget-plugin-filtering/src/context.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/shared/widget-plugin-filtering/src/context.ts b/packages/shared/widget-plugin-filtering/src/context.ts index e0ed1df566..2482c5e7d5 100644 --- a/packages/shared/widget-plugin-filtering/src/context.ts +++ b/packages/shared/widget-plugin-filtering/src/context.ts @@ -38,17 +38,17 @@ export interface LegacyProvider { get: (type: FilterType) => FilterStore | null; } -type Context_v2 = Context; +type FilterAPIContext = Context; const CONTEXT_OBJECT_PATH = "com.mendix.widgets.web.filterable.filterContext.v2" as const; declare global { interface Window { - [CONTEXT_OBJECT_PATH]: Context_v2 | undefined; + [CONTEXT_OBJECT_PATH]: FilterAPIContext | undefined; } } -export function getGlobalFilterContextObject(): Context_v2 { +export function getGlobalFilterContextObject(): FilterAPIContext { return (window[CONTEXT_OBJECT_PATH] ??= createContext(null)); } From c5da62e5dad9f0e67ad44cddf55e4242aaf95e2c Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:31:01 +0100 Subject: [PATCH 07/27] refactor: remove dead code --- .../shared/widget-plugin-filtering/src/context.ts | 13 +++---------- .../src/helpers/useDateFilterAPI.ts | 10 +++------- .../src/helpers/useNumberFilterAPI.ts | 10 +++------- .../src/helpers/useSelectFilterAPI.ts | 2 +- .../src/helpers/useStringFilterAPI.ts | 10 +++------- .../widget-plugin-filtering/src/useDefaultValue.ts | 12 ------------ 6 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 packages/shared/widget-plugin-filtering/src/useDefaultValue.ts diff --git a/packages/shared/widget-plugin-filtering/src/context.ts b/packages/shared/widget-plugin-filtering/src/context.ts index 2482c5e7d5..a5d46657ac 100644 --- a/packages/shared/widget-plugin-filtering/src/context.ts +++ b/packages/shared/widget-plugin-filtering/src/context.ts @@ -5,7 +5,7 @@ import { InputFilterInterface } from "./typings/InputFilterInterface.js"; import { PickerFilterStore } from "./typings/PickerFilterStore.js"; export interface FilterAPI { - version: 2; + version: 3; parentChannelName: string; provider: Result; } @@ -18,7 +18,7 @@ export enum FilterType { DATE = "date" } -export type FilterStoreProvider = DirectProvider | KeyProvider | LegacyProvider; +export type FilterStoreProvider = DirectProvider | LegacyProvider; export type FilterStore = InputFilterInterface | PickerFilterStore; @@ -27,11 +27,6 @@ interface DirectProvider { store: FilterStore | null; } -export interface KeyProvider { - type: "key-value"; - get: (key: string) => FilterStore | null; -} - /** @deprecated */ export interface LegacyProvider { type: "legacy"; @@ -63,12 +58,10 @@ export function useFilterContextValue(): Result { return value(contextValue); } -export function getFilterStore(provider: FilterStoreProvider, legacyType: FilterType, key: string): FilterStore | null { +export function getFilterStore(provider: FilterStoreProvider, legacyType: FilterType): FilterStore | null { switch (provider.type) { case "direct": return provider.store; - case "key-value": - return provider.get(key); case "legacy": return provider.get(legacyType); default: diff --git a/packages/shared/widget-plugin-filtering/src/helpers/useDateFilterAPI.ts b/packages/shared/widget-plugin-filtering/src/helpers/useDateFilterAPI.ts index d2391337f3..d6cdab88bf 100644 --- a/packages/shared/widget-plugin-filtering/src/helpers/useDateFilterAPI.ts +++ b/packages/shared/widget-plugin-filtering/src/helpers/useDateFilterAPI.ts @@ -1,6 +1,6 @@ import { useRef } from "react"; import { FilterType, getFilterStore, useFilterContextValue } from "../context"; -import { APIError, EKEYMISSING, EMISSINGSTORE, EStoreTypeMisMatch } from "../errors"; +import { APIError, EMISSINGSTORE, EStoreTypeMisMatch } from "../errors"; import { error, Result, value } from "../result-meta"; import { isDateFilter } from "../stores/input/store-utils"; import { Date_InputFilterInterface } from "../typings/InputFilterInterface"; @@ -10,7 +10,7 @@ export interface Date_FilterAPIv2 { parentChannelName?: string; } -export function useDateFilterAPI(key: string): Result { +export function useDateFilterAPI(): Result { const ctx = useFilterContextValue(); const dateAPI = useRef(); @@ -24,11 +24,7 @@ export function useDateFilterAPI(key: string): Result { +export function useNumberFilterAPI(): Result { const ctx = useFilterContextValue(); const numAPI = useRef(); @@ -24,11 +24,7 @@ export function useNumberFilterAPI(key: string): Result { +export function useStringFilterAPI(): Result { const ctx = useFilterContextValue(); const strAPI = useRef(); @@ -24,11 +24,7 @@ export function useStringFilterAPI(key: string): Result(defaultValueProp?: DynamicValue): T | undefined | null { - const defaultValueRef = useRef(null); - - if (defaultValueProp?.status !== "loading" && defaultValueRef.current === null) { - defaultValueRef.current = defaultValueProp?.value; - } - - return defaultValueRef.current; -} From bb8bb08cd8090c000083e1dbf3fea97d437e78db Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:33:28 +0100 Subject: [PATCH 08/27] feat: add filter observer to filter api --- .../controllers/DatasourceParamsController.ts | 19 +++++--- .../src/helpers/state/ColumnGroupStore.ts | 9 ++-- .../src/helpers/state/RootGridStore.ts | 19 ++++++-- .../state/column/ColumnFilterStore.tsx | 16 +++++-- .../widget-plugin-filtering/src/context.ts | 4 ++ .../src/stores/generic/HeaderFiltersStore.ts | 45 ++++++++++--------- 6 files changed, 73 insertions(+), 39 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts b/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts index 5c3bdc2d21..4d0eadf2bf 100644 --- a/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts +++ b/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts @@ -68,17 +68,22 @@ export class DatasourceParamsController implements ReactiveController { static unzipFilter( filter?: FilterCondition - ): [columns: Array, header: Array] { + ): [ + columns: Array, + header: Array, + sharedFilter: Array + ] { if (!filter) { - return [[], []]; + return [[], [], []]; } if (!isAnd(filter)) { - return [[], []]; + return [[], [], []]; } - if (filter.args.length !== 2) { - return [[], []]; + if (filter.args.length !== 3) { + return [[], [], []]; } - const [columns, header] = filter.args; - return [fromCompactArray(columns), fromCompactArray(header)]; + + const [columns, header, shared] = filter.args; + return [fromCompactArray(columns), fromCompactArray(header), fromCompactArray(shared)]; } } diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/ColumnGroupStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/ColumnGroupStore.ts index efc8dd67ad..ae76ecf01b 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/ColumnGroupStore.ts +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/ColumnGroupStore.ts @@ -13,7 +13,7 @@ import { sortInstructionsToSortRules, sortRulesToSortInstructions } from "./ColumnsSortingStore"; -import { ColumnFilterStore } from "./column/ColumnFilterStore"; +import { ColumnFilterStore, ObserverBag } from "./column/ColumnFilterStore"; import { ColumnStore } from "./column/ColumnStore"; export interface IColumnGroupStore { @@ -46,17 +46,18 @@ export class ColumnGroupStore implements IColumnGroupStore, IColumnParentStore { constructor( props: Pick, info: StaticInfo, - dsViewState: Array | null + initFilter: Array, + observerBag: ObserverBag ) { this._allColumns = []; this.columnFilters = []; props.columns.forEach((columnProps, i) => { - const initCond = dsViewState?.at(i) ?? null; + const initCond = initFilter.at(i) ?? null; const column = new ColumnStore(i, columnProps, this); this._allColumnsById.set(column.columnId, column); this._allColumns[i] = column; - this.columnFilters[i] = new ColumnFilterStore(columnProps, info, initCond); + this.columnFilters[i] = new ColumnFilterStore(columnProps, info, initCond, observerBag); }); this.sorting = new ColumnsSortingStore( diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts index 56dac81e7c..b0d0298778 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts @@ -1,3 +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"; @@ -37,16 +38,28 @@ export class RootGridStore extends BaseControllerHost { super(); const { props } = gate; - const [columnsViewState, headerViewState] = DatasourceParamsController.unzipFilter(props.datasource.filter); + const [columnsInitFilter, headerInitFilter, sharedInitFilter] = DatasourceParamsController.unzipFilter( + props.datasource.filter + ); this.gate = gate; this.staticInfo = { name: props.name, filtersChannelName: `datagrid/${generateUUID()}` }; + const filterObserver = new CustomFilterHost(); const query = new DatasourceController(this, { gate }); - const columns = (this.columnsStore = new ColumnGroupStore(props, this.staticInfo, columnsViewState)); - const header = (this.headerFiltersStore = new HeaderFiltersStore(props, this.staticInfo, headerViewState)); + const columns = (this.columnsStore = new ColumnGroupStore(props, this.staticInfo, columnsInitFilter, { + filterObserver, + sharedInitFilter + })); + const header = (this.headerFiltersStore = new HeaderFiltersStore({ + filterList: props.filterList, + filterChannelName: this.staticInfo.filtersChannelName, + headerInitFilter, + sharedInitFilter, + filterObserver + })); this.settingsStore = new GridPersonalizationStore(props, this.columnsStore, this.headerFiltersStore); this.paginationCtrl = new PaginationController(this, { gate, query }); this.exportProgressCtrl = exportCtrl; diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx b/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx index 64d8e4ea5e..9f3374e198 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx @@ -12,6 +12,7 @@ import { StaticInfo } from "../../../typings/static-info"; import { FilterData } from "@mendix/widget-plugin-filtering/typings/settings"; import { value } from "@mendix/widget-plugin-filtering/result-meta"; import { disposeFx } from "@mendix/widget-plugin-filtering/mobx-utils"; +import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver"; export interface IColumnFilterStore { renderFilterWidgets(): ReactNode; } @@ -24,8 +25,10 @@ export class ColumnFilterStore implements IColumnFilterStore { private _widget: ReactNode; private _filterStore: FilterStore | null = null; private _context: FilterAPI; + private _observerBag: ObserverBag; - constructor(props: ColumnsType, info: StaticInfo, dsViewState: FilterCondition | null) { + constructor(props: ColumnsType, info: StaticInfo, dsViewState: FilterCondition | null, observerBag: ObserverBag) { + this._observerBag = observerBag; this._widget = props.filter; this._filterStore = this.createFilterStore(props, dsViewState); this._context = this.createContext(this._filterStore, info); @@ -94,12 +97,14 @@ export class ColumnFilterStore implements IColumnFilterStore { private createContext(store: FilterStore | null, info: StaticInfo): FilterAPI { return { - version: 2, + version: 3, parentChannelName: info.filtersChannelName, provider: value({ type: "direct", store - }) + }), + filterObserver: this._observerBag.filterObserver, + sharedInitFilter: this._observerBag.sharedInitFilter }; } @@ -132,3 +137,8 @@ const isListAttributeValue = ( const errorMessage = (propName: string): string => `Can't map ColumnsType to AssociationProperties: ${propName} is undefined`; + +export interface ObserverBag { + filterObserver: FilterObserver; + sharedInitFilter: Array; +} diff --git a/packages/shared/widget-plugin-filtering/src/context.ts b/packages/shared/widget-plugin-filtering/src/context.ts index a5d46657ac..297d815485 100644 --- a/packages/shared/widget-plugin-filtering/src/context.ts +++ b/packages/shared/widget-plugin-filtering/src/context.ts @@ -1,6 +1,8 @@ +import { FilterCondition } from "mendix/filters/index.js"; import { Context, createContext, useContext } from "react"; import { APIError, ENOCONTEXT } from "./errors.js"; import { Result, error, value } from "./result-meta.js"; +import { FilterObserver } from "./typings/FilterObserver.js"; import { InputFilterInterface } from "./typings/InputFilterInterface.js"; import { PickerFilterStore } from "./typings/PickerFilterStore.js"; @@ -8,6 +10,8 @@ export interface FilterAPI { version: 3; parentChannelName: string; provider: Result; + filterObserver: FilterObserver; + sharedInitFilter: Array; } /** @deprecated */ diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts index 634b72e440..75fb2051ce 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts @@ -5,36 +5,39 @@ import { FilterAPI } from "../../context"; import { APIError } from "../../errors"; import { LegacyPv } from "../../providers/LegacyPv"; import { Result, value } from "../../result-meta"; +import { FilterObserver } from "../../typings/FilterObserver"; import { FiltersSettingsMap } from "../../typings/settings"; export interface FilterListType { filter: ListAttributeValue; } -export interface HeaderFiltersStoreProps { +export interface HeaderFiltersStoreSpec { filterList: FilterListType[]; - parentChannelName?: string; -} - -export interface StaticInfo { - name: string; - filtersChannelName: string; + filterChannelName: string; + headerInitFilter: Array; + sharedInitFilter: Array; + filterObserver: FilterObserver; } export class HeaderFiltersStore { private provider: Result; context: FilterAPI; - constructor( - props: HeaderFiltersStoreProps, - info: StaticInfo, - dsViewState: Array | null - ) { - this.provider = this.createProvider(props, dsViewState); + constructor({ + filterList, + filterChannelName, + headerInitFilter, + sharedInitFilter, + filterObserver + }: HeaderFiltersStoreSpec) { + this.provider = this.createProvider(filterList, headerInitFilter); this.context = { - version: 2, - parentChannelName: info.filtersChannelName ?? "", - provider: this.provider + version: 3, + parentChannelName: filterChannelName, + provider: this.provider, + sharedInitFilter, + filterObserver }; makeObservable(this, { conditions: computed, @@ -59,13 +62,13 @@ export class HeaderFiltersStore { } createProvider( - props: HeaderFiltersStoreProps, - dsViewState: Array | null + filterList: FilterListType[], + initFilter: Array ): Result { return value( new LegacyPv( - props.filterList.map(f => f.filter), - dsViewState + filterList.map(f => f.filter), + initFilter ) ); } @@ -77,6 +80,4 @@ export class HeaderFiltersStore { return this.provider.value.setup(); } - - updateProps(): void {} } From 06a619d007e0bfa504f0eaddbb5df2ce2bd97304 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Mon, 3 Mar 2025 14:21:03 +0100 Subject: [PATCH 09/27] chore: change personalization --- .../src/helpers/state/GridPersonalizationStore.ts | 8 ++++---- .../datagrid-web/src/helpers/state/RootGridStore.ts | 8 ++++---- .../src/helpers/state/column/ColumnFilterStore.tsx | 4 ++-- .../src/stores/generic/HeaderFiltersStore.ts | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts index 5d1d3e1d0c..c9a062b6ac 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/GridPersonalizationStore.ts @@ -1,5 +1,5 @@ import { error, Result, value } from "@mendix/widget-plugin-filtering/result-meta"; -import { HeaderFiltersStore } from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore"; +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"; @@ -27,7 +27,7 @@ export class GridPersonalizationStore { constructor( props: DatagridContainerProps, private columnsStore: ColumnGroupStore, - private headerFilters: HeaderFiltersStore + private customFilters: FilterObserver ) { this.gridName = props.name; this.gridColumnsHash = getHash(this.columnsStore._allColumns, this.gridName); @@ -35,7 +35,6 @@ export class GridPersonalizationStore { makeObservable(this, { settings: computed, - applySettings: action }); @@ -95,6 +94,7 @@ export class GridPersonalizationStore { private applySettings(settings: GridPersonalizationStorageSettings): void { this.columnsStore.setColumnSettings(toColumnSettings(settings)); this.columnsStore.setColumnFilterSettings(settings.columnFilters); + this.customFilters.settings = new Map(settings.customFilters); } private readSettings( @@ -137,7 +137,7 @@ export class GridPersonalizationStore { this.gridColumnsHash, this.columnsStore.columnSettings, this.storeFilters ? this.columnsStore.filterSettings : new Map(), - this.storeFilters ? this.headerFilters.settings : new Map() + this.storeFilters ? this.customFilters.settings : new Map() ); } } diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts index b0d0298778..77b18dc410 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts @@ -47,10 +47,10 @@ export class RootGridStore extends BaseControllerHost { name: props.name, filtersChannelName: `datagrid/${generateUUID()}` }; - const filterObserver = new CustomFilterHost(); + const customFilterHost = new CustomFilterHost(); const query = new DatasourceController(this, { gate }); const columns = (this.columnsStore = new ColumnGroupStore(props, this.staticInfo, columnsInitFilter, { - filterObserver, + customFilterHost, sharedInitFilter })); const header = (this.headerFiltersStore = new HeaderFiltersStore({ @@ -58,9 +58,9 @@ export class RootGridStore extends BaseControllerHost { filterChannelName: this.staticInfo.filtersChannelName, headerInitFilter, sharedInitFilter, - filterObserver + customFilterHost })); - this.settingsStore = new GridPersonalizationStore(props, this.columnsStore, this.headerFiltersStore); + this.settingsStore = new GridPersonalizationStore(props, this.columnsStore, customFilterHost); this.paginationCtrl = new PaginationController(this, { gate, query }); this.exportProgressCtrl = exportCtrl; diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx b/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx index 9f3374e198..cf930ae8a3 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/column/ColumnFilterStore.tsx @@ -103,7 +103,7 @@ export class ColumnFilterStore implements IColumnFilterStore { type: "direct", store }), - filterObserver: this._observerBag.filterObserver, + filterObserver: this._observerBag.customFilterHost, sharedInitFilter: this._observerBag.sharedInitFilter }; } @@ -139,6 +139,6 @@ const errorMessage = (propName: string): string => `Can't map ColumnsType to AssociationProperties: ${propName} is undefined`; export interface ObserverBag { - filterObserver: FilterObserver; + customFilterHost: FilterObserver; sharedInitFilter: Array; } diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts index 75fb2051ce..f627172731 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts @@ -17,7 +17,7 @@ export interface HeaderFiltersStoreSpec { filterChannelName: string; headerInitFilter: Array; sharedInitFilter: Array; - filterObserver: FilterObserver; + customFilterHost: FilterObserver; } export class HeaderFiltersStore { @@ -29,7 +29,7 @@ export class HeaderFiltersStore { filterChannelName, headerInitFilter, sharedInitFilter, - filterObserver + customFilterHost: filterObserver }: HeaderFiltersStoreSpec) { this.provider = this.createProvider(filterList, headerInitFilter); this.context = { From 8cd701ac67ded65f8359b4f8d7ce07f07f1b4d89 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Mon, 3 Mar 2025 14:23:05 +0100 Subject: [PATCH 10/27] chore: change attr type --- .../src/stores/input/BaseInputFilterStore.ts | 9 +++++---- .../src/stores/input/DateInputFilterStore.ts | 8 ++++---- .../src/stores/input/StringInputFilterStore.ts | 17 ++++++++++++++--- .../src/stores/picker/BaseSelectStore.ts | 2 +- .../src/typings/settings.ts | 2 +- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts b/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts index 8dc62bfa6c..49b3eaa5e6 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts @@ -1,5 +1,5 @@ import { Big } from "big.js"; -import { ListAttributeValue } from "mendix"; +import { AttributeMetaData } from "mendix"; import { FilterCondition } from "mendix/filters"; import { and, @@ -23,8 +23,9 @@ import { Argument } from "./Argument"; type StateTuple = [Fn] | [Fn, V] | [Fn, V, V]; type Val = A["value"]; + export class BaseInputFilterStore { - protected _attributes: ListAttributeValue[] = []; + protected _attributes: AttributeMetaData[] = []; private _filterFunction: Fn; private _isFilterFunctionAdjustable: boolean = true; arg1: A; @@ -32,7 +33,7 @@ export class BaseInputFilterStore { isInitialized = false; defaultState: StateTuple>; - constructor(arg1: A, arg2: A, initFn: Fn, attributes: ListAttributeValue[]) { + constructor(arg1: A, arg2: A, initFn: Fn, attributes: AttributeMetaData[]) { this._attributes = attributes; this.defaultState = [initFn]; this._filterFunction = initFn; @@ -116,7 +117,7 @@ export class BaseInputFilterStore { } function getFilterCondition( - listAttribute: ListAttributeValue, + listAttribute: AttributeMetaData, value: T | undefined, valueR: T | undefined, operation: AllFunctions diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts b/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts index d04bf14a31..8564038a04 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts @@ -1,4 +1,4 @@ -import { DateTimeFormatter, ListAttributeValue } from "mendix"; +import { AttributeMetaData, DateTimeFormatter, ListAttributeValue } from "mendix"; import { AndCondition, FilterCondition, LiteralExpression } from "mendix/filters"; import { and, @@ -103,7 +103,7 @@ export class DateInputFilterStore } private getCondition( - attr: ListAttributeValue, + attr: AttributeMetaData, filterFn: DateFns, v1: Date | undefined, v2: Date | undefined @@ -121,7 +121,7 @@ export class DateInputFilterStore } private getAttrCondition( - attr: ListAttributeValue, + attr: AttributeMetaData, filterFn: Exclude, date: Date | undefined ): [FilterCondition] | [] { @@ -153,7 +153,7 @@ export class DateInputFilterStore } } - private getRangeCondition(attr: ListAttributeValue, [start, end]: [Date, Date]): [FilterCondition] | [] { + private getRangeCondition(attr: AttributeMetaData, [start, end]: [Date, Date]): [FilterCondition] | [] { const attrExp = attribute(attr.id); return [ diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts b/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts index 45ab2a30d9..b2512ae768 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts @@ -1,4 +1,4 @@ -import { ListAttributeValue } from "mendix"; +import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix"; import { FilterCondition } from "mendix/filters"; import { action, comparer, makeObservable } from "mobx"; import { inputStateFromCond } from "../../condition-utils"; @@ -15,6 +15,8 @@ import { BaseInputFilterStore } from "./BaseInputFilterStore"; import { baseNames } from "./fn-mappers"; type StrFns = FilterFunctionString | FilterFunctionGeneric | FilterFunctionNonValue | FilterFunctionBinary; +type AttrMeta = AttributeMetaData & { formatter?: SimpleFormatter }; + export class StringInputFilterStore extends BaseInputFilterStore implements String_InputFilterInterface @@ -22,8 +24,8 @@ export class StringInputFilterStore readonly storeType = "input"; readonly type = "string"; - constructor(attributes: Array>, initCond: FilterCondition | null) { - const { formatter } = attributes[0]; + constructor(attributes: AttrMeta[], initCond: FilterCondition | null) { + const formatter = getFormatter(attributes[0]); super(new StringArgument(formatter), new StringArgument(formatter), "equal", attributes); makeObservable(this, { updateProps: action, @@ -91,3 +93,12 @@ export class StringInputFilterStore this.isInitialized = true; } } + +function getFormatter(attr: AttrMeta): SimpleFormatter { + return ( + attr.formatter ?? { + format: v => v ?? "", + parse: v => ({ valid: true, value: v ?? "" }) + } + ); +} diff --git a/packages/shared/widget-plugin-filtering/src/stores/picker/BaseSelectStore.ts b/packages/shared/widget-plugin-filtering/src/stores/picker/BaseSelectStore.ts index d31e08f06e..ca1b324fd0 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/picker/BaseSelectStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/picker/BaseSelectStore.ts @@ -40,7 +40,7 @@ export class BaseSelectStore { } fromJSON(json: FilterData): void { - if (json === null || isInputData(json)) { + if (json == null || isInputData(json)) { return; } this.setSelected(json); diff --git a/packages/shared/widget-plugin-filtering/src/typings/settings.ts b/packages/shared/widget-plugin-filtering/src/typings/settings.ts index 7f4f3b6614..1b6cb7a373 100644 --- a/packages/shared/widget-plugin-filtering/src/typings/settings.ts +++ b/packages/shared/widget-plugin-filtering/src/typings/settings.ts @@ -4,6 +4,6 @@ export type InputData = [Fn, string | null, string | null]; export type SelectData = string[]; -export type FilterData = InputData | SelectData | null; +export type FilterData = InputData | SelectData | null | undefined; export type FiltersSettingsMap = Map; From 739ec65c7534116d75d3a53ca65ef3a884585e5e Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Mon, 3 Mar 2025 14:41:20 +0100 Subject: [PATCH 11/27] feat: add custom text filter --- .../datagrid-text-filter-web/package.json | 1 + .../src/DatagridTextFilter.editorConfig.ts | 3 +- .../src/DatagridTextFilter.tsx | 12 +++- .../src/DatagridTextFilter.xml | 10 +-- .../src/hocs/withLinkedAttributes.tsx | 71 +++++++++++++++++++ .../src/hocs/withTextFilterAPI.tsx | 2 +- .../typings/DatagridTextFilterProps.d.ts | 7 +- .../widget-plugin-filtering/package.json | 1 + .../widget-plugin-filtering/src/context.ts | 5 +- .../custom-filter-api/StringStoreProvider.ts | 37 ++++++++++ .../src/custom-filter-api/typings.ts | 8 +++ .../src/disposeBatch.ts | 10 ++- .../widget-plugin-mobx-kit/src/setupable.ts | 3 + 13 files changed, 150 insertions(+), 20 deletions(-) create mode 100644 packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withLinkedAttributes.tsx create mode 100644 packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts create mode 100644 packages/shared/widget-plugin-filtering/src/custom-filter-api/typings.ts create mode 100644 packages/shared/widget-plugin-mobx-kit/src/setupable.ts diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/package.json b/packages/pluggableWidgets/datagrid-text-filter-web/package.json index afede1554d..0907f7371e 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/package.json +++ b/packages/pluggableWidgets/datagrid-text-filter-web/package.json @@ -45,6 +45,7 @@ "@mendix/widget-plugin-external-events": "workspace:*", "@mendix/widget-plugin-filtering": "workspace:*", "@mendix/widget-plugin-hooks": "workspace:*", + "@mendix/widget-plugin-mobx-kit": "workspace:^", "@mendix/widget-plugin-platform": "workspace:*", "classnames": "^2.3.2", "mobx": "6.12.3", diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorConfig.ts b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorConfig.ts index f69cd2de34..787ae0b8c9 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorConfig.ts +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorConfig.ts @@ -38,9 +38,8 @@ export function getProperties(values: DatagridTextFilterPreviewProps, defaultPro hidePropertyIn(defaultProperties, values, "screenReaderButtonCaption"); } - if (values.customAttrs === "auto") { + if (values.attrChoice === "auto") { hidePropertyIn(defaultProperties, values, "attributes"); - hidePropertyIn(defaultProperties, values, "dataKey"); } hidePropertyIn(defaultProperties, {} as { linkedDs: unknown }, "linkedDs"); diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.tsx index 5772f0eb2f..f47d4f1bcc 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.tsx @@ -4,10 +4,18 @@ import { DatagridTextFilterContainerProps } from "../typings/DatagridTextFilterP import { TextFilterContainer } from "./components/TextFilterContainer"; import { withTextFilterAPI } from "./hocs/withTextFilterAPI"; import { isLoadingDefaultValues } from "./utils/widget-utils"; +import { withLinkedAttributes } from "./hocs/withLinkedAttributes"; const container = withPreloader(TextFilterContainer, isLoadingDefaultValues); -const Widget = withTextFilterAPI(container); +const FilterAuto = withTextFilterAPI(container); +const FilterLinked = withLinkedAttributes(container); export default function DatagridTextFilter(props: DatagridTextFilterContainerProps): ReactElement { - return ; + const isAuto = props.attrChoice === "auto"; + + if (isAuto) { + return ; + } + + return ; } diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml index f06220ea88..893a20f660 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml @@ -8,12 +8,12 @@ - - Filterable attributes + + Filter attributes Auto - Custom + Custom @@ -35,10 +35,6 @@ - - Data key - Arbitrary string of letters or numbers. Required to store and retrieve filter data, must be unique. - Default value diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withLinkedAttributes.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withLinkedAttributes.tsx new file mode 100644 index 0000000000..839892a368 --- /dev/null +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withLinkedAttributes.tsx @@ -0,0 +1,71 @@ +import { createElement } from "react"; +import { AttributeMetaData } from "mendix"; +import { useFilterAPI } from "@mendix/widget-plugin-filtering/context"; +import { APIError } from "@mendix/widget-plugin-filtering/errors"; +import { error, value, Result } from "@mendix/widget-plugin-filtering/result-meta"; +import { String_InputFilterInterface } from "@mendix/widget-plugin-filtering/typings/InputFilterInterface"; +import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; +import { useConst } from "@mendix/widget-plugin-mobx-kit/react/useConst"; +import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; +import { StringStoreProvider } from "@mendix/widget-plugin-filtering/custom-filter-api/StringStoreProvider"; +import { ISetupable } from "@mendix/widget-plugin-mobx-kit/setupable"; + +interface RequiredProps { + attributes: Array<{ + attribute: AttributeMetaData; + }>; + name: string; +} + +interface StoreProvider extends ISetupable { + store: String_InputFilterInterface; +} + +type Component

= (props: P) => React.ReactElement; + +export function withLinkedAttributes

( + component: Component

+): Component

{ + const StoreInjector = withInjectedStore(component); + + return function FilterAPIProvider(props) { + const api = useStoreProvider(props); + + if (api.hasError) { + return {api.error.message}; + } + + return ; + }; +} + +function withInjectedStore

( + Component: Component

+): Component

{ + return function StoreInjector(props) { + const provider = useSetup(() => props.provider); + return ; + }; +} + +interface InjectableFilterAPI { + filterStore: String_InputFilterInterface; + parentChannelName?: string; +} + +function useStoreProvider(props: RequiredProps): Result<{ provider: StoreProvider; channel: string }, APIError> { + const filterAPI = useFilterAPI(); + return useConst(() => { + if (filterAPI.hasError) { + return error(filterAPI.error); + } + + return value({ + provider: new StringStoreProvider(filterAPI.value, { + attributes: props.attributes.map(obj => obj.attribute), + dataKey: props.name + }), + channel: filterAPI.value.parentChannelName + }); + }); +} diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withTextFilterAPI.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withTextFilterAPI.tsx index c54deea135..726f91c054 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withTextFilterAPI.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withTextFilterAPI.tsx @@ -6,7 +6,7 @@ export function withTextFilterAPI

( Component: (props: P & String_FilterAPIv2) => React.ReactElement ): (props: P) => React.ReactElement { return function FilterAPIProvider(props) { - const api = useStringFilterAPI(""); + const api = useStringFilterAPI(); if (api.hasError) { return {api.error.message}; diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/typings/DatagridTextFilterProps.d.ts b/packages/pluggableWidgets/datagrid-text-filter-web/typings/DatagridTextFilterProps.d.ts index e9e2994ffb..03b7d03eba 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/typings/DatagridTextFilterProps.d.ts +++ b/packages/pluggableWidgets/datagrid-text-filter-web/typings/DatagridTextFilterProps.d.ts @@ -6,7 +6,7 @@ import { CSSProperties } from "react"; import { ActionValue, AttributeMetaData, DynamicValue, EditableValue } from "mendix"; -export type CustomAttrsEnum = "auto" | "custom"; +export type AttrChoiceEnum = "auto" | "linked"; export interface AttributesType { attribute: AttributeMetaData; @@ -23,9 +23,8 @@ export interface DatagridTextFilterContainerProps { class: string; style?: CSSProperties; tabIndex?: number; - customAttrs: CustomAttrsEnum; + attrChoice: AttrChoiceEnum; attributes: AttributesType[]; - dataKey: string; defaultValue?: DynamicValue; defaultFilter: DefaultFilterEnum; placeholder?: DynamicValue; @@ -50,8 +49,8 @@ export interface DatagridTextFilterPreviewProps { translate: (text: string) => string; advanced: boolean; customAttrs: CustomAttrsEnum; + attrChoice: AttrChoiceEnum; attributes: AttributesPreviewType[]; - dataKey: string; defaultValue: string; defaultFilter: DefaultFilterEnum; placeholder: string; diff --git a/packages/shared/widget-plugin-filtering/package.json b/packages/shared/widget-plugin-filtering/package.json index 0a2f570d48..d1457abe54 100644 --- a/packages/shared/widget-plugin-filtering/package.json +++ b/packages/shared/widget-plugin-filtering/package.json @@ -46,6 +46,7 @@ "@floating-ui/react-dom": "^2.1.2", "@mendix/widget-plugin-external-events": "workspace:*", "@mendix/widget-plugin-hooks": "workspace:*", + "@mendix/widget-plugin-mobx-kit": "workspace:^", "@mendix/widget-plugin-platform": "workspace:*", "downshift": "^9.0.8", "mendix": "^10.16.49747", diff --git a/packages/shared/widget-plugin-filtering/src/context.ts b/packages/shared/widget-plugin-filtering/src/context.ts index 297d815485..e34c9f5375 100644 --- a/packages/shared/widget-plugin-filtering/src/context.ts +++ b/packages/shared/widget-plugin-filtering/src/context.ts @@ -51,7 +51,7 @@ export function getGlobalFilterContextObject(): FilterAPIContext { return (window[CONTEXT_OBJECT_PATH] ??= createContext(null)); } -export function useFilterContextValue(): Result { +export function useFilterAPI(): Result { const context = getGlobalFilterContextObject(); const contextValue = useContext(context); @@ -62,6 +62,9 @@ export function useFilterContextValue(): Result { return value(contextValue); } +/** @deprecated This hook is renamed, use `useFilterAPI` instead. */ +export const useFilterContextValue = useFilterAPI; + export function getFilterStore(provider: FilterStoreProvider, legacyType: FilterType): FilterStore | null { switch (provider.type) { case "direct": diff --git a/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts b/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts new file mode 100644 index 0000000000..a248bd9112 --- /dev/null +++ b/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts @@ -0,0 +1,37 @@ +import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch"; +import { ISetupable } from "@mendix/widget-plugin-mobx-kit/setupable"; +import { FilterCondition } from "mendix/filters"; +import { FilterAPI } from "../context"; +import { StringInputFilterStore } from "../stores/input/StringInputFilterStore"; +import { String_InputFilterInterface } from "../typings/InputFilterInterface"; +import { FilterSpec } from "./typings"; + +export class StringStoreProvider implements ISetupable { + private _store: StringInputFilterStore; + readonly dataKey: string; + + constructor(private filterAPI: FilterAPI, spec: FilterSpec) { + this.dataKey = spec.dataKey; + this._store = new StringInputFilterStore( + spec.attributes, + this.findInitFilter(filterAPI.sharedInitFilter, this.dataKey) + ); + } + + private findInitFilter(_: Array, __: string): FilterCondition | null { + return null; + } + + get store(): String_InputFilterInterface { + return this._store; + } + + setup(): () => void { + const [add, disposeAll] = disposeBatch(); + this.filterAPI.filterObserver.observe(this.dataKey, this._store); + add(() => this.filterAPI.filterObserver.unobserve(this.dataKey)); + add(this.store.setup?.()); + + return disposeAll; + } +} diff --git a/packages/shared/widget-plugin-filtering/src/custom-filter-api/typings.ts b/packages/shared/widget-plugin-filtering/src/custom-filter-api/typings.ts new file mode 100644 index 0000000000..5cf80885d2 --- /dev/null +++ b/packages/shared/widget-plugin-filtering/src/custom-filter-api/typings.ts @@ -0,0 +1,8 @@ +import { AttributeMetaData, EditableValue } from "mendix"; + +type AttributeValue_2 = EditableValue["value"]; + +export interface FilterSpec { + attributes: Array>; + dataKey: string; +} diff --git a/packages/shared/widget-plugin-mobx-kit/src/disposeBatch.ts b/packages/shared/widget-plugin-mobx-kit/src/disposeBatch.ts index b3d899c210..7b0caf4fe4 100644 --- a/packages/shared/widget-plugin-mobx-kit/src/disposeBatch.ts +++ b/packages/shared/widget-plugin-mobx-kit/src/disposeBatch.ts @@ -1,8 +1,12 @@ -export function disposeBatch(): [add: (fn: () => void) => void, disposeAll: () => void] { +type MaybeFn = (() => void) | void; + +export function disposeBatch(): [add: (fn: MaybeFn) => void, disposeAll: () => void] { const disposers = new Set<() => void>(); - const add = (fn: () => void): void => { - disposers.add(fn); + const add = (fn: MaybeFn): void => { + if (fn) { + disposers.add(fn); + } }; const disposeAll = (): void => { diff --git a/packages/shared/widget-plugin-mobx-kit/src/setupable.ts b/packages/shared/widget-plugin-mobx-kit/src/setupable.ts new file mode 100644 index 0000000000..cb29e7ccb9 --- /dev/null +++ b/packages/shared/widget-plugin-mobx-kit/src/setupable.ts @@ -0,0 +1,3 @@ +export interface ISetupable { + setup(): void | (() => void); +} From 9c0d10b8b65eb3febd25c2f49fa6928e3f8d853a Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:41:27 +0100 Subject: [PATCH 12/27] chore: merge filters --- .../controllers/DatasourceParamsController.ts | 17 ++++++++++++----- .../src/helpers/state/RootGridStore.ts | 5 +++-- .../src/stores/generic/CustomFilterHost.ts | 2 +- .../src/typings/FilterObserver.ts | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts b/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts index 4d0eadf2bf..9a79deb4e0 100644 --- a/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts +++ b/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceParamsController.ts @@ -12,34 +12,41 @@ interface Columns { sortInstructions: SortInstruction[] | undefined; } -interface Header { +interface FiltersInput { conditions: Array; } type DatasourceParamsControllerSpec = { query: QueryController; columns: Columns; - header: Header; + header: FiltersInput; + customFilters: FiltersInput; }; export class DatasourceParamsController implements ReactiveController { private columns: Columns; - private header: Header; + 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 } = this; + const { columns, header, customFilters } = this; - return and(compactArray(columns.conditions), compactArray(header.conditions)); + return and( + compactArray(columns.conditions), + compactArray(header.conditions), + compactArray(customFilters.conditions) + ); } private get derivedSortOrder(): SortInstruction[] | undefined { diff --git a/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts b/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts index 77b18dc410..1e03c6b941 100644 --- a/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts +++ b/packages/pluggableWidgets/datagrid-web/src/helpers/state/RootGridStore.ts @@ -67,7 +67,8 @@ export class RootGridStore extends BaseControllerHost { new DatasourceParamsController(this, { query, columns, - header + header, + customFilters: customFilterHost }); new RefreshController(this, { @@ -86,7 +87,7 @@ export class RootGridStore extends BaseControllerHost { const [add, disposeAll] = disposeBatch(); add(super.setup()); add(this.columnsStore.setup()); - add(this.headerFiltersStore.setup() ?? (() => {})); + add(this.headerFiltersStore.setup()); add(() => this.settingsStore.dispose()); add(autorun(() => this.updateProps(this.gate.props))); diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts index 596a9fc869..a8f324eb9c 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts @@ -15,7 +15,7 @@ export class CustomFilterHost implements FilterObserver { } } - get condition(): Array { + get conditions(): Array { return [...this.filters.values()].map(filter => filter.condition); } diff --git a/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts b/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts index 2917819edf..6d534aa156 100644 --- a/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts +++ b/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts @@ -10,7 +10,7 @@ export interface Filter { export interface FilterObserver { get settings(): FiltersSettingsMap; set settings(settings: FiltersSettingsMap); - condition: Array; + conditions: Array; observe(key: string, filter: Filter): void; unobserve(key: string): void; } From d271d1b801de9aa24b8a3e765ad893fddfb8cce6 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Tue, 4 Mar 2025 10:54:54 +0100 Subject: [PATCH 13/27] feat: add state persistence --- .../src/stores/generic/CustomFilterHost.ts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts index a8f324eb9c..b09c4ed2e2 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts @@ -1,18 +1,23 @@ import { FilterCondition } from "mendix/filters"; +import { autorun, makeAutoObservable } from "mobx"; import { Filter, FilterObserver } from "../../typings/FilterObserver"; import { FiltersSettingsMap } from "../../typings/settings"; export class CustomFilterHost implements FilterObserver { private filters: Map = new Map(); + private settingsBuffer: FiltersSettingsMap = new Map(); + private disposeMap: Map void> = new Map(); + + constructor() { + makeAutoObservable(this); + } get settings(): FiltersSettingsMap { return new Map([...this.filters].map(([key, filter]) => [key, filter.toJSON()])); } set settings(data: FiltersSettingsMap) { - for (const [key, value] of data) { - this.filters.get(key)?.fromJSON(value); - } + this.settingsBuffer = data; } get conditions(): Array { @@ -20,10 +25,18 @@ export class CustomFilterHost implements FilterObserver { } observe(key: string, filter: Filter): void { + const dispose = autorun(() => { + if (this.settingsBuffer.has(key)) { + filter.fromJSON(this.settingsBuffer.get(key)); + } + }); + this.disposeMap.set(key, dispose); this.filters.set(key, filter); } unobserve(key: string): void { + this.disposeMap.get(key)?.(); + this.disposeMap.delete(key); this.filters.delete(key); } } From e4ebed9f42ceb411e7ece8f5e3a0b8eb6e572c28 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Tue, 4 Mar 2025 11:07:21 +0100 Subject: [PATCH 14/27] chore: change tag exp to not equal --- .../src/condition-utils.ts | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/shared/widget-plugin-filtering/src/condition-utils.ts b/packages/shared/widget-plugin-filtering/src/condition-utils.ts index 7f14ecbdc4..fb9e94d88f 100644 --- a/packages/shared/widget-plugin-filtering/src/condition-utils.ts +++ b/packages/shared/widget-plugin-filtering/src/condition-utils.ts @@ -1,12 +1,12 @@ import { - FilterCondition, AndCondition, - OrCondition, - LiteralExpression, ContainsCondition, - EqualsCondition + EqualsCondition, + FilterCondition, + LiteralExpression, + OrCondition } from "mendix/filters"; -import { equals, literal, and } from "mendix/filters/builders"; +import { and, literal, notEqual } from "mendix/filters/builders"; type BinaryExpression = T extends { arg1: unknown; arg2: object } ? T : never; type Func = T extends { name: infer Fn } ? Fn : never; @@ -40,25 +40,33 @@ interface TagName { readonly valueType: "string"; } +const MARKER = "#"; + +interface TagMarker { + readonly type: "literal"; + readonly value: typeof MARKER; + readonly valueType: "string"; +} + interface TagCond { readonly type: "function"; - readonly name: "="; + readonly name: "!="; readonly arg1: TagName; - readonly arg2: TagName; + readonly arg2: TagMarker; } export function tag(name: string): TagCond { - return equals(literal(name), literal(name)) as TagCond; + return notEqual(literal(name), literal(MARKER)) as TagCond; } export function isTag(cond: FilterCondition): cond is TagCond { return ( - cond.name === "=" && + cond.name === "!=" && cond.arg1.type === "literal" && cond.arg2.type === "literal" && /string/i.test(cond.arg1.valueType) && /string/i.test(cond.arg2.valueType) && - cond.arg1.value === cond.arg2.value + cond.arg2.value === MARKER ); } From 4026d5ec1e23f4bbb190c755091c51c51ec977b0 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Tue, 4 Mar 2025 11:13:36 +0100 Subject: [PATCH 15/27] chore: add condition tagging --- .../src/stores/generic/CustomFilterHost.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts index b09c4ed2e2..b798603b73 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts @@ -1,5 +1,7 @@ import { FilterCondition } from "mendix/filters"; +import { and } from "mendix/filters/builders"; import { autorun, makeAutoObservable } from "mobx"; +import { tag } from "../../condition-utils"; import { Filter, FilterObserver } from "../../typings/FilterObserver"; import { FiltersSettingsMap } from "../../typings/settings"; @@ -21,7 +23,9 @@ export class CustomFilterHost implements FilterObserver { } get conditions(): Array { - return [...this.filters.values()].map(filter => filter.condition); + return [...this.filters].map(([key, { condition }]) => { + return condition ? and(tag(key), condition) : undefined; + }); } observe(key: string, filter: Filter): void { From 53046dfbf5cd9421e31eb5dfaca56b65993d4f49 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Tue, 4 Mar 2025 11:48:23 +0100 Subject: [PATCH 16/27] chore: add filter initialization --- .../src/custom-filter-api/StringStoreProvider.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts b/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts index a248bd9112..4ae7c28d3a 100644 --- a/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts +++ b/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts @@ -1,6 +1,7 @@ import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch"; import { ISetupable } from "@mendix/widget-plugin-mobx-kit/setupable"; import { FilterCondition } from "mendix/filters"; +import { isAnd, isTag } from "../condition-utils"; import { FilterAPI } from "../context"; import { StringInputFilterStore } from "../stores/input/StringInputFilterStore"; import { String_InputFilterInterface } from "../typings/InputFilterInterface"; @@ -18,7 +19,16 @@ export class StringStoreProvider implements ISetupable { ); } - private findInitFilter(_: Array, __: string): FilterCondition | null { + private findInitFilter(conditions: Array, key: string): FilterCondition | null { + for (const cond of conditions) { + if (cond && isAnd(cond)) { + const [tag, initFilter] = cond.args; + if (isTag(tag) && tag.arg1.value === key) { + return initFilter; + } + } + } + return null; } From c2cc17d089c1b9de7aec2331963769b6f21234c5 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Tue, 4 Mar 2025 12:34:52 +0100 Subject: [PATCH 17/27] chore: remove placeholder tag --- .../src/condition-utils.ts | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/shared/widget-plugin-filtering/src/condition-utils.ts b/packages/shared/widget-plugin-filtering/src/condition-utils.ts index fb9e94d88f..976da416b5 100644 --- a/packages/shared/widget-plugin-filtering/src/condition-utils.ts +++ b/packages/shared/widget-plugin-filtering/src/condition-utils.ts @@ -96,20 +96,19 @@ function shrink(array: Array): [indexes: number[], items: T[]] export function compactArray(input: Array): FilterCondition { const [indexes, items] = shrink(input); - const arrayMeta = [input.length, indexes] as const; - const metaTag = tag(arrayTag(arrayMeta)); - // As 'and' requires at least 2 args, we add a placeholder - const placeholder = tag("_"); - return and(metaTag, placeholder, ...items); + const metaTag = tag(arrayTag([input.length, indexes] as const)); + + if (items.length === 0) { + return metaTag; + } + + return and(metaTag, ...items); } export function fromCompactArray(cond: FilterCondition): Array { - if (!isAnd(cond)) { - return []; - } + const tag = isAnd(cond) ? cond.args[0] : cond; - const [metaTag] = cond.args; - const arrayMeta = isTag(metaTag) ? fromArrayTag(metaTag.arg1.value) : undefined; + const arrayMeta = isTag(tag) ? fromArrayTag(tag.arg1.value) : undefined; if (!arrayMeta) { return []; @@ -117,7 +116,12 @@ export function fromCompactArray(cond: FilterCondition): Array = Array(length).fill(undefined); - cond.args.slice(2).forEach((cond, i) => { + + if (!isAnd(cond)) { + return arr; + } + + cond.args.slice(1).forEach((cond, i) => { arr[indexes[i]] = cond; }); From 23586567419c84745ed30f7c31552b0af2a35d84 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Tue, 4 Mar 2025 12:55:16 +0100 Subject: [PATCH 18/27] test: fix unit tests --- .../src/__tests__/condition-utils.spec.ts | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/shared/widget-plugin-filtering/src/__tests__/condition-utils.spec.ts b/packages/shared/widget-plugin-filtering/src/__tests__/condition-utils.spec.ts index 6334a05f44..39e062ec82 100644 --- a/packages/shared/widget-plugin-filtering/src/__tests__/condition-utils.spec.ts +++ b/packages/shared/widget-plugin-filtering/src/__tests__/condition-utils.spec.ts @@ -1,27 +1,33 @@ jest.mock("mendix/filters/builders"); +import { AndCondition } from "mendix/filters"; import { equals, literal } from "mendix/filters/builders"; import { compactArray, fromCompactArray, tag } from "../condition-utils"; -import { AndCondition } from "mendix/filters"; describe("condition-utils", () => { describe("compactArray", () => { - it("returns 'and' condition for zero array", () => { + it("returns 'tag' condition for zero array", () => { const result = compactArray([]); - expect(result).toMatchObject({ name: "and", type: "function" }); - expect((result as AndCondition).args).toHaveLength(2); + expect(result).toMatchObject({ + name: "!=", + type: "function", + arg1: { value: "[0,[]]", valueType: "String" } + }); }); - it("returns 'and' condition for empty array ", () => { + it("returns 'tag' condition for array of undefined", () => { const result = compactArray([undefined, undefined, undefined]); - expect(result).toMatchObject({ name: "and", type: "function" }); - expect((result as AndCondition).args).toHaveLength(2); + expect(result).toMatchObject({ + name: "!=", + type: "function", + arg1: { value: "[3,[]]", valueType: "String" } + }); }); - it("returns 'and' condition with 4 args", () => { + it("returns 'and' condition with 3 args", () => { const result = compactArray([tag("0"), undefined, tag("2")]); expect(result).toMatchObject({ name: "and", type: "function" }); - expect((result as AndCondition).args).toHaveLength(4); + expect((result as AndCondition).args).toHaveLength(3); }); }); From 1b36aca237327909ca820bed738ff9441e2baab4 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Tue, 4 Mar 2025 13:09:47 +0100 Subject: [PATCH 19/27] test: fix unit tests --- .../__tests__/DatagridTextFilter.spec.tsx | 90 +++++++++++-------- 1 file changed, 52 insertions(+), 38 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/components/__tests__/DatagridTextFilter.spec.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/components/__tests__/DatagridTextFilter.spec.tsx index 1b1720ebcb..3b8ae18f20 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/components/__tests__/DatagridTextFilter.spec.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/components/__tests__/DatagridTextFilter.spec.tsx @@ -1,8 +1,7 @@ import "@testing-library/jest-dom"; -import { FilterAPIv2 } from "@mendix/widget-plugin-filtering/context"; import { HeaderFiltersStore, - HeaderFiltersStoreProps + HeaderFiltersStoreSpec } from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore"; import { actionValue, @@ -17,11 +16,8 @@ import { createContext, createElement } from "react"; import DatagridTextFilter from "../../DatagridTextFilter"; import { DatagridTextFilterContainerProps } from "../../../typings/DatagridTextFilterProps"; import { resetIdCounter } from "downshift"; - -export interface StaticInfo { - name: string; - filtersChannelName: string; -} +import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver"; +import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; const commonProps: DatagridTextFilterContainerProps = { class: "filter-custom-class", @@ -29,13 +25,9 @@ const commonProps: DatagridTextFilterContainerProps = { name: "filter-test", defaultFilter: "equal" as const, adjustable: true, - advanced: false, - delay: 1000 -}; - -const headerFilterStoreInfo: StaticInfo = { - name: commonProps.name, - filtersChannelName: "datagrid1" + delay: 1000, + attrChoice: "auto", + attributes: [] }; jest.useFakeTimers(); @@ -57,7 +49,7 @@ describe("Text Filter", () => { describe("with defaultValue prop", () => { beforeEach(() => { - const props: HeaderFiltersStoreProps = { + const spec: HeaderFiltersStoreSpec = { filterList: [ { filter: new ListAttributeValueBuilder() @@ -70,10 +62,13 @@ describe("Text Filter", () => { .build() } ], - parentChannelName: "datagrid1" + filterChannelName: "datagrid1", + sharedInitFilter: [], + headerInitFilter: [], + customFilterHost: {} as FilterObserver }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -170,7 +165,7 @@ describe("Text Filter", () => { describe("with single attribute", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec: HeaderFiltersStoreSpec = { filterList: [ { filter: new ListAttributeValueBuilder() @@ -183,10 +178,13 @@ describe("Text Filter", () => { .build() } ], - parentChannelName: "datagrid1" + filterChannelName: "datagrid1", + sharedInitFilter: [], + headerInitFilter: [], + customFilterHost: {} as FilterObserver }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -256,7 +254,7 @@ describe("Text Filter", () => { describe("with multiple attributes", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec: HeaderFiltersStoreSpec = { filterList: [ { filter: new ListAttributeValueBuilder() @@ -284,10 +282,14 @@ describe("Text Filter", () => { .withFilterable(true) .build() } - ] + ], + filterChannelName: "datagrid1", + sharedInitFilter: [], + headerInitFilter: [], + customFilterHost: {} as FilterObserver }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -305,13 +307,17 @@ describe("Text Filter", () => { describe("with wrong attribute's type", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec: HeaderFiltersStoreSpec = { filterList: [ { filter: new ListAttributeValueBuilder().withType("Decimal").withFilterable(true).build() } - ] + ], + filterChannelName: "datagrid1", + sharedInitFilter: [], + headerInitFilter: [], + customFilterHost: {} as FilterObserver }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -329,7 +335,7 @@ describe("Text Filter", () => { describe("with wrong multiple attributes' types", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec: HeaderFiltersStoreSpec = { filterList: [ { filter: new ListAttributeValueBuilder() @@ -345,10 +351,14 @@ describe("Text Filter", () => { .withFilterable(true) .build() } - ] + ], + filterChannelName: "datagrid1", + sharedInitFilter: [], + headerInitFilter: [], + customFilterHost: {} as FilterObserver }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -379,7 +389,7 @@ describe("Text Filter", () => { describe("with multiple instances", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec: HeaderFiltersStoreSpec = { filterList: [ { filter: new ListAttributeValueBuilder() @@ -393,10 +403,14 @@ describe("Text Filter", () => { .withFilterable(true) .build() } - ] + ], + filterChannelName: "datagrid1", + sharedInitFilter: [], + headerInitFilter: [], + customFilterHost: {} as FilterObserver }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); From 7c5430dcbeddb4d0e90c4a20d9741b31783640c0 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Wed, 5 Mar 2025 13:52:05 +0100 Subject: [PATCH 20/27] chore: change label --- .../datagrid-text-filter-web/src/DatagridTextFilter.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml index 893a20f660..cd98442ec2 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.xml @@ -13,7 +13,7 @@ Auto - Custom + Manual From 3e6836b0c5bc4d280ffa6c4d81244bd6fb2297f9 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Wed, 5 Mar 2025 15:15:20 +0100 Subject: [PATCH 21/27] chore: fix types --- .../components/__test__/DropdownSort.spec.tsx | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/packages/pluggableWidgets/dropdown-sort-web/src/components/__test__/DropdownSort.spec.tsx b/packages/pluggableWidgets/dropdown-sort-web/src/components/__test__/DropdownSort.spec.tsx index abdf506ce5..bd7ead1a62 100644 --- a/packages/pluggableWidgets/dropdown-sort-web/src/components/__test__/DropdownSort.spec.tsx +++ b/packages/pluggableWidgets/dropdown-sort-web/src/components/__test__/DropdownSort.spec.tsx @@ -1,7 +1,7 @@ -import { FilterAPIv2 } from "@mendix/widget-plugin-filtering/context"; +import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { HeaderFiltersStore, - HeaderFiltersStoreProps + HeaderFiltersStoreSpec } from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore"; import { SortAPI } from "@mendix/widget-plugin-sorting/context"; import { SortAPIProvider, SortListType } from "@mendix/widget-plugin-sorting/providers/SortAPIProvider"; @@ -12,6 +12,7 @@ import { ListValue } from "mendix"; import { createContext, createElement } from "react"; import { DropdownSortContainerProps } from "../../../typings/DropdownSortProps"; import { DropdownSort } from "../../DropdownSort"; +import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver"; const commonProps: DropdownSortContainerProps = { class: "filter-custom-class", @@ -19,22 +20,16 @@ const commonProps: DropdownSortContainerProps = { name: "filter-test" }; -export interface StaticInfo { - name: string; - filtersChannelName: string; -} - -const headerFilterStoreInfo: StaticInfo = { - name: commonProps.name, - filtersChannelName: "" +const spec: HeaderFiltersStoreSpec = { + filterList: [], + sharedInitFilter: [], + headerInitFilter: [], + filterChannelName: "datagrid", + customFilterHost: {} as FilterObserver }; -// CONTEXT -const props: HeaderFiltersStoreProps = { - filterList: [] -}; -const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); -(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( +const headerFilterStore = new HeaderFiltersStore(spec); +(window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); From d79a5ca19428308de4556a4a6fd35eed4ff6a219 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 7 Mar 2025 10:17:24 +0100 Subject: [PATCH 22/27] fix: update types --- .../__tests__/DatagridDateFilter.spec.tsx | 72 +++++++++---------- .../src/hocs/withDateFilterAPI.tsx | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/DatagridDateFilter.spec.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/DatagridDateFilter.spec.tsx index 562a38881a..3deebdf5fe 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/DatagridDateFilter.spec.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/__tests__/DatagridDateFilter.spec.tsx @@ -1,8 +1,8 @@ import "@testing-library/jest-dom"; -import { FilterAPIv2 } from "@mendix/widget-plugin-filtering/context"; +import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { HeaderFiltersStore, - HeaderFiltersStoreProps + HeaderFiltersStoreSpec } from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore"; import { actionValue, @@ -15,11 +15,7 @@ import { createContext, createElement } from "react"; import DatagridDateFilter from "../../DatagridDateFilter"; import { DatagridDateFilterContainerProps } from "../../../typings/DatagridDateFilterProps"; import { MXGlobalObject, MXSessionConfig } from "../../../typings/global"; - -export interface StaticInfo { - name: string; - filtersChannelName: string; -} +import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver"; function createMXObjectMock( code: string, @@ -54,13 +50,17 @@ const commonProps: DatagridDateFilterContainerProps = { advanced: false }; -const headerFilterStoreInfo: StaticInfo = { - name: commonProps.name, - filtersChannelName: "" -}; - const mxObject = createMXObjectMock("en_US", "en-US"); +const mockSpec = (spec: Partial): HeaderFiltersStoreSpec => ({ + filterList: [], + filterChannelName: "datagrid/1", + headerInitFilter: [], + sharedInitFilter: [], + customFilterHost: {} as FilterObserver, + ...spec +}); + describe("Date Filter", () => { describe("with single instance", () => { afterEach(() => { @@ -69,13 +69,13 @@ describe("Date Filter", () => { describe("with single attribute", () => { beforeEach(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder().withType("DateTime").withFilterable(true).build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); (window as any).mx = mxObject; @@ -144,7 +144,7 @@ describe("Date Filter", () => { describe("with double attributes", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -161,9 +161,9 @@ describe("Date Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); (window as any).mx = mxObject; @@ -184,13 +184,13 @@ describe("Date Filter", () => { describe("with wrong attribute's type", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder().withType("Decimal").withFilterable(true).build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); (window as any).mx = mxObject; @@ -211,7 +211,7 @@ describe("Date Filter", () => { describe("with wrong multiple attributes' types", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -228,9 +228,9 @@ describe("Date Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); (window as any).mx = mxObject; @@ -267,13 +267,13 @@ describe("Date Filter", () => { describe("with multiple instances", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder().withType("DateTime").withFilterable(true).build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); (window as any).mx = mxObject; @@ -296,13 +296,13 @@ describe("Date Filter", () => { describe("with session config", () => { beforeEach(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder().withType("DateTime").withFilterable(true).build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withDateFilterAPI.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withDateFilterAPI.tsx index 38b85272f1..38f9c77860 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withDateFilterAPI.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withDateFilterAPI.tsx @@ -6,7 +6,7 @@ export function withDateFilterAPI

( Component: (props: P & Date_FilterAPIv2) => React.ReactElement ): (props: P) => React.ReactElement { return function FilterAPIProvider(props) { - const api = useDateFilterAPI(""); + const api = useDateFilterAPI(); if (api.hasError) { return {api.error.message}; From 0314337b4d50df0699288f6314eb411dfa2d6002 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 7 Mar 2025 10:23:31 +0100 Subject: [PATCH 23/27] fix: update types --- .../__tests__/DataGridDropdownFilter.spec.tsx | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/__tests__/DataGridDropdownFilter.spec.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/__tests__/DataGridDropdownFilter.spec.tsx index cd66ccfe96..784ade5f13 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/__tests__/DataGridDropdownFilter.spec.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/__tests__/DataGridDropdownFilter.spec.tsx @@ -1,18 +1,14 @@ import "@testing-library/jest-dom"; -import { FilterAPIv2 } from "@mendix/widget-plugin-filtering/context"; +import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { HeaderFiltersStore, - HeaderFiltersStoreProps + HeaderFiltersStoreSpec } from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore"; import { dynamicValue, ListAttributeValueBuilder } from "@mendix/widget-plugin-test-utils"; import { createContext, createElement } from "react"; import DatagridDropdownFilter from "../../DatagridDropdownFilter"; import { fireEvent, render, screen, waitFor } from "@testing-library/react"; - -export interface StaticInfo { - name: string; - filtersChannelName: string; -} +import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver"; const commonProps = { class: "filter-custom-class", @@ -26,10 +22,14 @@ const commonProps = { selectedItemsStyle: "text" as const }; -const headerFilterStoreInfo: StaticInfo = { - name: commonProps.name, - filtersChannelName: "" -}; +const mockSpec = (spec: Partial): HeaderFiltersStoreSpec => ({ + filterList: [], + filterChannelName: "datagrid/1", + headerInitFilter: [], + sharedInitFilter: [], + customFilterHost: {} as FilterObserver, + ...spec +}); const consoleError = global.console.error; jest.spyOn(global.console, "error").mockImplementation((...args: any[]) => { @@ -50,7 +50,7 @@ describe("Dropdown Filter", () => { describe("with single attribute", () => { function mockCtx(universe: string[]): void { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -64,9 +64,9 @@ describe("Dropdown Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); } @@ -207,7 +207,7 @@ describe("Dropdown Filter", () => { describe("with multiple attributes", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -234,9 +234,9 @@ describe("Dropdown Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -267,15 +267,15 @@ describe("Dropdown Filter", () => { describe("with wrong attribute's type", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder().withType("String").withFilterable(true).build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -297,7 +297,7 @@ describe("Dropdown Filter", () => { describe("with wrong multiple attributes' types", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -314,9 +314,9 @@ describe("Dropdown Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -354,7 +354,7 @@ describe("Dropdown Filter", () => { describe("with invalid values", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -364,9 +364,9 @@ describe("Dropdown Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -392,7 +392,7 @@ describe("Dropdown Filter", () => { describe("with multiple invalid values", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -409,9 +409,9 @@ describe("Dropdown Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -442,7 +442,7 @@ describe("Dropdown Filter", () => { describe("with multiple instances", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -456,9 +456,9 @@ describe("Dropdown Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); From 9bdcd3e087f579cb23fa51c0b7d25ef3e26d30cd Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 7 Mar 2025 10:30:13 +0100 Subject: [PATCH 24/27] fix: update types --- .../__tests__/DatagridNumberFilter.spec.tsx | 151 +++++++++--------- .../src/hocs/withNumberFilterAPI.tsx | 2 +- 2 files changed, 78 insertions(+), 75 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/src/components/__tests__/DatagridNumberFilter.spec.tsx b/packages/pluggableWidgets/datagrid-number-filter-web/src/components/__tests__/DatagridNumberFilter.spec.tsx index de71ce86e5..92767d5ff2 100644 --- a/packages/pluggableWidgets/datagrid-number-filter-web/src/components/__tests__/DatagridNumberFilter.spec.tsx +++ b/packages/pluggableWidgets/datagrid-number-filter-web/src/components/__tests__/DatagridNumberFilter.spec.tsx @@ -1,9 +1,9 @@ import "@testing-library/jest-dom"; -import { FilterAPIv2 } from "@mendix/widget-plugin-filtering/context"; +import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { requirePlugin } from "@mendix/widget-plugin-external-events/plugin"; import { HeaderFiltersStore, - HeaderFiltersStoreProps + HeaderFiltersStoreSpec } from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore"; import { actionValue, @@ -20,11 +20,7 @@ import DatagridNumberFilter from "../../DatagridNumberFilter"; import { Big } from "big.js"; import { DatagridNumberFilterContainerProps } from "../../../typings/DatagridNumberFilterProps"; import { resetIdCounter } from "downshift"; - -export interface StaticInfo { - name: string; - filtersChannelName: string; -} +import { FilterObserver } from "@mendix/widget-plugin-filtering/typings/FilterObserver"; const commonProps: DatagridNumberFilterContainerProps = { class: "filter-custom-class", @@ -36,13 +32,17 @@ const commonProps: DatagridNumberFilterContainerProps = { delay: 1000 }; -const headerFilterStoreInfo: StaticInfo = { - name: commonProps.name, - filtersChannelName: "datagrid1" -}; - jest.useFakeTimers(); +const mockSpec = (spec: Partial): HeaderFiltersStoreSpec => ({ + filterList: [], + filterChannelName: "datagrid1", + headerInitFilter: [], + sharedInitFilter: [], + customFilterHost: {} as FilterObserver, + ...spec +}); + beforeEach(() => { jest.spyOn(console, "warn").mockImplementation(() => { // noop @@ -60,23 +60,23 @@ describe("Number Filter", () => { describe("with single attribute", () => { beforeEach(() => { - const props: HeaderFiltersStoreProps = { - filterList: [ - { - filter: new ListAttributeValueBuilder() - .withType("Long") - .withFormatter( - value => (value ? value.toString() : ""), - (value: string) => ({ valid: true, value }) - ) - .withFilterable(true) - .build() - } - ], - parentChannelName: headerFilterStoreInfo.filtersChannelName - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + const headerFilterStore = new HeaderFiltersStore( + mockSpec({ + filterList: [ + { + filter: new ListAttributeValueBuilder() + .withType("Long") + .withFormatter( + value => (value ? value.toString() : ""), + (value: string) => ({ valid: true, value }) + ) + .withFilterable(true) + .build() + } + ] + }) + ); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -194,39 +194,40 @@ describe("Number Filter", () => { describe("with multiple attributes", () => { beforeEach(() => { - const props: HeaderFiltersStoreProps = { - filterList: [ - { - filter: new ListAttributeValueBuilder() - .withId("attribute1") - .withType("Long") - .withFormatter( - value => value, - () => { - // noop - } - ) - .withFilterable(true) - .build() - }, - { - filter: new ListAttributeValueBuilder() - .withId("attribute2") - .withType("Decimal") - .withFormatter( - value => value, - () => { - // noop - } - ) - .withFilterable(true) - .build() - } - ], - parentChannelName: headerFilterStoreInfo.filtersChannelName - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + const headerFilterStore = new HeaderFiltersStore( + mockSpec({ + filterList: [ + { + filter: new ListAttributeValueBuilder() + .withId("attribute1") + .withType("Long") + .withFormatter( + value => value, + () => { + // noop + } + ) + .withFilterable(true) + .build() + }, + { + filter: new ListAttributeValueBuilder() + .withId("attribute2") + .withType("Decimal") + .withFormatter( + value => value, + () => { + // noop + } + ) + .withFilterable(true) + .build() + } + ] + }) + ); + + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -296,13 +297,14 @@ describe("Number Filter", () => { describe("with wrong attribute's type", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder().withType("Boolean").withFilterable(true).build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -320,7 +322,7 @@ describe("Number Filter", () => { describe("with wrong multiple attributes' types", () => { beforeAll(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -337,9 +339,10 @@ describe("Number Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); @@ -370,7 +373,7 @@ describe("Number Filter", () => { describe("with multiple instances", () => { beforeEach(() => { - const props: HeaderFiltersStoreProps = { + const spec = mockSpec({ filterList: [ { filter: new ListAttributeValueBuilder() @@ -385,9 +388,9 @@ describe("Number Filter", () => { .build() } ] - }; - const headerFilterStore = new HeaderFiltersStore(props, headerFilterStoreInfo, null); - (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( + }); + const headerFilterStore = new HeaderFiltersStore(spec); + (window as any)["com.mendix.widgets.web.filterable.filterContext.v2"] = createContext( headerFilterStore.context ); }); diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withNumberFilterAPI.tsx b/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withNumberFilterAPI.tsx index e937dfd70a..73c78450ea 100644 --- a/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withNumberFilterAPI.tsx +++ b/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withNumberFilterAPI.tsx @@ -6,7 +6,7 @@ export function withNumberFilterAPI

( Component: (props: P & Number_FilterAPIv2) => React.ReactElement ): (props: P) => React.ReactElement { return function FilterAPIProvider(props) { - const api = useNumberFilterAPI(""); + const api = useNumberFilterAPI(); if (api.hasError) { return {api.error.message}; From a7f9e87c865b917a59f03dda40679d30f31fd270 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 7 Mar 2025 11:00:07 +0100 Subject: [PATCH 25/27] fix: change types --- .../gallery-web/src/stores/RootGalleryStore.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/pluggableWidgets/gallery-web/src/stores/RootGalleryStore.ts b/packages/pluggableWidgets/gallery-web/src/stores/RootGalleryStore.ts index 0f9bf1ebf6..24aa253be7 100644 --- a/packages/pluggableWidgets/gallery-web/src/stores/RootGalleryStore.ts +++ b/packages/pluggableWidgets/gallery-web/src/stores/RootGalleryStore.ts @@ -1,4 +1,5 @@ import { compactArray, fromCompactArray } from "@mendix/widget-plugin-filtering/condition-utils"; +import { CustomFilterHost } from "@mendix/widget-plugin-filtering/stores/generic/CustomFilterHost"; import { HeaderFiltersStore } from "@mendix/widget-plugin-filtering/stores/generic/HeaderFiltersStore"; import { generateUUID } from "@mendix/widget-plugin-platform/framework/generate-uuid"; import { SortAPIProvider } from "@mendix/widget-plugin-sorting/providers/SortAPIProvider"; @@ -25,8 +26,13 @@ export class RootGalleryStore { filtersChannelName: `datagrid/${generateUUID()}` }; - const headerViewState = this.getDsViewState(props); - this.headerFiltersStore = new HeaderFiltersStore(props, this.staticInfo, headerViewState); + this.headerFiltersStore = new HeaderFiltersStore({ + filterList: props.filterList, + filterChannelName: this.staticInfo.filtersChannelName, + headerInitFilter: this.getDsViewState(props), + sharedInitFilter: [], + customFilterHost: new CustomFilterHost() + }); this.sortProvider = new SortAPIProvider(props); } From 5e15a3485f6bea511048ec50d1f88432d8bebd6a Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 7 Mar 2025 11:49:24 +0100 Subject: [PATCH 26/27] test: update settings schema --- packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js b/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js index 5402ff52cd..321616b7d9 100644 --- a/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js +++ b/packages/pluggableWidgets/datagrid-web/e2e/DataGrid.spec.js @@ -113,14 +113,14 @@ test.describe("capabilities: hiding", () => { const textAreaValue = await textArea.inputValue(); expect(JSON.parse(textAreaValue)).toEqual({ name: "datagrid5", - schemaVersion: 2, + schemaVersion: 3, settingsHash: "1530160614", columns: [ { columnId: "0", hidden: true }, { columnId: "1", hidden: false } ], columnFilters: [], - groupFilters: [], + customFilters: [], sortOrder: [], columnOrder: ["0", "1"] }); From c525280209f08ae46d15a6f4bd6316c493cc4ee1 Mon Sep 17 00:00:00 2001 From: Illia Obukhau <8282906+iobuhov@users.noreply.github.com> Date: Fri, 4 Apr 2025 14:08:12 +0200 Subject: [PATCH 27/27] chore: update lockfile --- pnpm-lock.yaml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eacc2bd892..f2ba5b646f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1177,6 +1177,9 @@ importers: '@mendix/widget-plugin-hooks': specifier: workspace:* version: link:../../shared/widget-plugin-hooks + '@mendix/widget-plugin-mobx-kit': + specifier: workspace:^ + version: link:../../shared/widget-plugin-mobx-kit '@mendix/widget-plugin-platform': specifier: workspace:* version: link:../../shared/widget-plugin-platform @@ -2485,6 +2488,9 @@ importers: '@mendix/widget-plugin-hooks': specifier: workspace:* version: link:../widget-plugin-hooks + '@mendix/widget-plugin-mobx-kit': + specifier: workspace:^ + version: link:../widget-plugin-mobx-kit '@mendix/widget-plugin-platform': specifier: workspace:* version: link:../widget-plugin-platform @@ -13408,7 +13414,7 @@ snapshots: '@types/react-dom': 18.2.14 '@types/react-native': 0.72.8(react-native@0.75.3(@babel/core@7.21.0)(@babel/preset-env@7.26.9(@babel/core@7.21.0))(@types/react@18.2.36)(react@18.2.0)(typescript@5.1.6)) '@types/testing-library__jest-dom': 5.14.9 - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0(eslint@7.32.0)(typescript@5.8.2))(eslint@7.32.0)(typescript@5.8.2) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0(eslint@7.32.0)(typescript@5.1.6))(eslint@7.32.0)(typescript@5.1.6) '@typescript-eslint/parser': 5.62.0(eslint@7.32.0)(typescript@5.8.2) ansi-colors: 4.1.1 babel-eslint: 10.1.0(eslint@7.32.0) @@ -15046,6 +15052,25 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 + '@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@7.32.0)(typescript@5.1.6))(eslint@7.32.0)(typescript@5.1.6)': + dependencies: + '@eslint-community/regexpp': 4.11.1 + '@typescript-eslint/parser': 5.62.0(eslint@7.32.0)(typescript@5.8.2) + '@typescript-eslint/scope-manager': 5.62.0 + '@typescript-eslint/type-utils': 5.62.0(eslint@7.32.0)(typescript@5.8.2) + '@typescript-eslint/utils': 5.62.0(eslint@7.32.0)(typescript@5.8.2) + debug: 4.3.7 + eslint: 7.32.0 + graphemer: 1.4.0 + ignore: 5.3.2 + natural-compare-lite: 1.4.0 + semver: 7.7.1 + tsutils: 3.21.0(typescript@5.8.2) + optionalDependencies: + typescript: 5.1.6 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@7.32.0)(typescript@5.8.2))(eslint@7.32.0)(typescript@5.8.2)': dependencies: '@eslint-community/regexpp': 4.11.1 @@ -17368,7 +17393,7 @@ snapshots: '@typescript-eslint/experimental-utils': 4.33.0(eslint@7.32.0)(typescript@5.8.2) eslint: 7.32.0 optionalDependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0(eslint@7.32.0)(typescript@5.8.2))(eslint@7.32.0)(typescript@5.8.2) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0(eslint@7.32.0)(typescript@5.1.6))(eslint@7.32.0)(typescript@5.1.6) transitivePeerDependencies: - supports-color - typescript