@webiny/app-admin 0.0.0-unstable.a4f3e4ea8b → 0.0.0-unstable.a85ef555b2

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/tenancy/TenancyProvider.js

@@ -1,15 +1,11 @@
 import react, { useEffect, useMemo } from "react";
 import { DiContainerProvider, useFeature } from "@webiny/app";
-import { plugins } from "@webiny/plugins";
-import { TenantHeaderLinkPlugin } from "@webiny/app/plugins/TenantHeaderLinkPlugin.js";
 import { TenancyFeature } from "../../features/tenancy/feature.js";
 const TenancyProvider = (props)=>{
     const { service, createTenantContainer } = useFeature(TenancyFeature);
     const tenantId = useMemo(()=>new URLSearchParams(window.location.search).get("tenantId"), []);
     useEffect(()=>{
         if (tenantId) service.setTenant(tenantId);
-        const currentTenant = service.getCurrentTenant();
-        if (currentTenant) plugins.register(new TenantHeaderLinkPlugin(currentTenant));
     }, [
         tenantId
     ]);

package/presentation/tenancy/TenancyProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/tenancy/TenancyProvider.js","sources":["../../../src/presentation/tenancy/TenancyProvider.tsx"],"sourcesContent":["import React, { useMemo, useEffect } from \"react\";\nimport { DiContainerProvider, useFeature } from \"@webiny/app\";\nimport { plugins } from \"@webiny/plugins\";\nimport { TenantHeaderLinkPlugin } from \"@webiny/app/plugins/TenantHeaderLinkPlugin.js\";\nimport { TenancyFeature } from \"~/features/tenancy/feature.js\";\n\ninterface TenancyProviderProps {\n    children: React.ReactNode;\n}\n\nexport const TenancyProvider = (props: TenancyProviderProps) => {\n    const { service, createTenantContainer } = useFeature(TenancyFeature);\n\n    const tenantId = useMemo(() => {\n        return new URLSearchParams(window.location.search).get(\"tenantId\");\n    }, []);\n\n    // Handle query string on mount\n    useEffect(() => {\n        if (tenantId) {\n            service.setTenant(tenantId);\n        }\n\n        // Register plugin for current tenant\n        const currentTenant = service.getCurrentTenant();\n        if (currentTenant) {\n            // TODO: remove this once we can decorate the GQL client!\n            plugins.register(new TenantHeaderLinkPlugin(currentTenant));\n        }\n    }, [tenantId]);\n\n    // Handle tenant changes (redirect on change)\n    useEffect(() => {\n        return service.onTenantChange(() => {\n            window.location.replace(window.location.origin);\n        });\n    }, [service]);\n\n    const tenantContainer = useMemo(() => {\n        return createTenantContainer();\n    }, [service.getCurrentTenant()]);\n\n    return <DiContainerProvider container={tenantContainer}>{props.children}</DiContainerProvider>;\n};\n"],"names":["TenancyProvider","props","service","createTenantContainer","useFeature","TenancyFeature","tenantId","useMemo","URLSearchParams","window","useEffect","currentTenant","plugins","TenantHeaderLinkPlugin","tenantContainer","DiContainerProvider"],"mappings":";;;;;AAUO,MAAMA,kBAAkB,CAACC;IAC5B,MAAM,EAAEC,OAAO,EAAEC,qBAAqB,EAAE,GAAGC,WAAWC;IAEtD,MAAMC,WAAWC,QAAQ,IACd,IAAIC,gBAAgBC,OAAO,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,aACxD,EAAE;IAGLC,UAAU;QACN,IAAIJ,UACAJ,QAAQ,SAAS,CAACI;QAItB,MAAMK,gBAAgBT,QAAQ,gBAAgB;QAC9C,IAAIS,eAEAC,QAAQ,QAAQ,CAAC,IAAIC,uBAAuBF;IAEpD,GAAG;QAACL;KAAS;IAGbI,UAAU,IACCR,QAAQ,cAAc,CAAC;YAC1BO,OAAO,QAAQ,CAAC,OAAO,CAACA,OAAO,QAAQ,CAAC,MAAM;QAClD,IACD;QAACP;KAAQ;IAEZ,MAAMY,kBAAkBP,QAAQ,IACrBJ,yBACR;QAACD,QAAQ,gBAAgB;KAAG;IAE/B,OAAO,WAAP,GAAO,oBAACa,qBAAmBA;QAAC,WAAWD;OAAkBb,MAAM,QAAQ;AAC3E"}
+{"version":3,"file":"presentation/tenancy/TenancyProvider.js","sources":["../../../src/presentation/tenancy/TenancyProvider.tsx"],"sourcesContent":["import React, { useMemo, useEffect } from \"react\";\nimport { DiContainerProvider, useFeature } from \"@webiny/app\";\nimport { TenancyFeature } from \"~/features/tenancy/feature.js\";\n\ninterface TenancyProviderProps {\n    children: React.ReactNode;\n}\n\nexport const TenancyProvider = (props: TenancyProviderProps) => {\n    const { service, createTenantContainer } = useFeature(TenancyFeature);\n\n    const tenantId = useMemo(() => {\n        return new URLSearchParams(window.location.search).get(\"tenantId\");\n    }, []);\n\n    useEffect(() => {\n        if (tenantId) {\n            service.setTenant(tenantId);\n        }\n    }, [tenantId]);\n\n    // Handle tenant changes (redirect on change)\n    useEffect(() => {\n        return service.onTenantChange(() => {\n            window.location.replace(window.location.origin);\n        });\n    }, [service]);\n\n    const tenantContainer = useMemo(() => {\n        return createTenantContainer();\n    }, [service.getCurrentTenant()]);\n\n    return <DiContainerProvider container={tenantContainer}>{props.children}</DiContainerProvider>;\n};\n"],"names":["TenancyProvider","props","service","createTenantContainer","useFeature","TenancyFeature","tenantId","useMemo","URLSearchParams","window","useEffect","tenantContainer","DiContainerProvider"],"mappings":";;;AAQO,MAAMA,kBAAkB,CAACC;IAC5B,MAAM,EAAEC,OAAO,EAAEC,qBAAqB,EAAE,GAAGC,WAAWC;IAEtD,MAAMC,WAAWC,QAAQ,IACd,IAAIC,gBAAgBC,OAAO,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,aACxD,EAAE;IAELC,UAAU;QACN,IAAIJ,UACAJ,QAAQ,SAAS,CAACI;IAE1B,GAAG;QAACA;KAAS;IAGbI,UAAU,IACCR,QAAQ,cAAc,CAAC;YAC1BO,OAAO,QAAQ,CAAC,OAAO,CAACA,OAAO,QAAQ,CAAC,MAAM;QAClD,IACD;QAACP;KAAQ;IAEZ,MAAMS,kBAAkBJ,QAAQ,IACrBJ,yBACR;QAACD,QAAQ,gBAAgB;KAAG;IAE/B,OAAO,WAAP,GAAO,oBAACU,qBAAmBA;QAAC,WAAWD;OAAkBV,MAAM,QAAQ;AAC3E"}

