@webiny/app-admin 6.4.12-beta.5 → 6.5.0-beta.1

package/presentation/listPresenter/QueryMatcher.test.js

@@ -0,0 +1,345 @@
+import { describe, expect, it } from "vitest";
+import { QueryMatcher } from "./QueryMatcher.js";
+const row = (id, savedOn, folderId = "root")=>({
+        id,
+        folderId,
+        savedOn
+    });
+const createMatcher = (config = {})=>new QueryMatcher({
+        keyField: "id",
+        localFilters: {
+            folderId: (item, value)=>item.folderId === value
+        },
+        ...config
+    });
+const ids = (rows)=>rows.map((r)=>r.id);
+describe("QueryMatcher.select", ()=>{
+    it("should only filter before the first query", ()=>{
+        const matcher = createMatcher();
+        expect(ids(matcher.select([
+            row("b", "2"),
+            row("a", "1")
+        ]))).toEqual([
+            "b",
+            "a"
+        ]);
+    });
+    it("should sort by the applied sort, regardless of cache order", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "DESC"
+            }
+        }, [
+            "c",
+            "b",
+            "a"
+        ]);
+        const cached = [
+            row("a", "1"),
+            row("c", "3"),
+            row("b", "2")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "c",
+            "b",
+            "a"
+        ]);
+    });
+    it("should apply local filters", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            filters: {
+                folderId: "root"
+            },
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        const cached = [
+            row("a", "1"),
+            row("x", "0", "other"),
+            row("b", "2")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+    it("should cut off items that sort past the last loaded item while more are available", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ], true);
+        const cached = [
+            row("z", "9"),
+            row("a", "1"),
+            row("b", "2")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+    it("should include items past the last loaded item when nothing more is available", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ], false);
+        const cached = [
+            row("z", "9"),
+            row("a", "1"),
+            row("b", "2")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b",
+            "z"
+        ]);
+    });
+    it("should extend the loaded window on appendResultKeys", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a"
+        ], true);
+        matcher.appendResultKeys([
+            "b"
+        ], true);
+        const cached = [
+            row("c", "3"),
+            row("b", "2"),
+            row("a", "1")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+    it("should keep the server order for items with equal sort values", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "DESC"
+            }
+        }, [
+            "b",
+            "a",
+            "c"
+        ]);
+        const cached = [
+            row("a", "1"),
+            row("c", "1"),
+            row("b", "1")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "b",
+            "a",
+            "c"
+        ]);
+    });
+    it("should sort empty values last in ascending order", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        const cached = [
+            row("n"),
+            row("b", "2"),
+            row("u"),
+            row("a", "1")
+        ];
+        cached[0].savedOn = null;
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b",
+            "n",
+            "u"
+        ]);
+    });
+    it("should sort empty values first in descending order", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "DESC"
+            }
+        }, [
+            "b",
+            "a"
+        ]);
+        expect(ids(matcher.select([
+            row("a", "1"),
+            row("e"),
+            row("b", "2")
+        ]))).toEqual([
+            "e",
+            "b",
+            "a"
+        ]);
+    });
+    it("should sort an empty string as a regular string", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        expect(ids(matcher.select([
+            row("b", "1"),
+            row("u"),
+            row("a", "")
+        ]))).toEqual([
+            "a",
+            "b",
+            "u"
+        ]);
+    });
+    it("should keep the server order while searching", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            search: "hello",
+            sort: {
+                field: "savedOn",
+                direction: "ASC"
+            }
+        }, [
+            "c",
+            "a",
+            "b"
+        ]);
+        const cached = [
+            row("a", "1"),
+            row("b", "2"),
+            row("c", "3"),
+            row("x", "0")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "c",
+            "a",
+            "b"
+        ]);
+    });
+    it("should read nested sort fields by path", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "values.title",
+                direction: "ASC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        const cached = [
+            {
+                id: "b",
+                folderId: "root",
+                values: {
+                    title: "Beta"
+                }
+            },
+            {
+                id: "a",
+                folderId: "root",
+                values: {
+                    title: "Alpha"
+                }
+            }
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+    it("should use a custom sort value getter", ()=>{
+        const matcher = createMatcher({
+            getSortValue: (item, field)=>"title" === field ? item.values?.title : void 0
+        });
+        matcher.updateFromQuery({
+            sort: {
+                field: "title",
+                direction: "DESC"
+            }
+        }, [
+            "a",
+            "b"
+        ]);
+        const cached = [
+            {
+                id: "a",
+                folderId: "root",
+                values: {
+                    title: "Alpha"
+                }
+            },
+            {
+                id: "b",
+                folderId: "root",
+                values: {
+                    title: "Beta"
+                }
+            }
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "b",
+            "a"
+        ]);
+    });
+    it("should put items the server did not return after the server's items among equal values", ()=>{
+        const matcher = createMatcher();
+        matcher.updateFromQuery({
+            sort: {
+                field: "savedOn",
+                direction: "DESC"
+            }
+        }, [
+            "b",
+            "a"
+        ], true);
+        const cached = [
+            row("x", "1"),
+            row("a", "1"),
+            row("y", "1"),
+            row("b", "1")
+        ];
+        expect(ids(matcher.select(cached))).toEqual([
+            "b",
+            "a"
+        ]);
+    });
+});
+
+//# sourceMappingURL=QueryMatcher.test.js.map

