chore: update formatter logic

Author: iobuhov

packages/shared/widget-plugin-filtering/src/custom-filter-api/NumberStoreProvider.ts

@@ -1,47 +1,25 @@
-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 { NumberInputFilterStore } from "../stores/input/NumberInputFilterStore";
 import { Number_InputFilterInterface } from "../typings/InputFilterInterface";
+import { BaseStoreProvider } from "./BaseStoreProvider";
 import { FilterSpec } from "./typings";
 
-export class NumberStoreProvider implements ISetupable {
-    private _store: NumberInputFilterStore;
+export class NumberStoreProvider extends BaseStoreProvider<NumberInputFilterStore> {
+    protected _store: NumberInputFilterStore;
+    protected filterAPI: FilterAPI;
     readonly dataKey: string;
 
-    constructor(private filterAPI: FilterAPI, spec: FilterSpec<Big>) {
+    constructor(filterAPI: FilterAPI, spec: FilterSpec<Big>) {
+        super();
+        this.filterAPI = filterAPI;
         this.dataKey = spec.dataKey;
         this._store = new NumberInputFilterStore(
             spec.attributes,
             this.findInitFilter(filterAPI.sharedInitFilter, this.dataKey)
         );
     }
 
-    private findInitFilter(conditions: Array<FilterCondition | undefined>, 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;
-    }
-
     get store(): Number_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;
-    }
 }

packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts

@@ -9,10 +9,9 @@ import { FilterData, InputData } from "../../typings/settings";
 import { NumberArgument } from "./Argument";
 import { BaseInputFilterStore } from "./BaseInputFilterStore";
 import { baseNames } from "./fn-mappers";
-import { getFormatter } from "./store-utils";
 
 type NumFns = FilterFunctionGeneric | FilterFunctionNonValue | FilterFunctionBinary;
-type Formatter = ListAttributeValue<Big>["formatter"];
+type Formatter = SimpleFormatter<Big>;
 type AttrMeta = AttributeMetaData<Big> & { formatter?: SimpleFormatter<Big> };
 
 export class NumberInputFilterStore
@@ -23,7 +22,7 @@ export class NumberInputFilterStore
     readonly type = "number";
 
     constructor(attributes: AttrMeta[], initCond: FilterCondition | null) {
-        let formatter = formatterFix(getFormatter<Big>(attributes[0]));
+        const formatter = formatterFix(attributes[0].formatter);
         super(new NumberArgument(formatter), new NumberArgument(formatter), "equal", attributes);
         makeObservable(this, {
             updateProps: action,
@@ -80,11 +79,12 @@ export class NumberInputFilterStore
     }
 }
 
-function formatterFix(formatter: Formatter): Formatter {
+function formatterFix(formatter: Formatter | undefined): Formatter {
     // Check formatter.parse to see if it is a valid formatter.
-    if (formatter.parse("none")?.valid === false) {
+    if (formatter && formatter.parse("none")?.valid === false) {
         return formatter;
     }
+
     // Create a new formatter that will handle the autonumber values.
     return {
         format: (value: Big) => {

packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts

@@ -13,7 +13,6 @@ import { FilterData, InputData } from "../../typings/settings";
 import { StringArgument } from "./Argument";
 import { BaseInputFilterStore } from "./BaseInputFilterStore";
 import { baseNames } from "./fn-mappers";
-import { getFormatter } from "./store-utils";
 
 type StrFns = FilterFunctionString | FilterFunctionGeneric | FilterFunctionNonValue | FilterFunctionBinary;
 type AttrMeta = AttributeMetaData<string> & { formatter?: SimpleFormatter<string> };
@@ -94,3 +93,13 @@ export class StringInputFilterStore
         this.isInitialized = true;
     }
 }
+
+function getFormatter<T>(attr: { formatter?: SimpleFormatter<T> }): SimpleFormatter<T> {
+    return (
+        attr.formatter ??
+        ({
+            format: v => v ?? "",
+            parse: v => ({ valid: true, value: v ?? "" })
+        } as SimpleFormatter<T>)
+    );
+}

packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts

@@ -1,4 +1,4 @@
-import { ListAttributeValue, SimpleFormatter } from "mendix";
+import { ListAttributeValue } from "mendix";
 import { FilterCondition } from "mendix/filters";
 import {
     Date_InputFilterInterface,
@@ -52,13 +52,3 @@ export function isStringFilter(store: InputFilterInterface): store is String_Inp
 export function isDateFilter(store: InputFilterInterface): store is Date_InputFilterInterface {
     return store.arg1.type === "date";
 }
-
-export function getFormatter<T>(attr: { formatter?: SimpleFormatter<T> }): SimpleFormatter<T> {
-    return (
-        attr.formatter ??
-        ({
-            format: v => v ?? "",
-            parse: v => ({ valid: true, value: v ?? "" })
-        } as SimpleFormatter<T>)
-    );
-}