package/presentation/trashBin/TrashBinPresenter.js

@@ -42,8 +42,10 @@ class TrashBinPresenterImpl {
                 if (this._dataSource) this._dataSource.removeItem(id);
             },
             deleteItem: async (id)=>{
-                await this.deleteGateway.execute(id);
+                const deleted = await this.deleteGateway.execute(id);
+                if (false === deleted) return false;
                 if (this._dataSource) this._dataSource.removeItem(id);
+                return true;
             },
             bulkRestore: async (params)=>{
                 const selectedIds = Array.from(this.listPresenter.vm.selection.selectedIds);

package/presentation/trashBin/TrashBinPresenter.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/trashBin/TrashBinPresenter.js","sources":["../../../src/presentation/trashBin/TrashBinPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable } from \"mobx\";\nimport { ListPresenter } from \"~/presentation/listPresenter/abstractions.js\";\nimport {\n    TrashBinPresenter as Abstraction,\n    TrashBinListGateway,\n    TrashBinDeleteGateway,\n    TrashBinRestoreGateway,\n    TrashBinBulkActionGateway,\n    type ITrashBinPresenter,\n    type ITrashBinPresenterConfig,\n    type ITrashBinViewModel,\n    type ITrashBinActions,\n    type TrashBinItem\n} from \"./abstractions.js\";\nimport { TrashBinDataSource } from \"./TrashBinDataSource.js\";\n\nclass TrashBinPresenterImpl implements ITrashBinPresenter {\n    private _nameColumnId = \"id\";\n    private _dataSource: TrashBinDataSource | null = null;\n\n    constructor(\n        private listPresenter: ListPresenter.Interface<TrashBinItem>,\n        private listGateway: TrashBinListGateway.Interface,\n        private deleteGateway: TrashBinDeleteGateway.Interface,\n        private restoreGateway: TrashBinRestoreGateway.Interface,\n        private bulkActionGateway: TrashBinBulkActionGateway.Interface\n    ) {\n        makeAutoObservable<\n            TrashBinPresenterImpl,\n            \"listGateway\" | \"deleteGateway\" | \"restoreGateway\" | \"bulkActionGateway\"\n        >(this, {\n            listGateway: false,\n            deleteGateway: false,\n            restoreGateway: false,\n            bulkActionGateway: false,\n            vm: computed\n        });\n    }\n\n    get vm(): ITrashBinViewModel {\n        return {\n            list: this.listPresenter.vm,\n            nameColumnId: this._nameColumnId\n        };\n    }\n\n    actions: ITrashBinActions = {\n        search: {\n            set: (query: string) => this.listPresenter.actions.search.set(query),\n            clear: () => this.listPresenter.actions.search.clear()\n        },\n        sort: {\n            set: (field: string, direction: \"ASC\" | \"DESC\") =>\n                this.listPresenter.actions.sort.set(field, direction),\n            toggle: (field: string) => this.listPresenter.actions.sort.toggle(field)\n        },\n        filter: {\n            set: (key: string, value: unknown) => this.listPresenter.actions.filter.set(key, value),\n            clear: (key: string) => this.listPresenter.actions.filter.clear(key),\n            clearAll: () => this.listPresenter.actions.filter.clearAll(),\n            show: () => this.listPresenter.actions.filter.show(),\n            hide: () => this.listPresenter.actions.filter.hide()\n        },\n        selection: {\n            toggle: (id: string) => this.listPresenter.actions.selection.toggle(id),\n            selectRangeTo: (id: string) => this.listPresenter.actions.selection.selectRangeTo(id),\n            selectAll: () => this.listPresenter.actions.selection.selectAll(),\n            deselectAll: () => this.listPresenter.actions.selection.deselectAll(),\n            selectRows: (ids: string[]) => this.listPresenter.actions.selection.selectRows(ids),\n            isSelected: (id: string) => this.listPresenter.actions.selection.isSelected(id)\n        },\n        loadMore: () => this.listPresenter.actions.loadMore(),\n        refresh: () => this.listPresenter.actions.refresh(),\n\n        restoreItem: async (id: string) => {\n            await this.restoreGateway.execute(id);\n            if (this._dataSource) {\n                this._dataSource.removeItem(id);\n            }\n        },\n\n        deleteItem: async (id: string) => {\n            await this.deleteGateway.execute(id);\n            if (this._dataSource) {\n                this._dataSource.removeItem(id);\n            }\n        },\n\n        bulkRestore: async (params?) => {\n            const selectedIds = Array.from(this.listPresenter.vm.selection.selectedIds);\n            await this.bulkActionGateway.execute({\n                action: \"Restore\",\n                where: params?.where ?? { id_in: selectedIds },\n                search: params?.search\n            });\n            this.listPresenter.actions.selection.deselectAll();\n            await this.listPresenter.actions.refresh();\n        },\n\n        bulkDelete: async (params?) => {\n            const selectedIds = Array.from(this.listPresenter.vm.selection.selectedIds);\n            await this.bulkActionGateway.execute({\n                action: \"Delete\",\n                where: params?.where ?? { id_in: selectedIds },\n                search: params?.search\n            });\n            this.listPresenter.actions.selection.deselectAll();\n            await this.listPresenter.actions.refresh();\n        }\n    };\n\n    init(config: ITrashBinPresenterConfig): void {\n        this._nameColumnId = config.nameColumnId;\n\n        this._dataSource = new TrashBinDataSource(this.listGateway);\n\n        this.listPresenter.init({\n            dataSource: this._dataSource,\n            initialSort: config.initialSort ?? { field: \"deletedOn\", direction: \"DESC\" }\n        });\n    }\n\n    dispose(): void {\n        this._dataSource = null;\n    }\n}\n\nexport const TrashBinPresenter = Abstraction.createImplementation({\n    implementation: TrashBinPresenterImpl,\n    dependencies: [\n        ListPresenter,\n        TrashBinListGateway,\n        TrashBinDeleteGateway,\n        TrashBinRestoreGateway,\n        TrashBinBulkActionGateway\n    ]\n});\n"],"names":["TrashBinPresenterImpl","listPresenter","listGateway","deleteGateway","restoreGateway","bulkActionGateway","query","field","direction","key","value","id","ids","params","selectedIds","Array","makeAutoObservable","computed","config","TrashBinDataSource","TrashBinPresenter","Abstraction","ListPresenter","TrashBinListGateway","TrashBinDeleteGateway","TrashBinRestoreGateway","TrashBinBulkActionGateway"],"mappings":"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"}
+{"version":3,"file":"presentation/trashBin/TrashBinPresenter.js","sources":["../../../src/presentation/trashBin/TrashBinPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable } from \"mobx\";\nimport { ListPresenter } from \"~/presentation/listPresenter/abstractions.js\";\nimport {\n    TrashBinPresenter as Abstraction,\n    TrashBinListGateway,\n    TrashBinDeleteGateway,\n    TrashBinRestoreGateway,\n    TrashBinBulkActionGateway,\n    type ITrashBinPresenter,\n    type ITrashBinPresenterConfig,\n    type ITrashBinViewModel,\n    type ITrashBinActions,\n    type TrashBinItem\n} from \"./abstractions.js\";\nimport { TrashBinDataSource } from \"./TrashBinDataSource.js\";\n\nclass TrashBinPresenterImpl implements ITrashBinPresenter {\n    private _nameColumnId = \"id\";\n    private _dataSource: TrashBinDataSource | null = null;\n\n    constructor(\n        private listPresenter: ListPresenter.Interface<TrashBinItem>,\n        private listGateway: TrashBinListGateway.Interface,\n        private deleteGateway: TrashBinDeleteGateway.Interface,\n        private restoreGateway: TrashBinRestoreGateway.Interface,\n        private bulkActionGateway: TrashBinBulkActionGateway.Interface\n    ) {\n        makeAutoObservable<\n            TrashBinPresenterImpl,\n            \"listGateway\" | \"deleteGateway\" | \"restoreGateway\" | \"bulkActionGateway\"\n        >(this, {\n            listGateway: false,\n            deleteGateway: false,\n            restoreGateway: false,\n            bulkActionGateway: false,\n            vm: computed\n        });\n    }\n\n    get vm(): ITrashBinViewModel {\n        return {\n            list: this.listPresenter.vm,\n            nameColumnId: this._nameColumnId\n        };\n    }\n\n    actions: ITrashBinActions = {\n        search: {\n            set: (query: string) => this.listPresenter.actions.search.set(query),\n            clear: () => this.listPresenter.actions.search.clear()\n        },\n        sort: {\n            set: (field: string, direction: \"ASC\" | \"DESC\") =>\n                this.listPresenter.actions.sort.set(field, direction),\n            toggle: (field: string) => this.listPresenter.actions.sort.toggle(field)\n        },\n        filter: {\n            set: (key: string, value: unknown) => this.listPresenter.actions.filter.set(key, value),\n            clear: (key: string) => this.listPresenter.actions.filter.clear(key),\n            clearAll: () => this.listPresenter.actions.filter.clearAll(),\n            show: () => this.listPresenter.actions.filter.show(),\n            hide: () => this.listPresenter.actions.filter.hide()\n        },\n        selection: {\n            toggle: (id: string) => this.listPresenter.actions.selection.toggle(id),\n            selectRangeTo: (id: string) => this.listPresenter.actions.selection.selectRangeTo(id),\n            selectAll: () => this.listPresenter.actions.selection.selectAll(),\n            deselectAll: () => this.listPresenter.actions.selection.deselectAll(),\n            selectRows: (ids: string[]) => this.listPresenter.actions.selection.selectRows(ids),\n            isSelected: (id: string) => this.listPresenter.actions.selection.isSelected(id)\n        },\n        loadMore: () => this.listPresenter.actions.loadMore(),\n        refresh: () => this.listPresenter.actions.refresh(),\n\n        restoreItem: async (id: string) => {\n            await this.restoreGateway.execute(id);\n            if (this._dataSource) {\n                this._dataSource.removeItem(id);\n            }\n        },\n\n        deleteItem: async (id: string) => {\n            const deleted = await this.deleteGateway.execute(id);\n            if (deleted === false) {\n                return false;\n            }\n\n            if (this._dataSource) {\n                this._dataSource.removeItem(id);\n            }\n\n            return true;\n        },\n\n        bulkRestore: async (params?) => {\n            const selectedIds = Array.from(this.listPresenter.vm.selection.selectedIds);\n            await this.bulkActionGateway.execute({\n                action: \"Restore\",\n                where: params?.where ?? { id_in: selectedIds },\n                search: params?.search\n            });\n            this.listPresenter.actions.selection.deselectAll();\n            await this.listPresenter.actions.refresh();\n        },\n\n        bulkDelete: async (params?) => {\n            const selectedIds = Array.from(this.listPresenter.vm.selection.selectedIds);\n            await this.bulkActionGateway.execute({\n                action: \"Delete\",\n                where: params?.where ?? { id_in: selectedIds },\n                search: params?.search\n            });\n            this.listPresenter.actions.selection.deselectAll();\n            await this.listPresenter.actions.refresh();\n        }\n    };\n\n    init(config: ITrashBinPresenterConfig): void {\n        this._nameColumnId = config.nameColumnId;\n\n        this._dataSource = new TrashBinDataSource(this.listGateway);\n\n        this.listPresenter.init({\n            dataSource: this._dataSource,\n            initialSort: config.initialSort ?? { field: \"deletedOn\", direction: \"DESC\" }\n        });\n    }\n\n    dispose(): void {\n        this._dataSource = null;\n    }\n}\n\nexport const TrashBinPresenter = Abstraction.createImplementation({\n    implementation: TrashBinPresenterImpl,\n    dependencies: [\n        ListPresenter,\n        TrashBinListGateway,\n        TrashBinDeleteGateway,\n        TrashBinRestoreGateway,\n        TrashBinBulkActionGateway\n    ]\n});\n"],"names":["TrashBinPresenterImpl","listPresenter","listGateway","deleteGateway","restoreGateway","bulkActionGateway","query","field","direction","key","value","id","ids","deleted","params","selectedIds","Array","makeAutoObservable","computed","config","TrashBinDataSource","TrashBinPresenter","Abstraction","ListPresenter","TrashBinListGateway","TrashBinDeleteGateway","TrashBinRestoreGateway","TrashBinBulkActionGateway"],"mappings":"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"}