package/presentation/listPresenter/QueryMatcher.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"presentation/listPresenter/QueryMatcher.test.js","sources":["../../../src/presentation/listPresenter/QueryMatcher.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { QueryMatcher } from \"./QueryMatcher.js\";\n\ninterface Row {\n    id: string;\n    folderId: string;\n    savedOn?: string;\n    values?: { title?: string };\n}\n\nconst row = (id: string, savedOn?: string, folderId = \"root\"): Row => ({ id, folderId, savedOn });\n\nconst createMatcher = (config: Partial<ConstructorParameters<typeof QueryMatcher<Row>>[0]> = {}) =>\n    new QueryMatcher<Row>({\n        keyField: \"id\",\n        localFilters: {\n            folderId: (item, value) => item.folderId === value\n        },\n        ...config\n    });\n\nconst ids = (rows: Row[]) => rows.map(r => r.id);\n\ndescribe(\"QueryMatcher.select\", () => {\n    it(\"should only filter before the first query\", () => {\n        const matcher = createMatcher();\n\n        expect(ids(matcher.select([row(\"b\", \"2\"), row(\"a\", \"1\")]))).toEqual([\"b\", \"a\"]);\n    });\n\n    it(\"should sort by the applied sort, regardless of cache order\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"DESC\" } }, [\"c\", \"b\", \"a\"]);\n\n        const cached = [row(\"a\", \"1\"), row(\"c\", \"3\"), row(\"b\", \"2\")];\n\n        expect(ids(matcher.select(cached))).toEqual([\"c\", \"b\", \"a\"]);\n    });\n\n    it(\"should apply local filters\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery(\n            { filters: { folderId: \"root\" }, sort: { field: \"savedOn\", direction: \"ASC\" } },\n            [\"a\", \"b\"]\n        );\n\n        const cached = [row(\"a\", \"1\"), row(\"x\", \"0\", \"other\"), row(\"b\", \"2\")];\n\n        expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\"]);\n    });\n\n    it(\"should cut off items that sort past the last loaded item while more are available\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"ASC\" } }, [\"a\", \"b\"], true);\n\n        // \"z\" was cached by another view and sorts after the loaded window.\n        const cached = [row(\"z\", \"9\"), row(\"a\", \"1\"), row(\"b\", \"2\")];\n\n        expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\"]);\n    });\n\n    it(\"should include items past the last loaded item when nothing more is available\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery(\n            { sort: { field: \"savedOn\", direction: \"ASC\" } },\n            [\"a\", \"b\"],\n            false\n        );\n\n        const cached = [row(\"z\", \"9\"), row(\"a\", \"1\"), row(\"b\", \"2\")];\n\n        expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\", \"z\"]);\n    });\n\n    it(\"should extend the loaded window on appendResultKeys\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"ASC\" } }, [\"a\"], true);\n        matcher.appendResultKeys([\"b\"], true);\n\n        const cached = [row(\"c\", \"3\"), row(\"b\", \"2\"), row(\"a\", \"1\")];\n\n        expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\"]);\n    });\n\n    it(\"should keep the server order for items with equal sort values\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"DESC\" } }, [\"b\", \"a\", \"c\"]);\n\n        const cached = [row(\"a\", \"1\"), row(\"c\", \"1\"), row(\"b\", \"1\")];\n\n        expect(ids(matcher.select(cached))).toEqual([\"b\", \"a\", \"c\"]);\n    });\n\n    // Empty values are ordered the same way as the DDB and SQL storage sort them.\n    it(\"should sort empty values last in ascending order\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"ASC\" } }, [\"a\", \"b\"]);\n\n        const cached = [row(\"n\"), row(\"b\", \"2\"), row(\"u\"), row(\"a\", \"1\")];\n        cached[0].savedOn = null as unknown as string;\n\n        expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\", \"n\", \"u\"]);\n    });\n\n    it(\"should sort empty values first in descending order\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"DESC\" } }, [\"b\", \"a\"]);\n\n        expect(ids(matcher.select([row(\"a\", \"1\"), row(\"e\"), row(\"b\", \"2\")]))).toEqual([\n            \"e\",\n            \"b\",\n            \"a\"\n        ]);\n    });\n\n    it(\"should sort an empty string as a regular string\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ sort: { field: \"savedOn\", direction: \"ASC\" } }, [\"a\", \"b\"]);\n\n        expect(ids(matcher.select([row(\"b\", \"1\"), row(\"u\"), row(\"a\", \"\")]))).toEqual([\n            \"a\",\n            \"b\",\n            \"u\"\n        ]);\n    });\n\n    it(\"should keep the server order while searching\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ search: \"hello\", sort: { field: \"savedOn\", direction: \"ASC\" } }, [\n            \"c\",\n            \"a\",\n            \"b\"\n        ]);\n\n        const cached = [row(\"a\", \"1\"), row(\"b\", \"2\"), row(\"c\", \"3\"), row(\"x\", \"0\")];\n\n        expect(ids(matcher.select(cached))).toEqual([\"c\", \"a\", \"b\"]);\n    });\n\n    it(\"should read nested sort fields by path\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery({ sort: { field: \"values.title\", direction: \"ASC\" } }, [\"a\", \"b\"]);\n\n        const cached: Row[] = [\n            { id: \"b\", folderId: \"root\", values: { title: \"Beta\" } },\n            { id: \"a\", folderId: \"root\", values: { title: \"Alpha\" } }\n        ];\n\n        expect(ids(matcher.select(cached))).toEqual([\"a\", \"b\"]);\n    });\n\n    it(\"should use a custom sort value getter\", () => {\n        const matcher = createMatcher({\n            getSortValue: (item, field) => (field === \"title\" ? item.values?.title : undefined)\n        });\n        matcher.updateFromQuery({ sort: { field: \"title\", direction: \"DESC\" } }, [\"a\", \"b\"]);\n\n        const cached: Row[] = [\n            { id: \"a\", folderId: \"root\", values: { title: \"Alpha\" } },\n            { id: \"b\", folderId: \"root\", values: { title: \"Beta\" } }\n        ];\n\n        expect(ids(matcher.select(cached))).toEqual([\"b\", \"a\"]);\n    });\n\n    it(\"should put items the server did not return after the server's items among equal values\", () => {\n        const matcher = createMatcher();\n        matcher.updateFromQuery(\n            { sort: { field: \"savedOn\", direction: \"DESC\" } },\n            [\"b\", \"a\"],\n            true\n        );\n\n        // \"x\" and \"y\" were cached by another view and tie with the loaded items.\n        const cached = [row(\"x\", \"1\"), row(\"a\", \"1\"), row(\"y\", \"1\"), row(\"b\", \"1\")];\n\n        // Server items come first, in server order, and the tied leftovers are cut off\n        // together with everything else past the last loaded item.\n        expect(ids(matcher.select(cached))).toEqual([\"b\", \"a\"]);\n    });\n});\n"],"names":["row","id","savedOn","folderId","createMatcher","config","QueryMatcher","item","value","ids","rows","r","describe","it","matcher","expect","cached","field","undefined"],"mappings":"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"}

