(props: () => T): T {
- const [obj] = useState(props);
- useEffect(() => obj.setup(), [obj]);
- return obj;
-}
diff --git a/packages/shared/widget-plugin-filtering/src/helpers/useSetupUpdate.ts b/packages/shared/widget-plugin-filtering/src/helpers/useSetupUpdate.ts
deleted file mode 100644
index 1c22ec422d..0000000000
--- a/packages/shared/widget-plugin-filtering/src/helpers/useSetupUpdate.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useEffect } from "react";
-import { Setupable, useSetup } from "./useSetup";
-
-interface IUpdateModel extends Setupable {
- updateProps: (props: P) => void;
-}
-
-export function useSetupUpdate, P>(setup: () => T, props: P): T {
- const obj = useSetup(setup);
-
- // NOTE: Don't use dependencies.
- // Model should be updated on every render.
- useEffect(() => obj.updateProps(props));
- return obj;
-}
diff --git a/packages/shared/widget-plugin-filtering/src/helpers/useStringFilterAPI.ts b/packages/shared/widget-plugin-filtering/src/helpers/useStringFilterAPI.ts
index f3c11fbcda..9e5b49dcd7 100644
--- a/packages/shared/widget-plugin-filtering/src/helpers/useStringFilterAPI.ts
+++ b/packages/shared/widget-plugin-filtering/src/helpers/useStringFilterAPI.ts
@@ -1,5 +1,5 @@
import { useRef } from "react";
-import { FilterType, getFilterStore, useFilterContextValue } from "../context";
+import { useFilterAPI } from "../context";
import { APIError, EMISSINGSTORE, EStoreTypeMisMatch } from "../errors";
import { error, Result, value } from "../result-meta";
import { isStringFilter } from "../stores/input/store-utils";
@@ -11,7 +11,7 @@ export interface String_FilterAPIv2 {
}
export function useStringFilterAPI(): Result {
- const ctx = useFilterContextValue();
+ const ctx = useFilterAPI();
const strAPI = useRef();
if (ctx.hasError) {
@@ -24,7 +24,7 @@ export function useStringFilterAPI(): Result {
return error(api.provider.error);
}
- const store = getFilterStore(api.provider.value, FilterType.STRING);
+ const store = api.provider.value.type === "direct" ? api.provider.value.store : null;
if (store === null) {
return error(EMISSINGSTORE);
diff --git a/packages/shared/widget-plugin-filtering/src/helpers/useStringFilterController.ts b/packages/shared/widget-plugin-filtering/src/helpers/useStringFilterController.ts
index 35c26ad8c4..0316703559 100644
--- a/packages/shared/widget-plugin-filtering/src/helpers/useStringFilterController.ts
+++ b/packages/shared/widget-plugin-filtering/src/helpers/useStringFilterController.ts
@@ -1,17 +1,8 @@
-import { useEffect, useState } from "react";
+import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup";
import { Params, StringFilterController } from "../controllers/input/StringInputController";
-import { ArgumentInterface } from "../typings/ArgumentInterface";
-import { AllFunctions } from "../typings/FilterFunctions";
-import { FilterFn, InputFilterBaseInterface } from "../typings/InputFilterInterface";
-export function useStringFilterController<
- F extends InputFilterBaseInterface,
- A extends ArgumentInterface,
- Fn extends AllFunctions = FilterFn
->(params: Params): StringFilterController {
- const [ctrl] = useState(() => new StringFilterController(params));
-
- useEffect(() => ctrl.setup(), [ctrl]);
+export function useStringFilterController(params: Params): StringFilterController {
+ const ctrl = useSetup(() => new StringFilterController(params));
return ctrl;
}
diff --git a/packages/shared/widget-plugin-filtering/src/mobx-utils.ts b/packages/shared/widget-plugin-filtering/src/mobx-utils.ts
deleted file mode 100644
index 0b5ab0649a..0000000000
--- a/packages/shared/widget-plugin-filtering/src/mobx-utils.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export function disposeFx(): [disposers: Array<() => void>, dispose: () => void] {
- const disposers: Array<() => void> = [];
- return [
- disposers,
- () => {
- disposers.forEach(dispose => dispose());
- disposers.length = 0;
- }
- ];
-}
diff --git a/packages/shared/widget-plugin-filtering/src/providers/LegacyPv.ts b/packages/shared/widget-plugin-filtering/src/providers/LegacyPv.ts
deleted file mode 100644
index d9cb4f3b14..0000000000
--- a/packages/shared/widget-plugin-filtering/src/providers/LegacyPv.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { ListAttributeValue } from "mendix";
-import { FilterCondition } from "mendix/filters";
-import { action, comparer, computed, makeObservable, observable, reaction } from "mobx";
-import { FilterType as Ft, LegacyProvider } from "../context";
-import { DateInputFilterStore } from "../stores/input/DateInputFilterStore";
-import { NumberInputFilterStore } from "../stores/input/NumberInputFilterStore";
-import { StringInputFilterStore } from "../stores/input/StringInputFilterStore";
-import { StaticSelectFilterStore } from "../stores/picker/StaticSelectFilterStore";
-import { InputFilterInterface } from "../typings/InputFilterInterface";
-import { PickerFilterStore } from "../typings/PickerFilterStore";
-import { FiltersSettingsMap } from "../typings/settings";
-
-type FilterMap = {
- [Ft.STRING]: StringInputFilterStore | null;
- [Ft.NUMBER]: NumberInputFilterStore | null;
- [Ft.DATE]: DateInputFilterStore | null;
- [Ft.ENUMERATION]: StaticSelectFilterStore | null;
-};
-
-type FilterList = [
- StringInputFilterStore | null,
- NumberInputFilterStore | null,
- DateInputFilterStore | null,
- StaticSelectFilterStore | null
-];
-
-export class LegacyPv implements LegacyProvider {
- readonly type = "legacy";
- private _attrs: ListAttributeValue[];
- dispose?: () => void;
- filterMap: FilterMap;
- filterList: FilterList;
-
- constructor(attrs: ListAttributeValue[], dsViewState: Array | null) {
- this._attrs = attrs;
- const map = (this.filterMap = createMap(attrs, dsViewState));
- this.filterList = [map[Ft.STRING], map[Ft.NUMBER], map[Ft.DATE], map[Ft.ENUMERATION]];
- makeObservable(this, {
- _attrs: observable.ref,
- conditions: computed,
- settings: computed,
- updateProps: action
- });
- }
-
- get conditions(): Array {
- return this.filterList.map(store => (store ? store.condition : undefined));
- }
-
- get settings(): FiltersSettingsMap {
- return new Map();
- }
-
- set settings(_: unknown) {}
-
- get = (type: Ft): InputFilterInterface | PickerFilterStore | null => {
- return this.filterMap[type];
- };
-
- updateProps(attrs: ListAttributeValue[]): void {
- this._attrs = attrs;
- }
-
- updateFilters(attrs: ListAttributeValue[]): void {
- const [str, num, dte, enm] = groupByType(attrs);
- const [s1, s2, s3, s4] = this.filterList;
- s1?.updateProps(str);
- s2?.updateProps(num);
- s3?.updateProps(dte);
- s4?.updateProps(enm);
- }
-
- setup(): () => void {
- const disposers: Array<() => void> = [];
- this.filterList.forEach(store => {
- if (store && "setup" in store) {
- disposers.push(store.setup());
- }
- });
- disposers.push(
- reaction(
- () => this._attrs,
- attrs => this.updateFilters(attrs),
- { equals: comparer.shallow }
- )
- );
-
- return (this.dispose = () => disposers.forEach(dispose => dispose()));
- }
-}
-
-function createMap(attrs: ListAttributeValue[], dsViewState: Array | null): FilterMap {
- const [ini1 = null, ini2 = null, ini3 = null, ini4 = null] = dsViewState ?? [];
- const [str, num, dte, enm] = groupByType(attrs);
-
- const r: FilterMap = {
- [Ft.STRING]: str.length > 0 ? new StringInputFilterStore(str, ini1) : null,
- [Ft.NUMBER]: num.length > 0 ? new NumberInputFilterStore(num, ini2) : null,
- [Ft.DATE]: dte.length > 0 ? new DateInputFilterStore(dte, ini3) : null,
- [Ft.ENUMERATION]: enm.length > 0 ? new StaticSelectFilterStore(enm, ini4) : null
- };
-
- return r;
-}
-
-function groupByType(
- attrs: ListAttributeValue[]
-): [
- Array>,
- Array>,
- Array>,
- Array>
-] {
- return [
- attrs.filter(isStringAttr),
- attrs.filter(isNumberAttr),
- attrs.filter(isDateAttr),
- attrs.filter((a): a is ListAttributeValue => isBoolAttr(a) || isEnumAttr(a))
- ];
-}
-
-function isDateAttr(attr: ListAttributeValue): attr is ListAttributeValue {
- return attr.type === "DateTime";
-}
-
-function isBoolAttr(attr: ListAttributeValue): attr is ListAttributeValue {
- return attr.type === "Boolean";
-}
-
-function isEnumAttr(attr: ListAttributeValue): attr is ListAttributeValue {
- return attr.type === "Enum";
-}
-
-function isNumberAttr(attr: ListAttributeValue): attr is ListAttributeValue {
- return attr.type === "Long" || attr.type === "Decimal" || attr.type === "Integer" || attr.type === "AutoNumber";
-}
-function isStringAttr(attr: ListAttributeValue): attr is ListAttributeValue {
- return attr.type === "HashString" || attr.type === "String";
-}
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 b798603b73..a999e31901 100644
--- a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts
+++ b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts
@@ -1,9 +1,9 @@
+import { tag } from "@mendix/filter-commons/condition-utils";
+import { FiltersSettingsMap } from "@mendix/filter-commons/typings/settings";
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";
export class CustomFilterHost implements FilterObserver {
private filters: Map = new Map();
diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts
deleted file mode 100644
index f627172731..0000000000
--- a/packages/shared/widget-plugin-filtering/src/stores/generic/HeaderFiltersStore.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { ListAttributeValue } from "mendix";
-import { FilterCondition } from "mendix/filters";
-import { computed, makeObservable } from "mobx";
-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 HeaderFiltersStoreSpec {
- filterList: FilterListType[];
- filterChannelName: string;
- headerInitFilter: Array;
- sharedInitFilter: Array;
- customFilterHost: FilterObserver;
-}
-
-export class HeaderFiltersStore {
- private provider: Result;
- context: FilterAPI;
-
- constructor({
- filterList,
- filterChannelName,
- headerInitFilter,
- sharedInitFilter,
- customFilterHost: filterObserver
- }: HeaderFiltersStoreSpec) {
- this.provider = this.createProvider(filterList, headerInitFilter);
- this.context = {
- version: 3,
- parentChannelName: filterChannelName,
- provider: this.provider,
- sharedInitFilter,
- filterObserver
- };
- makeObservable(this, {
- conditions: computed,
- settings: computed
- });
- }
-
- get conditions(): Array {
- return this.provider.hasError ? [] : this.provider.value.conditions;
- }
-
- get settings(): FiltersSettingsMap {
- return this.provider.hasError ? new Map() : this.provider.value.settings;
- }
-
- set settings(value: FiltersSettingsMap | undefined) {
- if (this.provider.hasError) {
- return;
- }
-
- this.provider.value.settings = value;
- }
-
- createProvider(
- filterList: FilterListType[],
- initFilter: Array
- ): Result {
- return value(
- new LegacyPv(
- filterList.map(f => f.filter),
- initFilter
- )
- );
- }
-
- setup(): (() => void) | void {
- if (this.provider.hasError) {
- return;
- }
-
- return this.provider.value.setup();
- }
-}
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 08c21e5cfc..f599e940cf 100644
--- a/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts
+++ b/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts
@@ -1,3 +1,5 @@
+import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterData, InputData } from "@mendix/filter-commons/typings/settings";
import { Big } from "big.js";
import { AttributeMetaData } from "mendix";
import { FilterCondition } from "mendix/filters";
@@ -17,8 +19,6 @@ import {
startsWith
} from "mendix/filters/builders";
import { action, computed, makeObservable, observable } from "mobx";
-import { AllFunctions } from "../../typings/FilterFunctions";
-import { FilterData, InputData } from "../../typings/settings";
import { Argument } from "./Argument";
type StateTuple = [Fn] | [Fn, V] | [Fn, V, V];
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 7a8807a803..b7fbcfcbf5 100644
--- a/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts
+++ b/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts
@@ -1,3 +1,18 @@
+import {
+ betweenToState,
+ isAnd,
+ isEmptyExp,
+ isNotEmptyExp,
+ isOr,
+ singularToState
+} from "@mendix/filter-commons/condition-utils";
+import {
+ FilterFunctionBinary,
+ FilterFunctionGeneric,
+ FilterFunctionNonValue
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterName } from "@mendix/filter-commons/typings/mendix";
+import { FilterData, InputData } from "@mendix/filter-commons/typings/settings";
import { AttributeMetaData, DateTimeFormatter, ListAttributeValue, SimpleFormatter } from "mendix";
import { AndCondition, FilterCondition, LiteralExpression } from "mendix/filters";
import {
@@ -15,11 +30,7 @@ import {
or
} from "mendix/filters/builders";
import { action, comparer, IReactionDisposer, makeObservable, observable, reaction } from "mobx";
-import { betweenToState, isAnd, isEmptyExp, isNotEmptyExp, isOr, singularToState } from "../../condition-utils";
-import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "../../typings/FilterFunctions";
import { Date_InputFilterInterface } from "../../typings/InputFilterInterface";
-import { FilterFunction } from "../../typings/mendix";
-import { FilterData, InputData } from "../../typings/settings";
import { DateArgument } from "./Argument";
import { BaseInputFilterStore } from "./BaseInputFilterStore";
@@ -249,7 +260,7 @@ export class DateInputFilterStore
}
}
- private mapFn = (name: FilterFunction | "between" | "empty" | "notEmpty"): DateFns => {
+ private mapFn = (name: FilterName | "between" | "empty" | "notEmpty"): DateFns => {
switch (name) {
case "day:=":
return "equal";
diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts b/packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts
index 18a302d02d..7985c66ba9 100644
--- a/packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts
+++ b/packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts
@@ -1,11 +1,15 @@
+import { inputStateFromCond } from "@mendix/filter-commons/condition-utils";
+import {
+ FilterFunctionBinary,
+ FilterFunctionGeneric,
+ FilterFunctionNonValue
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterData, InputData } from "@mendix/filter-commons/typings/settings";
import { Big } from "big.js";
import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix";
import { FilterCondition } from "mendix/filters";
import { action, comparer, makeObservable } from "mobx";
-import { inputStateFromCond } from "../../condition-utils";
-import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "../../typings/FilterFunctions";
import { Number_InputFilterInterface } from "../../typings/InputFilterInterface";
-import { FilterData, InputData } from "../../typings/settings";
import { NumberArgument } from "./Argument";
import { BaseInputFilterStore } from "./BaseInputFilterStore";
import { baseNames } from "./fn-mappers";
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 31c720798b..3bae4046c5 100644
--- a/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts
+++ b/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts
@@ -1,15 +1,15 @@
-import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix";
-import { FilterCondition } from "mendix/filters";
-import { action, comparer, makeObservable } from "mobx";
-import { inputStateFromCond } from "../../condition-utils";
+import { inputStateFromCond } from "@mendix/filter-commons/condition-utils";
import {
FilterFunctionBinary,
FilterFunctionGeneric,
FilterFunctionNonValue,
FilterFunctionString
-} from "../../typings/FilterFunctions";
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterData, InputData } from "@mendix/filter-commons/typings/settings";
+import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix";
+import { FilterCondition } from "mendix/filters";
+import { action, comparer, makeObservable } from "mobx";
import { String_InputFilterInterface } from "../../typings/InputFilterInterface";
-import { FilterData, InputData } from "../../typings/settings";
import { StringArgument } from "./Argument";
import { BaseInputFilterStore } from "./BaseInputFilterStore";
import { baseNames } from "./fn-mappers";
diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/fn-mappers.ts b/packages/shared/widget-plugin-filtering/src/stores/input/fn-mappers.ts
index 71894c6d81..8ad3c58361 100644
--- a/packages/shared/widget-plugin-filtering/src/stores/input/fn-mappers.ts
+++ b/packages/shared/widget-plugin-filtering/src/stores/input/fn-mappers.ts
@@ -1,8 +1,12 @@
-import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "../../typings/FilterFunctions";
-import { FilterFunction } from "../../typings/mendix";
+import {
+ FilterFunctionBinary,
+ FilterFunctionGeneric,
+ FilterFunctionNonValue
+} from "@mendix/filter-commons/typings/FilterFunctions";
+import { FilterName } from "@mendix/filter-commons/typings/mendix";
export function baseNames(
- fn: FilterFunction | "between" | "empty" | "notEmpty"
+ fn: FilterName | "between" | "empty" | "notEmpty"
): FilterFunctionGeneric | FilterFunctionNonValue | FilterFunctionBinary {
switch (fn) {
case "=":
diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts b/packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts
index 63f382dea3..542391c3eb 100644
--- a/packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts
+++ b/packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts
@@ -1,3 +1,4 @@
+import { StaticSelectFilterStore } from "@mendix/widget-plugin-dropdown-filter/stores/StaticSelectFilterStore";
import { ListAttributeValue } from "mendix";
import { FilterCondition } from "mendix/filters";
import {
@@ -9,7 +10,6 @@ import {
import { DateInputFilterStore } from "../input/DateInputFilterStore";
import { NumberInputFilterStore } from "../input/NumberInputFilterStore";
import { StringInputFilterStore } from "../input/StringInputFilterStore";
-import { StaticSelectFilterStore } from "../picker/StaticSelectFilterStore";
export type InputFilterStore = StringInputFilterStore | NumberInputFilterStore | DateInputFilterStore;
diff --git a/packages/shared/widget-plugin-filtering/src/stores/utils/is-input-data.ts b/packages/shared/widget-plugin-filtering/src/stores/utils/is-input-data.ts
deleted file mode 100644
index ce484a9507..0000000000
--- a/packages/shared/widget-plugin-filtering/src/stores/utils/is-input-data.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { InputData } from "../../typings/settings";
-
-const fnNames = new Set([
- "empty",
- "notEmpty",
- "equal",
- "notEqual",
- "greater",
- "greaterEqual",
- "smaller",
- "smallerEqual",
- "between",
- "contains",
- "startsWith",
- "endsWith"
-]);
-
-export function isInputData(data: unknown): data is InputData {
- if (Array.isArray(data)) {
- const [name] = data;
- return fnNames.has(name);
- }
- return false;
-}
diff --git a/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts b/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts
index c572ed5d38..f9a9a672ff 100644
--- a/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts
+++ b/packages/shared/widget-plugin-filtering/src/typings/FilterObserver.ts
@@ -1,5 +1,5 @@
+import { FilterData, FiltersSettingsMap } from "@mendix/filter-commons/typings/settings";
import { FilterCondition } from "mendix/filters";
-import { FilterData, FiltersSettingsMap } from "./settings";
export interface Filter {
toJSON(): FilterData;
diff --git a/packages/shared/widget-plugin-filtering/src/typings/InputFilterInterface.ts b/packages/shared/widget-plugin-filtering/src/typings/InputFilterInterface.ts
index c58a879fea..8063c3ae3e 100644
--- a/packages/shared/widget-plugin-filtering/src/typings/InputFilterInterface.ts
+++ b/packages/shared/widget-plugin-filtering/src/typings/InputFilterInterface.ts
@@ -4,7 +4,7 @@ import {
FilterFunctionGeneric,
FilterFunctionNonValue,
FilterFunctionString
-} from "./FilterFunctions";
+} from "@mendix/filter-commons/typings/FilterFunctions";
import {
ArgumentInterface,
DateArgumentInterface,
diff --git a/packages/shared/widget-plugin-filtering/src/typings/OptionListFilterInterface.ts b/packages/shared/widget-plugin-filtering/src/typings/OptionListFilterInterface.ts
deleted file mode 100644
index 22f50c16a3..0000000000
--- a/packages/shared/widget-plugin-filtering/src/typings/OptionListFilterInterface.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { OptionWithState } from "./OptionWithState";
-
-export interface CustomOption {
- caption: string;
- value: string;
-}
-
-export interface OptionListFilterInterface {
- type: "refselect" | "select";
- storeType: "optionlist" | "refselect" | "select";
- options: OptionWithState[];
- selected: string[];
- isLoading: boolean;
- hasMore: boolean;
- canSearch: boolean;
-
- replace(value: string[]): void;
- toggle(value: string): void;
- loadMore(): void;
- setSearch(term: string | undefined): void;
- isValidValue(value: string): boolean;
- reset(): void;
- clear(): void;
- UNSAFE_setDefaults(value?: string[]): void;
- setup?(): () => void | void;
- setCustomOptions(options: CustomOption[]): void;
-}
diff --git a/packages/shared/widget-plugin-filtering/src/typings/PickerFilterStore.ts b/packages/shared/widget-plugin-filtering/src/typings/PickerFilterStore.ts
deleted file mode 100644
index d64f165603..0000000000
--- a/packages/shared/widget-plugin-filtering/src/typings/PickerFilterStore.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { RefFilterStore } from "../stores/picker/RefFilterStore";
-import { StaticSelectFilterStore } from "../stores/picker/StaticSelectFilterStore";
-
-export type PickerFilterStore = RefFilterStore | StaticSelectFilterStore;
diff --git a/packages/shared/widget-plugin-filtering/src/typings/mendix.ts b/packages/shared/widget-plugin-filtering/src/typings/mendix.ts
deleted file mode 100644
index 2544d74ee0..0000000000
--- a/packages/shared/widget-plugin-filtering/src/typings/mendix.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { FilterCondition } from "mendix/filters";
-import { FnName } from "./type-utils";
-
-export type FilterFunction = FnName;
diff --git a/packages/shared/widget-plugin-filtering/src/typings/type-utils.ts b/packages/shared/widget-plugin-filtering/src/typings/type-utils.ts
deleted file mode 100644
index a61d66ebf5..0000000000
--- a/packages/shared/widget-plugin-filtering/src/typings/type-utils.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type FnName = T extends { name: infer Name } ? Name : never;
-
-export type Dispose = () => void;
-
-export type GConstructor = new (...args: any[]) => T;
diff --git a/packages/shared/widget-plugin-grid/package.json b/packages/shared/widget-plugin-grid/package.json
index acd2a13cd7..a73239ef24 100644
--- a/packages/shared/widget-plugin-grid/package.json
+++ b/packages/shared/widget-plugin-grid/package.json
@@ -33,6 +33,9 @@
"prepare": "tsc",
"test": "jest"
},
+ "dependencies": {
+ "@mendix/widget-plugin-mobx-kit": "workspace:^"
+ },
"devDependencies": {
"@mendix/eslint-config-web-widgets": "workspace:*",
"@mendix/prettier-config-web-widgets": "workspace:*",
diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceController.ts b/packages/shared/widget-plugin-grid/src/query/DatasourceController.ts
similarity index 90%
rename from packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceController.ts
rename to packages/shared/widget-plugin-grid/src/query/DatasourceController.ts
index 803618e756..fbee1be307 100644
--- a/packages/pluggableWidgets/datagrid-web/src/controllers/DatasourceController.ts
+++ b/packages/shared/widget-plugin-grid/src/query/DatasourceController.ts
@@ -1,10 +1,11 @@
import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
import { ListValue, ValueStatus } from "mendix";
-import { action, autorun, makeAutoObservable } from "mobx";
+import { action, autorun, computed, IComputedValue, makeAutoObservable } from "mobx";
import { QueryController } from "./query-controller";
type Gate = DerivedPropsGate<{ datasource: ListValue }>;
+
type DatasourceControllerSpec = { gate: Gate };
export class DatasourceController implements ReactiveController, QueryController {
@@ -58,7 +59,7 @@ export class DatasourceController implements ReactiveController, QueryController
return this.datasource.status === "loading";
}
- private get datasource(): ListValue {
+ get datasource(): ListValue {
return this.gate.props.datasource;
}
@@ -90,12 +91,13 @@ export class DatasourceController implements ReactiveController, QueryController
}
/**
- * Returns a new copy of the controller.
+ * Returns computed value that holds controller copy.
* Recomputes the copy every time the datasource changes.
*/
- get computedCopy(): DatasourceController {
- const [copy] = [this.datasource].map(() => Object.create(this));
- return copy;
+ get derivedQuery(): IComputedValue {
+ const data = (): DatasourceController => [this.datasource].map(() => Object.create(this))[0];
+
+ return computed(data);
}
setup(): () => void {
diff --git a/packages/shared/widget-plugin-grid/src/query/PaginationController.ts b/packages/shared/widget-plugin-grid/src/query/PaginationController.ts
new file mode 100644
index 0000000000..012e069e1f
--- /dev/null
+++ b/packages/shared/widget-plugin-grid/src/query/PaginationController.ts
@@ -0,0 +1,92 @@
+import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+import { QueryController } from "./query-controller";
+
+
+type PaginationEnum = "buttons" | "virtualScrolling" | "loadMore";
+
+type ShowPagingButtonsEnum = "always" | "auto";
+
+type PaginationKind = `${PaginationEnum}.${ShowPagingButtonsEnum}`;
+
+interface StaticProps {
+ pageSize: number;
+ pagination: PaginationEnum;
+ showPagingButtons: ShowPagingButtonsEnum;
+ showTotalCount: boolean;
+}
+
+type Gate = undefined;
+
+type PaginationControllerSpec = StaticProps &{
+ gate: Gate;
+ query: QueryController;
+};
+
+
+export class PaginationController implements ReactiveController {
+ private readonly _pageSize: number;
+ private readonly _query: QueryController;
+ readonly pagination: PaginationEnum;
+ readonly paginationKind: PaginationKind;
+ readonly showPagingButtons: ShowPagingButtonsEnum;
+ readonly showTotalCount: boolean;
+
+ constructor(host: ReactiveControllerHost, spec: PaginationControllerSpec) {
+ host.addController(this);
+ this._pageSize = spec.pageSize;
+ this._query = spec.query;
+ this.pagination = spec.pagination;
+ this.showPagingButtons = spec.showPagingButtons;
+ this.showTotalCount = spec.showTotalCount;
+ this.paginationKind = `${this.pagination}.${this.showPagingButtons}`;
+ this._setInitParams();
+ }
+
+ get isLimitBased(): boolean {
+ return this.pagination === "virtualScrolling" || this.pagination === "loadMore";
+ }
+
+ get pageSize(): number {
+ return this._pageSize;
+ }
+
+ get currentPage(): number {
+ const {
+ _query: { limit, offset },
+ pageSize
+ } = this;
+ return this.isLimitBased ? limit / pageSize : offset / pageSize;
+ }
+
+ get showPagination(): boolean {
+ switch (this.paginationKind) {
+ case "buttons.always":
+ return true;
+ case "buttons.auto": {
+ const { totalCount = -1 } = this._query;
+ return totalCount > this._query.limit;
+ }
+ default:
+ return this.showTotalCount;
+ }
+ }
+
+ private _setInitParams(): void {
+ if (this.pagination === "buttons" || this.showTotalCount) {
+ this._query.requestTotalCount(true);
+ }
+
+ this._query.setPageSize(this.pageSize);
+ }
+
+ setup(): void {}
+
+ setPage = (computePage: (prevPage: number) => number): void => {
+ const newPage = computePage(this.currentPage);
+ if (this.isLimitBased) {
+ this._query.setLimit(newPage * this.pageSize);
+ } else {
+ this._query.setOffset(newPage * this.pageSize);
+ }
+ };
+}
diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/RefreshController.ts b/packages/shared/widget-plugin-grid/src/query/RefreshController.ts
similarity index 100%
rename from packages/pluggableWidgets/datagrid-web/src/controllers/RefreshController.ts
rename to packages/shared/widget-plugin-grid/src/query/RefreshController.ts
diff --git a/packages/pluggableWidgets/datagrid-web/src/controllers/query-controller.ts b/packages/shared/widget-plugin-grid/src/query/query-controller.ts
similarity index 100%
rename from packages/pluggableWidgets/datagrid-web/src/controllers/query-controller.ts
rename to packages/shared/widget-plugin-grid/src/query/query-controller.ts
diff --git a/packages/shared/widget-plugin-test-utils/package.json b/packages/shared/widget-plugin-test-utils/package.json
index 889942b8ce..8b2c5d0021 100644
--- a/packages/shared/widget-plugin-test-utils/package.json
+++ b/packages/shared/widget-plugin-test-utils/package.json
@@ -30,7 +30,7 @@
"test": "jest"
},
"dependencies": {
- "mendix": "^10.16.49747"
+ "mendix": "^10.21.64362"
},
"devDependencies": {
"@mendix/eslint-config-web-widgets": "workspace:*",