package/presentation/trashBin/TrashBinPresenter.test.d.ts

@@ -0,0 +1 @@
+export {};

package/presentation/trashBin/TrashBinPresenter.test.js

@@ -0,0 +1,91 @@
+import { describe, expect, it, vi } from "vitest";
+import { Container } from "@webiny/di";
+import { ListPresenter } from "../listPresenter/abstractions.js";
+import { TrashBinBulkActionGateway, TrashBinDeleteGateway, TrashBinListGateway, TrashBinPresenter, TrashBinRestoreGateway } from "./abstractions.js";
+import { TrashBinPresenter as external_TrashBinPresenter_js_TrashBinPresenter } from "./TrashBinPresenter.js";
+function item(id) {
+    return {
+        id,
+        title: `Item ${id}`,
+        location: {
+            folderId: void 0
+        },
+        createdBy: {
+            id: "u1",
+            displayName: "User",
+            type: "admin"
+        },
+        deletedBy: {
+            id: "u1",
+            displayName: "User",
+            type: "admin"
+        },
+        deletedOn: "2026-10-16T10:00:00.000Z"
+    };
+}
+async function setup(deleteResult) {
+    const container = new Container();
+    const listPresenter = {
+        init: vi.fn((_config)=>void 0),
+        vm: {},
+        actions: {}
+    };
+    const deleteGateway = {
+        execute: vi.fn(async (_id)=>deleteResult)
+    };
+    container.registerInstance(ListPresenter, listPresenter);
+    container.registerInstance(TrashBinListGateway, {
+        execute: vi.fn(async ()=>({
+                data: [
+                    item("a"),
+                    item("b")
+                ],
+                meta: {
+                    cursor: null,
+                    hasMoreItems: false,
+                    totalCount: 2
+                }
+            }))
+    });
+    container.registerInstance(TrashBinDeleteGateway, deleteGateway);
+    container.registerInstance(TrashBinRestoreGateway, {
+        execute: vi.fn()
+    });
+    container.registerInstance(TrashBinBulkActionGateway, {
+        execute: vi.fn()
+    });
+    container.register(external_TrashBinPresenter_js_TrashBinPresenter).inSingletonScope();
+    const presenter = container.resolve(TrashBinPresenter);
+    presenter.init({
+        nameColumnId: "title"
+    });
+    const dataSource = listPresenter.init.mock.calls[0][0].dataSource;
+    await dataSource.query({});
+    return {
+        presenter,
+        deleteGateway,
+        dataSource
+    };
+}
+describe("TrashBinPresenter.deleteItem", ()=>{
+    it("removes the row and returns true when the gateway deleted the item", async ()=>{
+        const { presenter, deleteGateway, dataSource } = await setup(true);
+        const result = await presenter.actions.deleteItem("a");
+        expect(result).toBe(true);
+        expect(deleteGateway.execute).toHaveBeenCalledWith("a");
+        expect(dataSource.rows.map((row)=>row.id)).toEqual([
+            "b"
+        ]);
+    });
+    it("keeps the row and returns false when the gateway returned false", async ()=>{
+        const { presenter, dataSource } = await setup(false);
+        const result = await presenter.actions.deleteItem("a");
+        expect(result).toBe(false);
+        expect(dataSource.rows.map((row)=>row.id)).toEqual([
+            "a",
+            "b"
+        ]);
+    });
+});
+
+//# sourceMappingURL=TrashBinPresenter.test.js.map