package/presentation/listPresenter/SimpleDataSource.d.ts

@@ -0,0 +1,15 @@
+import type { IDataSource, IDataSourceQuery, IDataSourceMeta } from "./abstractions.js";
+import type { FetchResult } from "./FolderAwareDataSource.js";
+export declare abstract class SimpleDataSource<TRow> implements IDataSource<TRow> {
+    private _meta;
+    private _loading;
+    protected constructor();
+    abstract get rows(): TRow[];
+    abstract fetch(params: IDataSourceQuery): Promise<FetchResult<TRow>>;
+    protected onQueryResult(_data: TRow[]): void;
+    protected onLoadMoreResult(_data: TRow[]): void;
+    get meta(): IDataSourceMeta;
+    get loading(): boolean;
+    query(params: IDataSourceQuery): Promise<void>;
+    loadMore(params: IDataSourceQuery): Promise<void>;
+}

package/presentation/listPresenter/SimpleDataSource.js

@@ -0,0 +1,70 @@
+import { action, computed, makeObservable, observable, runInAction } from "mobx";
+class SimpleDataSource {
+    constructor(){
+        this._meta = {
+            cursor: null,
+            hasMoreItems: false,
+            totalCount: 0
+        };
+        this._loading = false;
+        makeObservable(this, {
+            _meta: observable,
+            _loading: observable,
+            meta: computed,
+            loading: computed,
+            query: action,
+            loadMore: action
+        });
+    }
+    onQueryResult(_data) {}
+    onLoadMoreResult(_data) {}
+    get meta() {
+        return this._meta;
+    }
+    get loading() {
+        return this._loading;
+    }
+    async query(params) {
+        this._loading = true;
+        try {
+            const result = await this.fetch(params);
+            runInAction(()=>{
+                this.onQueryResult(result.data);
+                this._meta = {
+                    cursor: result.meta.cursor,
+                    hasMoreItems: result.meta.hasMoreItems,
+                    totalCount: result.meta.totalCount
+                };
+            });
+        } finally{
+            runInAction(()=>{
+                this._loading = false;
+            });
+        }
+    }
+    async loadMore(params) {
+        if (!this._meta.hasMoreItems || this._loading) return;
+        this._loading = true;
+        try {
+            const result = await this.fetch({
+                ...params,
+                cursor: this._meta.cursor ?? void 0
+            });
+            runInAction(()=>{
+                this.onLoadMoreResult(result.data);
+                this._meta = {
+                    cursor: result.meta.cursor,
+                    hasMoreItems: result.meta.hasMoreItems,
+                    totalCount: result.meta.totalCount
+                };
+            });
+        } finally{
+            runInAction(()=>{
+                this._loading = false;
+            });
+        }
+    }
+}
+export { SimpleDataSource };
+
+//# sourceMappingURL=SimpleDataSource.js.map