package/presentation/trashBin/TrashBinPresenter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"presentation/trashBin/TrashBinPresenter.test.js","sources":["../../../src/presentation/trashBin/TrashBinPresenter.test.ts"],"sourcesContent":["import { describe } from \"vitest\";\nimport { expect } from \"vitest\";\nimport { it } from \"vitest\";\nimport { vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { ListPresenter } from \"~/presentation/listPresenter/abstractions.js\";\nimport type { IDataSource } from \"~/presentation/listPresenter/abstractions.js\";\nimport { TrashBinBulkActionGateway } from \"./abstractions.js\";\nimport { TrashBinDeleteGateway } from \"./abstractions.js\";\nimport { TrashBinListGateway } from \"./abstractions.js\";\nimport { TrashBinPresenter as Abstraction } from \"./abstractions.js\";\nimport { TrashBinRestoreGateway } from \"./abstractions.js\";\nimport type { TrashBinItem } from \"./abstractions.js\";\nimport { TrashBinPresenter } from \"./TrashBinPresenter.js\";\n\nfunction item(id: string): TrashBinItem {\n    return {\n        id,\n        title: `Item ${id}`,\n        location: { folderId: undefined },\n        createdBy: { id: \"u1\", displayName: \"User\", type: \"admin\" },\n        deletedBy: { id: \"u1\", displayName: \"User\", type: \"admin\" },\n        deletedOn: \"2026-10-16T10:00:00.000Z\"\n    } as unknown as TrashBinItem;\n}\n\nasync function setup(deleteResult: boolean) {\n    const container = new Container();\n    const listPresenter = {\n        init: vi.fn((_config: { dataSource: IDataSource<TrashBinItem> }) => undefined),\n        vm: {},\n        actions: {}\n    };\n    const deleteGateway = { execute: vi.fn(async (_id: string) => deleteResult) };\n\n    container.registerInstance(ListPresenter, listPresenter as unknown as ListPresenter.Interface);\n    container.registerInstance(TrashBinListGateway, {\n        execute: vi.fn(async () => ({\n            data: [item(\"a\"), item(\"b\")],\n            meta: { cursor: null, hasMoreItems: false, totalCount: 2 }\n        }))\n    });\n    container.registerInstance(TrashBinDeleteGateway, deleteGateway);\n    container.registerInstance(TrashBinRestoreGateway, { execute: vi.fn() });\n    container.registerInstance(TrashBinBulkActionGateway, { execute: vi.fn() });\n    container.register(TrashBinPresenter).inSingletonScope();\n\n    const presenter = container.resolve(Abstraction);\n    presenter.init({ nameColumnId: \"title\" });\n    const dataSource = listPresenter.init.mock.calls[0][0].dataSource;\n    await dataSource.query({});\n\n    return { presenter, deleteGateway, dataSource };\n}\n\ndescribe(\"TrashBinPresenter.deleteItem\", () => {\n    it(\"removes the row and returns true when the gateway deleted the item\", async () => {\n        const { presenter, deleteGateway, dataSource } = await setup(true);\n\n        const result = await presenter.actions.deleteItem(\"a\");\n\n        expect(result).toBe(true);\n        expect(deleteGateway.execute).toHaveBeenCalledWith(\"a\");\n        expect(dataSource.rows.map(row => row.id)).toEqual([\"b\"]);\n    });\n\n    it(\"keeps the row and returns false when the gateway returned false\", async () => {\n        const { presenter, dataSource } = await setup(false);\n\n        const result = await presenter.actions.deleteItem(\"a\");\n\n        expect(result).toBe(false);\n        expect(dataSource.rows.map(row => row.id)).toEqual([\"a\", \"b\"]);\n    });\n});\n"],"names":["item","id","undefined","setup","deleteResult","container","Container","listPresenter","vi","_config","deleteGateway","_id","ListPresenter","TrashBinListGateway","TrashBinDeleteGateway","TrashBinRestoreGateway","TrashBinBulkActionGateway","TrashBinPresenter","presenter","Abstraction","dataSource","describe","it","result","expect","row"],"mappings":";;;;;AAeA,SAASA,KAAKC,EAAU;IACpB,OAAO;QACHA;QACA,OAAO,CAAC,KAAK,EAAEA,IAAI;QACnB,UAAU;YAAE,UAAUC;QAAU;QAChC,WAAW;YAAE,IAAI;YAAM,aAAa;YAAQ,MAAM;QAAQ;QAC1D,WAAW;YAAE,IAAI;YAAM,aAAa;YAAQ,MAAM;QAAQ;QAC1D,WAAW;IACf;AACJ;AAEA,eAAeC,MAAMC,YAAqB;IACtC,MAAMC,YAAY,IAAIC;IACtB,MAAMC,gBAAgB;QAClB,MAAMC,GAAG,EAAE,CAAC,CAACC,UAAuDP;QACpE,IAAI,CAAC;QACL,SAAS,CAAC;IACd;IACA,MAAMQ,gBAAgB;QAAE,SAASF,GAAG,EAAE,CAAC,OAAOG,MAAgBP;IAAc;IAE5EC,UAAU,gBAAgB,CAACO,eAAeL;IAC1CF,UAAU,gBAAgB,CAACQ,qBAAqB;QAC5C,SAASL,GAAG,EAAE,CAAC,UAAa;gBACxB,MAAM;oBAACR,KAAK;oBAAMA,KAAK;iBAAK;gBAC5B,MAAM;oBAAE,QAAQ;oBAAM,cAAc;oBAAO,YAAY;gBAAE;YAC7D;IACJ;IACAK,UAAU,gBAAgB,CAACS,uBAAuBJ;IAClDL,UAAU,gBAAgB,CAACU,wBAAwB;QAAE,SAASP,GAAG,EAAE;IAAG;IACtEH,UAAU,gBAAgB,CAACW,2BAA2B;QAAE,SAASR,GAAG,EAAE;IAAG;IACzEH,UAAU,QAAQ,CAACY,iDAAmB,gBAAgB;IAEtD,MAAMC,YAAYb,UAAU,OAAO,CAACc;IACpCD,UAAU,IAAI,CAAC;QAAE,cAAc;IAAQ;IACvC,MAAME,aAAab,cAAc,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU;IACjE,MAAMa,WAAW,KAAK,CAAC,CAAC;IAExB,OAAO;QAAEF;QAAWR;QAAeU;IAAW;AAClD;AAEAC,SAAS,gCAAgC;IACrCC,GAAG,sEAAsE;QACrE,MAAM,EAAEJ,SAAS,EAAER,aAAa,EAAEU,UAAU,EAAE,GAAG,MAAMjB,MAAM;QAE7D,MAAMoB,SAAS,MAAML,UAAU,OAAO,CAAC,UAAU,CAAC;QAElDM,OAAOD,QAAQ,IAAI,CAAC;QACpBC,OAAOd,cAAc,OAAO,EAAE,oBAAoB,CAAC;QACnDc,OAAOJ,WAAW,IAAI,CAAC,GAAG,CAACK,CAAAA,MAAOA,IAAI,EAAE,GAAG,OAAO,CAAC;YAAC;SAAI;IAC5D;IAEAH,GAAG,mEAAmE;QAClE,MAAM,EAAEJ,SAAS,EAAEE,UAAU,EAAE,GAAG,MAAMjB,MAAM;QAE9C,MAAMoB,SAAS,MAAML,UAAU,OAAO,CAAC,UAAU,CAAC;QAElDM,OAAOD,QAAQ,IAAI,CAAC;QACpBC,OAAOJ,WAAW,IAAI,CAAC,GAAG,CAACK,CAAAA,MAAOA,IAAI,EAAE,GAAG,OAAO,CAAC;YAAC;YAAK;SAAI;IACjE;AACJ"}

package/presentation/trashBin/abstractions.d.ts

@@ -80,7 +80,7 @@ export interface ITrashBinViewModel {
 }
 export interface ITrashBinActions extends IListActions {
     restoreItem(id: string): Promise<void>;
-    deleteItem(id: string): Promise<void>;
+    deleteItem(id: string): Promise<boolean>;
     bulkRestore(params?: {
         where?: Record<string, unknown>;
         search?: string;

package/presentation/trashBin/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/trashBin/abstractions.js","sources":["../../../src/presentation/trashBin/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type {\n    IListViewModel,\n    IListActions,\n    IDataSourceMeta\n} from \"~/presentation/listPresenter/abstractions.js\";\n\n// ---------------------------------------------------------------------------\n// TrashBinItem — universal row type\n// ---------------------------------------------------------------------------\n\nexport interface TrashBinIdentity {\n    id: string;\n    displayName: string;\n    type: string;\n}\n\nexport interface TrashBinLocation {\n    folderId: string | undefined;\n}\n\nexport interface TrashBinItem {\n    id: string;\n    title: string;\n    location: TrashBinLocation;\n    createdBy: TrashBinIdentity;\n    deletedBy: TrashBinIdentity;\n    deletedOn: string;\n    [key: string]: any;\n}\n\n// ---------------------------------------------------------------------------\n// Gateway abstractions\n// ---------------------------------------------------------------------------\n\nexport interface ITrashBinListGatewayParams {\n    where?: Record<string, unknown>;\n    sort?: string[];\n    limit?: number;\n    after?: string;\n    search?: string;\n}\n\nexport interface ITrashBinListGatewayResult {\n    data: TrashBinItem[];\n    meta: IDataSourceMeta;\n}\n\nexport interface ITrashBinListGateway {\n    execute(params: ITrashBinListGatewayParams): Promise<ITrashBinListGatewayResult>;\n}\n\nexport const TrashBinListGateway = createAbstraction<ITrashBinListGateway>(\"TrashBinListGateway\");\n\nexport namespace TrashBinListGateway {\n    export type Interface = ITrashBinListGateway;\n    export type Params = ITrashBinListGatewayParams;\n    export type Result = ITrashBinListGatewayResult;\n}\n\nexport interface ITrashBinDeleteGateway {\n    execute(id: string): Promise<boolean>;\n}\n\nexport const TrashBinDeleteGateway =\n    createAbstraction<ITrashBinDeleteGateway>(\"TrashBinDeleteGateway\");\n\nexport namespace TrashBinDeleteGateway {\n    export type Interface = ITrashBinDeleteGateway;\n}\n\nexport interface ITrashBinRestoreGateway {\n    execute(id: string): Promise<TrashBinItem>;\n}\n\nexport const TrashBinRestoreGateway =\n    createAbstraction<ITrashBinRestoreGateway>(\"TrashBinRestoreGateway\");\n\nexport namespace TrashBinRestoreGateway {\n    export type Interface = ITrashBinRestoreGateway;\n}\n\nexport interface ITrashBinBulkActionParams {\n    action: string;\n    where?: Record<string, unknown>;\n    search?: string;\n}\n\nexport interface ITrashBinBulkActionResult {\n    id: string;\n}\n\nexport interface ITrashBinBulkActionGateway {\n    execute(params: ITrashBinBulkActionParams): Promise<ITrashBinBulkActionResult>;\n}\n\nexport const TrashBinBulkActionGateway = createAbstraction<ITrashBinBulkActionGateway>(\n    \"TrashBinBulkActionGateway\"\n);\n\nexport namespace TrashBinBulkActionGateway {\n    export type Interface = ITrashBinBulkActionGateway;\n    export type Params = ITrashBinBulkActionParams;\n    export type Result = ITrashBinBulkActionResult;\n}\n\n// ---------------------------------------------------------------------------\n// Presenter abstraction\n// ---------------------------------------------------------------------------\n\nexport interface ITrashBinPresenterConfig {\n    nameColumnId: string;\n    initialSort?: { field: string; direction: \"ASC\" | \"DESC\" };\n}\n\nexport interface ITrashBinViewModel {\n    list: IListViewModel<TrashBinItem>;\n    nameColumnId: string;\n}\n\nexport interface ITrashBinActions extends IListActions {\n    restoreItem(id: string): Promise<void>;\n    deleteItem(id: string): Promise<void>;\n    bulkRestore(params?: { where?: Record<string, unknown>; search?: string }): Promise<void>;\n    bulkDelete(params?: { where?: Record<string, unknown>; search?: string }): Promise<void>;\n}\n\nexport interface ITrashBinPresenter {\n    vm: ITrashBinViewModel;\n    actions: ITrashBinActions;\n    init(config: ITrashBinPresenterConfig): void;\n    dispose(): void;\n}\n\nexport const TrashBinPresenter = createAbstraction<ITrashBinPresenter>(\"TrashBinPresenter\");\n\nexport namespace TrashBinPresenter {\n    export type Interface = ITrashBinPresenter;\n    export type ViewModel = ITrashBinViewModel;\n    export type Actions = ITrashBinActions;\n    export type Config = ITrashBinPresenterConfig;\n}\n"],"names":["TrashBinListGateway","createAbstraction","TrashBinDeleteGateway","TrashBinRestoreGateway","TrashBinBulkActionGateway","TrashBinPresenter"],"mappings":";AAoDO,MAAMA,sBAAsBC,kBAAwC;AAYpE,MAAMC,wBACTD,kBAA0C;AAUvC,MAAME,yBACTF,kBAA2C;AAoBxC,MAAMG,4BAA4BH,kBACrC;AAqCG,MAAMI,oBAAoBJ,kBAAsC"}
+{"version":3,"file":"presentation/trashBin/abstractions.js","sources":["../../../src/presentation/trashBin/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type {\n    IListViewModel,\n    IListActions,\n    IDataSourceMeta\n} from \"~/presentation/listPresenter/abstractions.js\";\n\n// ---------------------------------------------------------------------------\n// TrashBinItem — universal row type\n// ---------------------------------------------------------------------------\n\nexport interface TrashBinIdentity {\n    id: string;\n    displayName: string;\n    type: string;\n}\n\nexport interface TrashBinLocation {\n    folderId: string | undefined;\n}\n\nexport interface TrashBinItem {\n    id: string;\n    title: string;\n    location: TrashBinLocation;\n    createdBy: TrashBinIdentity;\n    deletedBy: TrashBinIdentity;\n    deletedOn: string;\n    [key: string]: any;\n}\n\n// ---------------------------------------------------------------------------\n// Gateway abstractions\n// ---------------------------------------------------------------------------\n\nexport interface ITrashBinListGatewayParams {\n    where?: Record<string, unknown>;\n    sort?: string[];\n    limit?: number;\n    after?: string;\n    search?: string;\n}\n\nexport interface ITrashBinListGatewayResult {\n    data: TrashBinItem[];\n    meta: IDataSourceMeta;\n}\n\nexport interface ITrashBinListGateway {\n    execute(params: ITrashBinListGatewayParams): Promise<ITrashBinListGatewayResult>;\n}\n\nexport const TrashBinListGateway = createAbstraction<ITrashBinListGateway>(\"TrashBinListGateway\");\n\nexport namespace TrashBinListGateway {\n    export type Interface = ITrashBinListGateway;\n    export type Params = ITrashBinListGatewayParams;\n    export type Result = ITrashBinListGatewayResult;\n}\n\nexport interface ITrashBinDeleteGateway {\n    execute(id: string): Promise<boolean>;\n}\n\nexport const TrashBinDeleteGateway =\n    createAbstraction<ITrashBinDeleteGateway>(\"TrashBinDeleteGateway\");\n\nexport namespace TrashBinDeleteGateway {\n    export type Interface = ITrashBinDeleteGateway;\n}\n\nexport interface ITrashBinRestoreGateway {\n    execute(id: string): Promise<TrashBinItem>;\n}\n\nexport const TrashBinRestoreGateway =\n    createAbstraction<ITrashBinRestoreGateway>(\"TrashBinRestoreGateway\");\n\nexport namespace TrashBinRestoreGateway {\n    export type Interface = ITrashBinRestoreGateway;\n}\n\nexport interface ITrashBinBulkActionParams {\n    action: string;\n    where?: Record<string, unknown>;\n    search?: string;\n}\n\nexport interface ITrashBinBulkActionResult {\n    id: string;\n}\n\nexport interface ITrashBinBulkActionGateway {\n    execute(params: ITrashBinBulkActionParams): Promise<ITrashBinBulkActionResult>;\n}\n\nexport const TrashBinBulkActionGateway = createAbstraction<ITrashBinBulkActionGateway>(\n    \"TrashBinBulkActionGateway\"\n);\n\nexport namespace TrashBinBulkActionGateway {\n    export type Interface = ITrashBinBulkActionGateway;\n    export type Params = ITrashBinBulkActionParams;\n    export type Result = ITrashBinBulkActionResult;\n}\n\n// ---------------------------------------------------------------------------\n// Presenter abstraction\n// ---------------------------------------------------------------------------\n\nexport interface ITrashBinPresenterConfig {\n    nameColumnId: string;\n    initialSort?: { field: string; direction: \"ASC\" | \"DESC\" };\n}\n\nexport interface ITrashBinViewModel {\n    list: IListViewModel<TrashBinItem>;\n    nameColumnId: string;\n}\n\nexport interface ITrashBinActions extends IListActions {\n    restoreItem(id: string): Promise<void>;\n    /*\n     * Resolves false when the delete was not carried out (the item stays listed).\n     */\n    deleteItem(id: string): Promise<boolean>;\n    bulkRestore(params?: { where?: Record<string, unknown>; search?: string }): Promise<void>;\n    bulkDelete(params?: { where?: Record<string, unknown>; search?: string }): Promise<void>;\n}\n\nexport interface ITrashBinPresenter {\n    vm: ITrashBinViewModel;\n    actions: ITrashBinActions;\n    init(config: ITrashBinPresenterConfig): void;\n    dispose(): void;\n}\n\nexport const TrashBinPresenter = createAbstraction<ITrashBinPresenter>(\"TrashBinPresenter\");\n\nexport namespace TrashBinPresenter {\n    export type Interface = ITrashBinPresenter;\n    export type ViewModel = ITrashBinViewModel;\n    export type Actions = ITrashBinActions;\n    export type Config = ITrashBinPresenterConfig;\n}\n"],"names":["TrashBinListGateway","createAbstraction","TrashBinDeleteGateway","TrashBinRestoreGateway","TrashBinBulkActionGateway","TrashBinPresenter"],"mappings":";AAoDO,MAAMA,sBAAsBC,kBAAwC;AAYpE,MAAMC,wBACTD,kBAA0C;AAUvC,MAAME,yBACTF,kBAA2C;AAoBxC,MAAMG,4BAA4BH,kBACrC;AAwCG,MAAMI,oBAAoBJ,kBAAsC"}

package/presentation/trashBin/components/BulkActions/DeleteItems.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
-export declare const BulkActionsDeleteItems: (() => React.JSX.Element) & {
-    displayName: string;
+export declare const BulkActionsDeleteItems: (() => React.JSX.Element) & React.NamedExoticComponent<unknown> & {
+    readonly type: () => React.JSX.Element;
 };

package/presentation/trashBin/components/BulkActions/DeleteItems.js

@@ -36,7 +36,11 @@ const BulkActionsDeleteItems = observer(()=>{
                 }
                 await worker.processInSeries(async ({ item, report })=>{
                     try {
-                        await actions.deleteItem(item.id);
+                        const deleted = await actions.deleteItem(item.id);
+                        if (false === deleted) return void report.error({
+                            title: `${item.title}`,
+                            message: "The item was not deleted."
+                        });
                         report.success({
                             title: `${item.title}`,
                             message: "Item successfully deleted."