package/presentation/listPresenter/SimpleDataSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"presentation/listPresenter/SimpleDataSource.js","sources":["../../../src/presentation/listPresenter/SimpleDataSource.ts"],"sourcesContent":["import { makeObservable, observable, computed, runInAction, action } from \"mobx\";\nimport type { IDataSource, IDataSourceQuery, IDataSourceMeta } from \"./abstractions.js\";\nimport type { FetchResult } from \"./FolderAwareDataSource.js\";\n\nexport abstract class SimpleDataSource<TRow> implements IDataSource<TRow> {\n    private _meta: IDataSourceMeta = { cursor: null, hasMoreItems: false, totalCount: 0 };\n    private _loading = false;\n\n    protected constructor() {\n        makeObservable<SimpleDataSource<TRow>, \"_meta\" | \"_loading\">(this, {\n            _meta: observable,\n            _loading: observable,\n            meta: computed,\n            loading: computed,\n            query: action,\n            loadMore: action\n        });\n    }\n\n    abstract get rows(): TRow[];\n\n    abstract fetch(params: IDataSourceQuery): Promise<FetchResult<TRow>>;\n\n    protected onQueryResult(_data: TRow[]): void {}\n\n    protected onLoadMoreResult(_data: TRow[]): void {}\n\n    get meta(): IDataSourceMeta {\n        return this._meta;\n    }\n\n    get loading(): boolean {\n        return this._loading;\n    }\n\n    async query(params: IDataSourceQuery): Promise<void> {\n        this._loading = true;\n\n        try {\n            const result = await this.fetch(params);\n\n            runInAction(() => {\n                this.onQueryResult(result.data);\n                this._meta = {\n                    cursor: result.meta.cursor,\n                    hasMoreItems: result.meta.hasMoreItems,\n                    totalCount: result.meta.totalCount\n                };\n            });\n        } finally {\n            runInAction(() => {\n                this._loading = false;\n            });\n        }\n    }\n\n    async loadMore(params: IDataSourceQuery): Promise<void> {\n        if (!this._meta.hasMoreItems || this._loading) {\n            return;\n        }\n\n        this._loading = true;\n\n        try {\n            const result = await this.fetch({\n                ...params,\n                cursor: this._meta.cursor ?? undefined\n            });\n\n            runInAction(() => {\n                this.onLoadMoreResult(result.data);\n                this._meta = {\n                    cursor: result.meta.cursor,\n                    hasMoreItems: result.meta.hasMoreItems,\n                    totalCount: result.meta.totalCount\n                };\n            });\n        } finally {\n            runInAction(() => {\n                this._loading = false;\n            });\n        }\n    }\n}\n"],"names":["SimpleDataSource","makeObservable","observable","computed","action","_data","params","result","runInAction","undefined"],"mappings":";AAIO,MAAeA;IAIlB,aAAwB;aAHhB,KAAK,GAAoB;YAAE,QAAQ;YAAM,cAAc;YAAO,YAAY;QAAE;aAC5E,QAAQ,GAAG;QAGfC,eAA6D,IAAI,EAAE;YAC/D,OAAOC;YACP,UAAUA;YACV,MAAMC;YACN,SAASA;YACT,OAAOC;YACP,UAAUA;QACd;IACJ;IAMU,cAAcC,KAAa,EAAQ,CAAC;IAEpC,iBAAiBA,KAAa,EAAQ,CAAC;IAEjD,IAAI,OAAwB;QACxB,OAAO,IAAI,CAAC,KAAK;IACrB;IAEA,IAAI,UAAmB;QACnB,OAAO,IAAI,CAAC,QAAQ;IACxB;IAEA,MAAM,MAAMC,MAAwB,EAAiB;QACjD,IAAI,CAAC,QAAQ,GAAG;QAEhB,IAAI;YACA,MAAMC,SAAS,MAAM,IAAI,CAAC,KAAK,CAACD;YAEhCE,YAAY;gBACR,IAAI,CAAC,aAAa,CAACD,OAAO,IAAI;gBAC9B,IAAI,CAAC,KAAK,GAAG;oBACT,QAAQA,OAAO,IAAI,CAAC,MAAM;oBAC1B,cAAcA,OAAO,IAAI,CAAC,YAAY;oBACtC,YAAYA,OAAO,IAAI,CAAC,UAAU;gBACtC;YACJ;QACJ,SAAU;YACNC,YAAY;gBACR,IAAI,CAAC,QAAQ,GAAG;YACpB;QACJ;IACJ;IAEA,MAAM,SAASF,MAAwB,EAAiB;QACpD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,EACzC;QAGJ,IAAI,CAAC,QAAQ,GAAG;QAEhB,IAAI;YACA,MAAMC,SAAS,MAAM,IAAI,CAAC,KAAK,CAAC;gBAC5B,GAAGD,MAAM;gBACT,QAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,IAAIG;YACjC;YAEAD,YAAY;gBACR,IAAI,CAAC,gBAAgB,CAACD,OAAO,IAAI;gBACjC,IAAI,CAAC,KAAK,GAAG;oBACT,QAAQA,OAAO,IAAI,CAAC,MAAM;oBAC1B,cAAcA,OAAO,IAAI,CAAC,YAAY;oBACtC,YAAYA,OAAO,IAAI,CAAC,UAAU;gBACtC;YACJ;QACJ,SAAU;YACNC,YAAY;gBACR,IAAI,CAAC,QAAQ,GAAG;YACpB;QACJ;IACJ;AACJ"}

package/presentation/listPresenter/abstractions.d.ts

@@ -31,8 +31,13 @@ export interface IListPresenterConfig<TRow> {
         direction: "ASC" | "DESC";
     };
     initialFilters?: Record<string, unknown>;
+    initialSearch?: string;
     debounceMs?: number;
     limit?: number;
+    itemLabel?: {
+        singular: string;
+        plural: string;
+    };
 }
 export interface IListError {
     code: string;
@@ -59,7 +64,9 @@ export interface IListViewModel<TRow> {
         selectedIds: Set<string>;
         selectedCount: number;
         allSelected: boolean;
+        label: string;
     };
+    showingFilters: boolean;
     empty: boolean;
     emptyWithFilters: boolean;
     error: IListError | null;
@@ -77,6 +84,8 @@ export interface IListActions {
         set(key: string, value: unknown): void;
         clear(key: string): void;
         clearAll(): void;
+        show(): void;
+        hide(): void;
     };
     selection: {
         toggle(id: string): void;

package/presentation/listPresenter/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/listPresenter/abstractions.js","sources":["../../../src/presentation/listPresenter/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\n\n// ---------------------------------------------------------------------------\n// DataSource interfaces\n// ---------------------------------------------------------------------------\n\nexport interface IDataSourceQuery {\n    search?: string;\n    filters?: Record<string, unknown>;\n    sort?: { field: string; direction: \"ASC\" | \"DESC\" };\n    cursor?: string;\n    limit?: number;\n}\n\nexport interface IDataSourceMeta {\n    cursor: string | null;\n    hasMoreItems: boolean;\n    totalCount: number;\n}\n\nexport interface IDataSourceResult<TRow> {\n    rows: TRow[];\n    meta: IDataSourceMeta;\n}\n\nexport interface IDataSource<TRow> {\n    readonly rows: TRow[];\n    readonly meta: IDataSourceMeta;\n    readonly loading: boolean;\n    query(params: IDataSourceQuery): Promise<void>;\n    loadMore(params: IDataSourceQuery): Promise<void>;\n}\n\n// ---------------------------------------------------------------------------\n// ListPresenter config\n// ---------------------------------------------------------------------------\n\nexport interface IListPresenterConfig<TRow> {\n    dataSource: IDataSource<TRow>;\n    initialSort?: { field: string; direction: \"ASC\" | \"DESC\" };\n    initialFilters?: Record<string, unknown>;\n    debounceMs?: number;\n    limit?: number;\n}\n\n// ---------------------------------------------------------------------------\n// ListError\n// ---------------------------------------------------------------------------\n\nexport interface IListError {\n    code: string;\n    message: string;\n    retryable: boolean;\n}\n\n// ---------------------------------------------------------------------------\n// ListViewModel\n// ---------------------------------------------------------------------------\n\nexport interface IListViewModel<TRow> {\n    rows: TRow[];\n    sort: { field: string; direction: \"ASC\" | \"DESC\" } | null;\n    filters: Record<string, unknown>;\n    search: string;\n    appliedQuery: IDataSourceQuery | null;\n    pagination: {\n        hasMore: boolean;\n        loading: boolean;\n        loadingMore: boolean;\n        totalCount: number;\n        currentCount: number;\n    };\n    selection: {\n        selectedIds: Set<string>;\n        selectedCount: number;\n        allSelected: boolean;\n    };\n    empty: boolean;\n    emptyWithFilters: boolean;\n    error: IListError | null;\n}\n\n// ---------------------------------------------------------------------------\n// ListActions\n// ---------------------------------------------------------------------------\n\nexport interface IListActions {\n    search: {\n        set(query: string): void;\n        clear(): void;\n    };\n    sort: {\n        set(field: string, direction: \"ASC\" | \"DESC\"): void;\n        toggle(field: string): void;\n    };\n    filter: {\n        set(key: string, value: unknown): void;\n        clear(key: string): void;\n        clearAll(): void;\n    };\n    selection: {\n        toggle(id: string): void;\n        selectRangeTo(id: string): void;\n        selectAll(): void;\n        deselectAll(): void;\n        selectRows(ids: string[]): void;\n        isSelected(id: string): boolean;\n    };\n    loadMore(): Promise<void>;\n    refresh(): Promise<void>;\n}\n\n// ---------------------------------------------------------------------------\n// ListPresenter abstraction\n// ---------------------------------------------------------------------------\n\nexport interface IListPresenter<TRow> {\n    vm: IListViewModel<TRow>;\n    actions: IListActions;\n    init(config: IListPresenterConfig<TRow>): void;\n}\n\nexport const ListPresenter = createAbstraction<IListPresenter<any>>(\"ListPresenter\");\n\nexport namespace ListPresenter {\n    export type Interface<TRow = any> = IListPresenter<TRow>;\n    export type ViewModel<TRow = any> = IListViewModel<TRow>;\n    export type Actions = IListActions;\n    export type Config<TRow = any> = IListPresenterConfig<TRow>;\n    export type Error = IListError;\n    export type DataSource<TRow = any> = IDataSource<TRow>;\n    export type DataSourceQuery = IDataSourceQuery;\n    export type DataSourceResult<TRow = any> = IDataSourceResult<TRow>;\n}\n"],"names":["ListPresenter","createAbstraction"],"mappings":";AA0HO,MAAMA,gBAAgBC,kBAAuC"}
+{"version":3,"file":"presentation/listPresenter/abstractions.js","sources":["../../../src/presentation/listPresenter/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\n\n// ---------------------------------------------------------------------------\n// DataSource interfaces\n// ---------------------------------------------------------------------------\n\nexport interface IDataSourceQuery {\n    search?: string;\n    filters?: Record<string, unknown>;\n    sort?: { field: string; direction: \"ASC\" | \"DESC\" };\n    cursor?: string;\n    limit?: number;\n}\n\nexport interface IDataSourceMeta {\n    cursor: string | null;\n    hasMoreItems: boolean;\n    totalCount: number;\n}\n\nexport interface IDataSourceResult<TRow> {\n    rows: TRow[];\n    meta: IDataSourceMeta;\n}\n\nexport interface IDataSource<TRow> {\n    readonly rows: TRow[];\n    readonly meta: IDataSourceMeta;\n    readonly loading: boolean;\n    query(params: IDataSourceQuery): Promise<void>;\n    loadMore(params: IDataSourceQuery): Promise<void>;\n}\n\n// ---------------------------------------------------------------------------\n// ListPresenter config\n// ---------------------------------------------------------------------------\n\nexport interface IListPresenterConfig<TRow> {\n    dataSource: IDataSource<TRow>;\n    initialSort?: { field: string; direction: \"ASC\" | \"DESC\" };\n    initialFilters?: Record<string, unknown>;\n    initialSearch?: string;\n    debounceMs?: number;\n    limit?: number;\n    itemLabel?: { singular: string; plural: string };\n}\n\n// ---------------------------------------------------------------------------\n// ListError\n// ---------------------------------------------------------------------------\n\nexport interface IListError {\n    code: string;\n    message: string;\n    retryable: boolean;\n}\n\n// ---------------------------------------------------------------------------\n// ListViewModel\n// ---------------------------------------------------------------------------\n\nexport interface IListViewModel<TRow> {\n    rows: TRow[];\n    sort: { field: string; direction: \"ASC\" | \"DESC\" } | null;\n    filters: Record<string, unknown>;\n    search: string;\n    appliedQuery: IDataSourceQuery | null;\n    pagination: {\n        hasMore: boolean;\n        loading: boolean;\n        loadingMore: boolean;\n        totalCount: number;\n        currentCount: number;\n    };\n    selection: {\n        selectedIds: Set<string>;\n        selectedCount: number;\n        allSelected: boolean;\n        label: string;\n    };\n    showingFilters: boolean;\n    empty: boolean;\n    emptyWithFilters: boolean;\n    error: IListError | null;\n}\n\n// ---------------------------------------------------------------------------\n// ListActions\n// ---------------------------------------------------------------------------\n\nexport interface IListActions {\n    search: {\n        set(query: string): void;\n        clear(): void;\n    };\n    sort: {\n        set(field: string, direction: \"ASC\" | \"DESC\"): void;\n        toggle(field: string): void;\n    };\n    filter: {\n        set(key: string, value: unknown): void;\n        clear(key: string): void;\n        clearAll(): void;\n        show(): void;\n        hide(): void;\n    };\n    selection: {\n        toggle(id: string): void;\n        selectRangeTo(id: string): void;\n        selectAll(): void;\n        deselectAll(): void;\n        selectRows(ids: string[]): void;\n        isSelected(id: string): boolean;\n    };\n    loadMore(): Promise<void>;\n    refresh(): Promise<void>;\n}\n\n// ---------------------------------------------------------------------------\n// ListPresenter abstraction\n// ---------------------------------------------------------------------------\n\nexport interface IListPresenter<TRow> {\n    vm: IListViewModel<TRow>;\n    actions: IListActions;\n    init(config: IListPresenterConfig<TRow>): void;\n}\n\nexport const ListPresenter = createAbstraction<IListPresenter<any>>(\"ListPresenter\");\n\nexport namespace ListPresenter {\n    export type Interface<TRow = any> = IListPresenter<TRow>;\n    export type ViewModel<TRow = any> = IListViewModel<TRow>;\n    export type Actions = IListActions;\n    export type Config<TRow = any> = IListPresenterConfig<TRow>;\n    export type Error = IListError;\n    export type DataSource<TRow = any> = IDataSource<TRow>;\n    export type DataSourceQuery = IDataSourceQuery;\n    export type DataSourceResult<TRow = any> = IDataSourceResult<TRow>;\n}\n"],"names":["ListPresenter","createAbstraction"],"mappings":";AAgIO,MAAMA,gBAAgBC,kBAAuC"}

package/presentation/listPresenter/index.d.ts

@@ -1,3 +1,8 @@
 export { ListPresenterFeature } from "./feature.js";
 export { ListPresenter } from "./abstractions.js";
 export type { IListPresenter, IListPresenterConfig, IListViewModel, IListActions, IListError, IDataSource, IDataSourceQuery, IDataSourceResult } from "./abstractions.js";
+export { QueryMatcher } from "./QueryMatcher.js";
+export type { QueryMatcherConfig } from "./QueryMatcher.js";
+export { FolderAwareDataSource } from "./FolderAwareDataSource.js";
+export type { FolderAwareDataSourceConfig, FetchParams, FetchResult } from "./FolderAwareDataSource.js";
+export { SimpleDataSource } from "./SimpleDataSource.js";

package/presentation/listPresenter/index.js

@@ -1,2 +1,5 @@
 export { ListPresenterFeature } from "./feature.js";
 export { ListPresenter } from "./abstractions.js";
+export { QueryMatcher } from "./QueryMatcher.js";
+export { FolderAwareDataSource } from "./FolderAwareDataSource.js";
+export { SimpleDataSource } from "./SimpleDataSource.js";

package/presentation/security/components/HasPermission.d.ts

@@ -6,5 +6,5 @@ interface HasPermissionProps {
     children: React.ReactNode;
 }
 export declare const HasPermission: ({ children, ...props }: HasPermissionProps) => React.JSX.Element | null;
-export declare const HasPermissionComponent: ({ children, ...props }: HasPermissionProps) => React.JSX.Element | null;
+export declare const HasPermissionComponent: typeof HasPermission;
 export {};

package/presentation/sortable/SortablePresenter.d.ts

@@ -0,0 +1,23 @@
+import { SortablePresenter as Abstraction } from "./abstractions.js";
+declare class SortablePresenterImpl implements Abstraction.Interface {
+    private draggingIndex;
+    private overIndex;
+    private closestEdge;
+    private cleanups;
+    private config;
+    constructor();
+    init(config: Abstraction.Config): void;
+    getItemProps(index: number): Abstraction.ItemProps;
+    dispose(): void;
+    private get type();
+    private isOwnDrag;
+    private getVisibleEdge;
+    private clearDropState;
+    private computeDestination;
+    private registerDropTarget;
+    private registerDraggable;
+}
+export declare const SortablePresenter: typeof SortablePresenterImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ISortablePresenter>;
+};
+export {};