@webiny/app-website-builder-workflows 0.0.0-unstable.0156a4c312

package/features/trash/BulkDeletePresenterReviewDecorator.test.js

@@ -0,0 +1,234 @@
+import { describe, expect, it, vi } from "vitest";
+import { Container } from "@webiny/di";
+import { GraphQLOperationError } from "@webiny/app/errors/index.js";
+import { Confirmation } from "@webiny/app-admin/features/confirmation/abstractions.js";
+import { Notifications } from "@webiny/app-admin/features/notifications/abstractions.js";
+import { Page } from "@webiny/app-website-builder/domain/Page/Page.js";
+import { DeletePageUseCase } from "@webiny/app-website-builder/features/pages/deletePage/abstractions.js";
+import { BulkDeletePresenter } from "@webiny/app-website-builder/presentation/pages/bulkActions/abstractions.js";
+import { ReviewErrorCode } from "@webiny/app-workflows/review/domain/ReviewErrorCode.js";
+import { REVIEW_TOAST_DURATION, REVIEW_TOAST_POSITION } from "@webiny/app-workflows/review/toasts/constants.js";
+import { ActiveReviewGuard } from "@webiny/app-workflows/review/trash/ActiveReviewGuard/abstractions.js";
+import { ActiveReviewBlockCollector } from "@webiny/app-workflows/review/trash/ActiveReviewBlockCollector/ActiveReviewBlockCollector.js";
+import { ActiveReviewGuard as ActiveReviewGuard_js_ActiveReviewGuard } from "@webiny/app-workflows/review/trash/ActiveReviewGuard/ActiveReviewGuard.js";
+import { createTrashUseCaseFakes } from "@webiny/app-workflows/review/testing/createTrashUseCaseFakes.js";
+import { registerTrashUseCaseFakes } from "@webiny/app-workflows/review/testing/registerTrashUseCaseFakes.js";
+import { DeletePageUseCaseReviewDecorator } from "./DeletePageUseCaseReviewDecorator.js";
+import { BulkDeletePresenterReviewDecorator } from "./BulkDeletePresenterReviewDecorator.js";
+function page(entryId) {
+    return Page.create({
+        id: `${entryId}#0001`,
+        entryId,
+        properties: {
+            title: `Title ${entryId}`
+        }
+    });
+}
+function createRefusal(entryId) {
+    return new GraphQLOperationError({
+        message: "This content has a review in progress.",
+        code: ReviewErrorCode.ActiveReviewOnTrash,
+        data: {
+            model: "wb.page",
+            action: "trash",
+            reviews: [
+                {
+                    reviewId: `review-${entryId}`,
+                    model: "wb.page",
+                    targetId: entryId,
+                    targetRevisionId: `${entryId}#0001`,
+                    title: `Title ${entryId}`,
+                    stepPosition: 1,
+                    stepCount: 2,
+                    stepName: "Editor"
+                }
+            ]
+        }
+    });
+}
+describe("BulkDeletePresenterReviewDecorator (forwarding)", ()=>{
+    function setupForwarding() {
+        const decoratee = {
+            vm: {
+                processing: false,
+                results: []
+            },
+            execute: vi.fn(async (_items)=>void 0)
+        };
+        const useCases = createTrashUseCaseFakes();
+        const guard = {
+            run: vi.fn(),
+            runBulk: vi.fn(async (params)=>{
+                await params.run(params.items, false);
+                await params.run(params.items, true);
+            })
+        };
+        const container = new Container();
+        container.registerInstance(ActiveReviewGuard, guard);
+        registerTrashUseCaseFakes(container, useCases);
+        container.registerInstance(BulkDeletePresenter, decoratee);
+        container.registerDecorator(BulkDeletePresenterReviewDecorator);
+        return {
+            decoratee,
+            guard,
+            useCases,
+            presenter: container.resolve(BulkDeletePresenter)
+        };
+    }
+    it("hands the items, the page id and a run callback to the guard, and no use cases (R353)", async ()=>{
+        const { guard, presenter } = setupForwarding();
+        const items = [
+            page("p1"),
+            page("p2")
+        ];
+        await presenter.execute(items);
+        expect(guard.runBulk).toHaveBeenCalledTimes(1);
+        const params = guard.runBulk.mock.calls[0][0];
+        expect(params.items).toBe(items);
+        expect(params).not.toHaveProperty("useCases");
+        expect(params.getTargetId(items[0])).toBe("p1");
+    });
+    it("runs the decoratee with the batch only, for the first run and the retry", async ()=>{
+        const { decoratee, presenter } = setupForwarding();
+        const items = [
+            page("p1")
+        ];
+        await presenter.execute(items);
+        expect(decoratee.execute).toHaveBeenCalledTimes(2);
+        expect(decoratee.execute).toHaveBeenNthCalledWith(1, items);
+        expect(decoratee.execute).toHaveBeenNthCalledWith(2, items);
+    });
+    it("delegates the view model to the decoratee", ()=>{
+        const { decoratee, presenter } = setupForwarding();
+        expect(presenter.vm).toBe(decoratee.vm);
+    });
+});
+describe("BulkDeletePresenterReviewDecorator (with the real guard and the per-page decorator)", ()=>{
+    function setupIntegrated(decision) {
+        let release = ()=>void 0;
+        const gate = new Promise((resolve)=>{
+            release = resolve;
+        });
+        const confirm = vi.fn(async (_name, _params, execute)=>{
+            if ("deferred" === decision) await gate;
+            return execute ? execute(void 0) : void 0;
+        });
+        const blocked = new Set([
+            "p1",
+            "p3"
+        ]);
+        const deleted = [];
+        const failed = [];
+        const deletePage = {
+            execute: vi.fn(async (params)=>{
+                const entryId = params.id.split("#")[0];
+                if (blocked.has(entryId)) throw createRefusal(entryId);
+                deleted.push(entryId);
+                return true;
+            })
+        };
+        const useCases = createTrashUseCaseFakes();
+        useCases.cancelReviewsForDelete.execute.mockImplementation(async (params)=>{
+            blocked.delete(params.targetId);
+            return [];
+        });
+        const container = new Container();
+        container.registerInstance(Confirmation, {
+            confirm
+        });
+        const notifications = {
+            notify: vi.fn(),
+            success: vi.fn(),
+            warning: vi.fn()
+        };
+        container.registerInstance(Notifications, notifications);
+        container.register(ActiveReviewBlockCollector).inSingletonScope();
+        container.register(ActiveReviewGuard_js_ActiveReviewGuard).inSingletonScope();
+        registerTrashUseCaseFakes(container, useCases);
+        container.registerInstance(DeletePageUseCase, deletePage);
+        container.registerDecorator(DeletePageUseCaseReviewDecorator);
+        const decoratee = {
+            vm: {
+                processing: false,
+                results: []
+            },
+            execute: vi.fn(async (items)=>{
+                const useCase = container.resolve(DeletePageUseCase);
+                for (const item of items){
+                    const result = await useCase.execute({
+                        id: item.id,
+                        permanently: false
+                    });
+                    if (false === result) failed.push(item.entryId);
+                }
+            })
+        };
+        container.registerInstance(BulkDeletePresenter, decoratee);
+        container.registerDecorator(BulkDeletePresenterReviewDecorator);
+        return {
+            confirm,
+            release,
+            deleted,
+            failed,
+            decoratee,
+            useCases,
+            notifications,
+            presenter: container.resolve(BulkDeletePresenter)
+        };
+    }
+    const items = [
+        page("p1"),
+        page("p2"),
+        page("p3")
+    ];
+    it("collects every refused page, warns once and retries only the blocked pages", async ()=>{
+        const { confirm, deleted, failed, decoratee, useCases, notifications, presenter } = setupIntegrated("confirm");
+        await presenter.execute(items);
+        expect(notifications.warning).toHaveBeenCalledTimes(1);
+        expect(notifications.warning).toHaveBeenCalledWith(expect.objectContaining({
+            title: "1 of 3 items done. 2 still need your confirmation.",
+            position: REVIEW_TOAST_POSITION,
+            duration: REVIEW_TOAST_DURATION,
+            dismissible: true
+        }));
+        expect(confirm).toHaveBeenCalledTimes(1);
+        const dialogParams = confirm.mock.calls[0][1];
+        expect(dialogParams.reviews.map((review)=>review.reviewId)).toEqual([
+            "review-p1",
+            "review-p3"
+        ]);
+        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledTimes(2);
+        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledWith({
+            namespace: "wb.page",
+            targetId: "p1",
+            targetRevisionId: null,
+            action: "trash"
+        });
+        expect(decoratee.execute).toHaveBeenCalledTimes(2);
+        expect(decoratee.execute.mock.calls[1][0].map((item)=>item.entryId)).toEqual([
+            "p1",
+            "p3"
+        ]);
+        expect(failed).toEqual([
+            "p1",
+            "p3"
+        ]);
+        expect(deleted).toEqual([
+            "p2",
+            "p1",
+            "p3"
+        ]);
+    });
+    it("resolves execute only after the warning flow has ended (R228)", async ()=>{
+        const { confirm, release, presenter } = setupIntegrated("deferred");
+        const settled = vi.fn();
+        const promise = presenter.execute(items).then(settled);
+        await vi.waitFor(()=>expect(confirm).toHaveBeenCalled());
+        expect(settled).not.toHaveBeenCalled();
+        release();
+        await promise;
+        expect(settled).toHaveBeenCalledTimes(1);
+    });
+});
+
+//# sourceMappingURL=BulkDeletePresenterReviewDecorator.test.js.map

package/features/trash/BulkDeletePresenterReviewDecorator.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/trash/BulkDeletePresenterReviewDecorator.test.js","sources":["../../../src/features/trash/BulkDeletePresenterReviewDecorator.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 { GraphQLOperationError } from \"@webiny/app/errors/index.js\";\nimport { Confirmation } from \"@webiny/app-admin/features/confirmation/abstractions.js\";\nimport { Notifications } from \"@webiny/app-admin/features/notifications/abstractions.js\";\nimport { Page } from \"@webiny/app-website-builder/domain/Page/Page.js\";\nimport { DeletePageUseCase } from \"@webiny/app-website-builder/features/pages/deletePage/abstractions.js\";\nimport { BulkDeletePresenter } from \"@webiny/app-website-builder/presentation/pages/bulkActions/abstractions.js\";\nimport { ReviewErrorCode } from \"@webiny/app-workflows/review/domain/ReviewErrorCode.js\";\nimport { REVIEW_TOAST_DURATION } from \"@webiny/app-workflows/review/toasts/constants.js\";\nimport { REVIEW_TOAST_POSITION } from \"@webiny/app-workflows/review/toasts/constants.js\";\nimport { ActiveReviewGuard as GuardAbstraction } from \"@webiny/app-workflows/review/trash/ActiveReviewGuard/abstractions.js\";\nimport { ActiveReviewBlockCollector } from \"@webiny/app-workflows/review/trash/ActiveReviewBlockCollector/ActiveReviewBlockCollector.js\";\nimport { ActiveReviewGuard } from \"@webiny/app-workflows/review/trash/ActiveReviewGuard/ActiveReviewGuard.js\";\nimport { createTrashUseCaseFakes } from \"@webiny/app-workflows/review/testing/createTrashUseCaseFakes.js\";\nimport { registerTrashUseCaseFakes } from \"@webiny/app-workflows/review/testing/registerTrashUseCaseFakes.js\";\nimport { DeletePageUseCaseReviewDecorator } from \"./DeletePageUseCaseReviewDecorator.js\";\nimport { BulkDeletePresenterReviewDecorator } from \"./BulkDeletePresenterReviewDecorator.js\";\n\ninterface DeleteParams {\n    id: string;\n    permanently: boolean;\n}\n\nfunction page(entryId: string): Page {\n    return Page.create({\n        id: `${entryId}#0001`,\n        entryId,\n        properties: { title: `Title ${entryId}` }\n    });\n}\n\nfunction createRefusal(entryId: string) {\n    return new GraphQLOperationError({\n        message: \"This content has a review in progress.\",\n        code: ReviewErrorCode.ActiveReviewOnTrash,\n        data: {\n            model: \"wb.page\",\n            action: \"trash\",\n            reviews: [\n                {\n                    reviewId: `review-${entryId}`,\n                    model: \"wb.page\",\n                    targetId: entryId,\n                    targetRevisionId: `${entryId}#0001`,\n                    title: `Title ${entryId}`,\n                    stepPosition: 1,\n                    stepCount: 2,\n                    stepName: \"Editor\"\n                }\n            ]\n        }\n    });\n}\n\ndescribe(\"BulkDeletePresenterReviewDecorator (forwarding)\", () => {\n    function setupForwarding() {\n        const decoratee = {\n            vm: { processing: false, results: [] },\n            execute: vi.fn(async (_items: Page[]) => undefined)\n        };\n        const useCases = createTrashUseCaseFakes();\n        const guard = {\n            run: vi.fn(),\n            runBulk: vi.fn(async <TItem>(params: GuardAbstraction.BulkParams<TItem>) => {\n                await params.run(params.items, false);\n                await params.run(params.items, true);\n            })\n        };\n\n        const container = new Container();\n        container.registerInstance(\n            GuardAbstraction,\n            guard as unknown as GuardAbstraction.Interface\n        );\n        registerTrashUseCaseFakes(container, useCases);\n        container.registerInstance(BulkDeletePresenter, decoratee);\n        container.registerDecorator(BulkDeletePresenterReviewDecorator);\n\n        return {\n            decoratee,\n            guard,\n            useCases,\n            presenter: container.resolve(BulkDeletePresenter)\n        };\n    }\n\n    it(\"hands the items, the page id and a run callback to the guard, and no use cases (R353)\", async () => {\n        const { guard, presenter } = setupForwarding();\n        const items = [page(\"p1\"), page(\"p2\")];\n\n        await presenter.execute(items);\n\n        expect(guard.runBulk).toHaveBeenCalledTimes(1);\n        const params = guard.runBulk.mock.calls[0][0];\n        expect(params.items).toBe(items);\n        expect(params).not.toHaveProperty(\"useCases\");\n        expect(params.getTargetId(items[0])).toBe(\"p1\");\n    });\n\n    it(\"runs the decoratee with the batch only, for the first run and the retry\", async () => {\n        const { decoratee, presenter } = setupForwarding();\n        const items = [page(\"p1\")];\n\n        await presenter.execute(items);\n\n        expect(decoratee.execute).toHaveBeenCalledTimes(2);\n        expect(decoratee.execute).toHaveBeenNthCalledWith(1, items);\n        expect(decoratee.execute).toHaveBeenNthCalledWith(2, items);\n    });\n\n    it(\"delegates the view model to the decoratee\", () => {\n        const { decoratee, presenter } = setupForwarding();\n\n        expect(presenter.vm).toBe(decoratee.vm);\n    });\n});\n\ndescribe(\"BulkDeletePresenterReviewDecorator (with the real guard and the per-page decorator)\", () => {\n    function setupIntegrated(decision: \"confirm\" | \"deferred\") {\n        let release: () => void = () => undefined;\n        const gate = new Promise<void>(resolve => {\n            release = resolve;\n        });\n        const confirm = vi.fn(\n            async (\n                _name: string,\n                _params: unknown,\n                execute?: (data: unknown) => Promise<unknown>\n            ) => {\n                if (decision === \"deferred\") {\n                    await gate;\n                }\n                return execute ? execute(undefined) : undefined;\n            }\n        );\n        const blocked = new Set([\"p1\", \"p3\"]);\n        const deleted: string[] = [];\n        const failed: string[] = [];\n        const deletePage = {\n            execute: vi.fn(async (params: DeleteParams) => {\n                const entryId = params.id.split(\"#\")[0];\n                if (blocked.has(entryId)) {\n                    throw createRefusal(entryId);\n                }\n                deleted.push(entryId);\n                return true;\n            })\n        };\n        const useCases = createTrashUseCaseFakes();\n        useCases.cancelReviewsForDelete.execute.mockImplementation(async params => {\n            blocked.delete(params.targetId);\n            return [];\n        });\n\n        const container = new Container();\n        container.registerInstance(Confirmation, { confirm } as unknown as Confirmation.Interface);\n        // The real guard reports the first-pass count through Notifications (Task 33).\n        const notifications = { notify: vi.fn(), success: vi.fn(), warning: vi.fn() };\n        container.registerInstance(\n            Notifications,\n            notifications as unknown as Notifications.Interface\n        );\n        container.register(ActiveReviewBlockCollector).inSingletonScope();\n        container.register(ActiveReviewGuard).inSingletonScope();\n        registerTrashUseCaseFakes(container, useCases);\n        container.registerInstance(DeletePageUseCase, deletePage);\n        container.registerDecorator(DeletePageUseCaseReviewDecorator);\n\n        // Stands in for the base presenter: a per-page series that calls the decorated use case.\n        const decoratee = {\n            vm: { processing: false, results: [] },\n            execute: vi.fn(async (items: Page[]) => {\n                const useCase = container.resolve(DeletePageUseCase);\n                for (const item of items) {\n                    // Like the base presenter: a false result is \"not deleted\", reported as failed.\n                    const result = await useCase.execute({ id: item.id, permanently: false });\n                    if (result === false) {\n                        failed.push(item.entryId);\n                    }\n                }\n            })\n        };\n        container.registerInstance(BulkDeletePresenter, decoratee);\n        container.registerDecorator(BulkDeletePresenterReviewDecorator);\n\n        return {\n            confirm,\n            release,\n            deleted,\n            failed,\n            decoratee,\n            useCases,\n            notifications,\n            presenter: container.resolve(BulkDeletePresenter)\n        };\n    }\n\n    const items = [page(\"p1\"), page(\"p2\"), page(\"p3\")];\n\n    it(\"collects every refused page, warns once and retries only the blocked pages\", async () => {\n        const { confirm, deleted, failed, decoratee, useCases, notifications, presenter } =\n            setupIntegrated(\"confirm\");\n\n        await presenter.execute(items);\n\n        // First pass: p2 was done, p1 and p3 were refused (Q28, Task 33).\n        expect(notifications.warning).toHaveBeenCalledTimes(1);\n        expect(notifications.warning).toHaveBeenCalledWith(\n            expect.objectContaining({\n                title: \"1 of 3 items done. 2 still need your confirmation.\",\n                position: REVIEW_TOAST_POSITION,\n                duration: REVIEW_TOAST_DURATION,\n                dismissible: true\n            })\n        );\n\n        expect(confirm).toHaveBeenCalledTimes(1);\n        const dialogParams = confirm.mock.calls[0][1] as GuardAbstraction.DialogParams;\n        expect(dialogParams.reviews.map(review => review.reviewId)).toEqual([\n            \"review-p1\",\n            \"review-p3\"\n        ]);\n        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledTimes(2);\n        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledWith({\n            namespace: \"wb.page\",\n            targetId: \"p1\",\n            targetRevisionId: null,\n            action: \"trash\"\n        });\n        expect(decoratee.execute).toHaveBeenCalledTimes(2);\n        expect(decoratee.execute.mock.calls[1][0].map(item => item.entryId)).toEqual([\"p1\", \"p3\"]);\n        expect(failed).toEqual([\"p1\", \"p3\"]);\n        expect(deleted).toEqual([\"p2\", \"p1\", \"p3\"]);\n    });\n\n    it(\"resolves execute only after the warning flow has ended (R228)\", async () => {\n        const { confirm, release, presenter } = setupIntegrated(\"deferred\");\n        const settled = vi.fn();\n\n        const promise = presenter.execute(items).then(settled);\n\n        await vi.waitFor(() => expect(confirm).toHaveBeenCalled());\n        expect(settled).not.toHaveBeenCalled();\n        release();\n        await promise;\n        expect(settled).toHaveBeenCalledTimes(1);\n    });\n});\n"],"names":["page","entryId","Page","createRefusal","GraphQLOperationError","ReviewErrorCode","describe","setupForwarding","decoratee","vi","_items","undefined","useCases","createTrashUseCaseFakes","guard","params","container","Container","GuardAbstraction","registerTrashUseCaseFakes","BulkDeletePresenter","BulkDeletePresenterReviewDecorator","it","presenter","items","expect","setupIntegrated","decision","release","gate","Promise","resolve","confirm","_name","_params","execute","blocked","Set","deleted","failed","deletePage","Confirmation","notifications","Notifications","ActiveReviewBlockCollector","ActiveReviewGuard","DeletePageUseCase","DeletePageUseCaseReviewDecorator","useCase","item","result","REVIEW_TOAST_POSITION","REVIEW_TOAST_DURATION","dialogParams","review","settled","promise"],"mappings":"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"}

package/features/trash/DeletePageRevisionUseCaseReviewDecorator.d.ts

@@ -0,0 +1,13 @@
+import { DeletePageRevisionUseCase } from "@webiny/app-website-builder/features/pages/deletePageRevision/abstractions.js";
+import type { DeletePageRevisionParams } from "@webiny/app-website-builder/features/pages/deletePageRevision/abstractions.js";
+import { ActiveReviewGuard } from "@webiny/app-workflows/review/trash/ActiveReviewGuard/abstractions.js";
+declare class DeletePageRevisionUseCaseReviewDecoratorImpl implements DeletePageRevisionUseCase.Interface {
+    private guard;
+    private decoratee;
+    constructor(guard: ActiveReviewGuard.Interface, decoratee: DeletePageRevisionUseCase.Interface);
+    execute(params: DeletePageRevisionParams): Promise<boolean>;
+}
+export declare const DeletePageRevisionUseCaseReviewDecorator: typeof DeletePageRevisionUseCaseReviewDecoratorImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/app-website-builder/features/pages/deletePageRevision/abstractions.js").IDeletePageRevisionUseCase>;
+};
+export {};

package/features/trash/DeletePageRevisionUseCaseReviewDecorator.js

@@ -0,0 +1,23 @@
+import { DeletePageRevisionUseCase } from "@webiny/app-website-builder/features/pages/deletePageRevision/abstractions.js";
+import { ActiveReviewGuard } from "@webiny/app-workflows/review/trash/ActiveReviewGuard/abstractions.js";
+class DeletePageRevisionUseCaseReviewDecoratorImpl {
+    constructor(guard, decoratee){
+        this.guard = guard;
+        this.decoratee = decoratee;
+    }
+    async execute(params) {
+        return this.guard.run({
+            action: ()=>this.decoratee.execute(params),
+            revisionId: params.id
+        });
+    }
+}
+const DeletePageRevisionUseCaseReviewDecorator = DeletePageRevisionUseCase.createDecorator({
+    decorator: DeletePageRevisionUseCaseReviewDecoratorImpl,
+    dependencies: [
+        ActiveReviewGuard
+    ]
+});
+export { DeletePageRevisionUseCaseReviewDecorator };
+
+//# sourceMappingURL=DeletePageRevisionUseCaseReviewDecorator.js.map

package/features/trash/DeletePageRevisionUseCaseReviewDecorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/trash/DeletePageRevisionUseCaseReviewDecorator.js","sources":["../../../src/features/trash/DeletePageRevisionUseCaseReviewDecorator.ts"],"sourcesContent":["import { DeletePageRevisionUseCase } from \"@webiny/app-website-builder/features/pages/deletePageRevision/abstractions.js\";\nimport type { DeletePageRevisionParams } from \"@webiny/app-website-builder/features/pages/deletePageRevision/abstractions.js\";\nimport { ActiveReviewGuard } from \"@webiny/app-workflows/review/trash/ActiveReviewGuard/abstractions.js\";\n\nclass DeletePageRevisionUseCaseReviewDecoratorImpl implements DeletePageRevisionUseCase.Interface {\n    constructor(\n        private guard: ActiveReviewGuard.Interface,\n        private decoratee: DeletePageRevisionUseCase.Interface\n    ) {}\n\n    async execute(params: DeletePageRevisionParams): Promise<boolean> {\n        return this.guard.run({\n            action: () => this.decoratee.execute(params),\n            revisionId: params.id\n        });\n    }\n}\n\nexport const DeletePageRevisionUseCaseReviewDecorator = DeletePageRevisionUseCase.createDecorator({\n    decorator: DeletePageRevisionUseCaseReviewDecoratorImpl,\n    dependencies: [ActiveReviewGuard]\n});\n"],"names":["DeletePageRevisionUseCaseReviewDecoratorImpl","guard","decoratee","params","DeletePageRevisionUseCaseReviewDecorator","DeletePageRevisionUseCase","ActiveReviewGuard"],"mappings":";;AAIA,MAAMA;IACF,YACYC,KAAkC,EAClCC,SAA8C,CACxD;aAFUD,KAAK,GAALA;aACAC,SAAS,GAATA;IACT;IAEH,MAAM,QAAQC,MAAgC,EAAoB;QAC9D,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAClB,QAAQ,IAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACA;YACrC,YAAYA,OAAO,EAAE;QACzB;IACJ;AACJ;AAEO,MAAMC,2CAA2CC,0BAA0B,eAAe,CAAC;IAC9F,WAAWL;IACX,cAAc;QAACM;KAAkB;AACrC"}

package/features/trash/DeletePageRevisionUseCaseReviewDecorator.test.d.ts

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

package/features/trash/DeletePageRevisionUseCaseReviewDecorator.test.js

@@ -0,0 +1,114 @@
+import { describe, expect, it, vi } from "vitest";
+import { Container } from "@webiny/di";
+import { GraphQLOperationError } from "@webiny/app/errors/index.js";
+import { Confirmation } from "@webiny/app-admin/features/confirmation/abstractions.js";
+import { Notifications } from "@webiny/app-admin/features/notifications/abstractions.js";
+import { DeletePageRevisionUseCase } from "@webiny/app-website-builder/features/pages/deletePageRevision/abstractions.js";
+import { ReviewErrorCode } from "@webiny/app-workflows/review/domain/ReviewErrorCode.js";
+import { ActiveReviewBlockCollector } from "@webiny/app-workflows/review/trash/ActiveReviewBlockCollector/ActiveReviewBlockCollector.js";
+import { ActiveReviewGuard } from "@webiny/app-workflows/review/trash/ActiveReviewGuard/ActiveReviewGuard.js";
+import { createTrashUseCaseFakes } from "@webiny/app-workflows/review/testing/createTrashUseCaseFakes.js";
+import { registerTrashUseCaseFakes } from "@webiny/app-workflows/review/testing/registerTrashUseCaseFakes.js";
+import { DeletePageRevisionUseCaseReviewDecorator } from "./DeletePageRevisionUseCaseReviewDecorator.js";
+function createRefusal() {
+    return new GraphQLOperationError({
+        message: "This content has a review in progress.",
+        code: ReviewErrorCode.ActiveReviewOnTrash,
+        data: {
+            model: "wb.page",
+            action: "delete",
+            reviews: [
+                {
+                    reviewId: "review-2",
+                    model: "wb.page",
+                    targetId: "page-1",
+                    targetRevisionId: "page-1#0002",
+                    title: "Home page",
+                    stepPosition: 2,
+                    stepCount: 2,
+                    stepName: "Legal"
+                }
+            ]
+        }
+    });
+}
+function setup(decision = "confirm") {
+    const confirm = vi.fn(async (_name, _params, execute)=>{
+        if ("dismiss" === decision) return false;
+        return execute ? execute(void 0) : void 0;
+    });
+    const decoratee = {
+        execute: vi.fn()
+    };
+    const useCases = createTrashUseCaseFakes();
+    const container = new Container();
+    container.registerInstance(Confirmation, {
+        confirm
+    });
+    container.registerInstance(Notifications, {
+        notify: vi.fn(),
+        success: vi.fn(),
+        warning: vi.fn()
+    });
+    container.register(ActiveReviewBlockCollector).inSingletonScope();
+    container.register(ActiveReviewGuard).inSingletonScope();
+    registerTrashUseCaseFakes(container, useCases);
+    container.registerInstance(DeletePageRevisionUseCase, decoratee);
+    container.registerDecorator(DeletePageRevisionUseCaseReviewDecorator);
+    return {
+        confirm,
+        decoratee,
+        useCases,
+        useCase: container.resolve(DeletePageRevisionUseCase)
+    };
+}
+describe("DeletePageRevisionUseCaseReviewDecorator", ()=>{
+    it("passes through to the decoratee when the delete succeeds", async ()=>{
+        const { confirm, decoratee, useCase } = setup();
+        decoratee.execute.mockResolvedValue(true);
+        const result = await useCase.execute({
+            id: "page-1#0002"
+        });
+        expect(result).toBe(true);
+        expect(decoratee.execute).toHaveBeenCalledWith({
+            id: "page-1#0002"
+        });
+        expect(confirm).not.toHaveBeenCalled();
+    });
+    it("on the server refusal cancels only that revision's reviews, then repeats the delete (R235)", async ()=>{
+        const { decoratee, useCases, useCase } = setup();
+        decoratee.execute.mockRejectedValueOnce(createRefusal()).mockResolvedValueOnce(true);
+        const result = await useCase.execute({
+            id: "page-1#0002"
+        });
+        expect(result).toBe(true);
+        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledTimes(1);
+        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledWith({
+            namespace: "wb.page",
+            targetId: "page-1",
+            targetRevisionId: "page-1#0002",
+            action: "delete"
+        });
+        expect(decoratee.execute).toHaveBeenCalledTimes(2);
+    });
+    it("resolves false when the warning is dismissed", async ()=>{
+        const { decoratee, useCases, useCase } = setup("dismiss");
+        decoratee.execute.mockRejectedValue(createRefusal());
+        const result = await useCase.execute({
+            id: "page-1#0002"
+        });
+        expect(result).toBe(false);
+        expect(useCases.cancelReviewsForDelete.execute).not.toHaveBeenCalled();
+    });
+    it("rethrows any other error unchanged", async ()=>{
+        const { decoratee, useCase } = setup();
+        const failure = new Error("Network down");
+        decoratee.execute.mockRejectedValue(failure);
+        const error = await useCase.execute({
+            id: "page-1#0002"
+        }).catch((e)=>e);
+        expect(error).toBe(failure);
+    });
+});
+
+//# sourceMappingURL=DeletePageRevisionUseCaseReviewDecorator.test.js.map

package/features/trash/DeletePageRevisionUseCaseReviewDecorator.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/trash/DeletePageRevisionUseCaseReviewDecorator.test.js","sources":["../../../src/features/trash/DeletePageRevisionUseCaseReviewDecorator.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 { GraphQLOperationError } from \"@webiny/app/errors/index.js\";\nimport { Confirmation } from \"@webiny/app-admin/features/confirmation/abstractions.js\";\nimport { Notifications } from \"@webiny/app-admin/features/notifications/abstractions.js\";\nimport { DeletePageRevisionUseCase } from \"@webiny/app-website-builder/features/pages/deletePageRevision/abstractions.js\";\nimport { ReviewErrorCode } from \"@webiny/app-workflows/review/domain/ReviewErrorCode.js\";\nimport { ActiveReviewBlockCollector } from \"@webiny/app-workflows/review/trash/ActiveReviewBlockCollector/ActiveReviewBlockCollector.js\";\nimport { ActiveReviewGuard } from \"@webiny/app-workflows/review/trash/ActiveReviewGuard/ActiveReviewGuard.js\";\nimport { createTrashUseCaseFakes } from \"@webiny/app-workflows/review/testing/createTrashUseCaseFakes.js\";\nimport { registerTrashUseCaseFakes } from \"@webiny/app-workflows/review/testing/registerTrashUseCaseFakes.js\";\nimport { DeletePageRevisionUseCaseReviewDecorator } from \"./DeletePageRevisionUseCaseReviewDecorator.js\";\n\nfunction createRefusal() {\n    return new GraphQLOperationError({\n        message: \"This content has a review in progress.\",\n        code: ReviewErrorCode.ActiveReviewOnTrash,\n        data: {\n            model: \"wb.page\",\n            action: \"delete\",\n            reviews: [\n                {\n                    reviewId: \"review-2\",\n                    model: \"wb.page\",\n                    targetId: \"page-1\",\n                    targetRevisionId: \"page-1#0002\",\n                    title: \"Home page\",\n                    stepPosition: 2,\n                    stepCount: 2,\n                    stepName: \"Legal\"\n                }\n            ]\n        }\n    });\n}\n\nfunction setup(decision: \"confirm\" | \"dismiss\" = \"confirm\") {\n    const confirm = vi.fn(\n        async (_name: string, _params: unknown, execute?: (data: unknown) => Promise<unknown>) => {\n            if (decision === \"dismiss\") {\n                return false;\n            }\n            return execute ? execute(undefined) : undefined;\n        }\n    );\n    const decoratee = { execute: vi.fn() };\n    const useCases = createTrashUseCaseFakes();\n\n    const container = new Container();\n    container.registerInstance(Confirmation, { confirm } as unknown as Confirmation.Interface);\n    container.registerInstance(Notifications, {\n        notify: vi.fn(),\n        success: vi.fn(),\n        warning: vi.fn()\n    } as unknown as Notifications.Interface);\n    container.register(ActiveReviewBlockCollector).inSingletonScope();\n    container.register(ActiveReviewGuard).inSingletonScope();\n    registerTrashUseCaseFakes(container, useCases);\n    container.registerInstance(DeletePageRevisionUseCase, decoratee);\n    container.registerDecorator(DeletePageRevisionUseCaseReviewDecorator);\n\n    return {\n        confirm,\n        decoratee,\n        useCases,\n        useCase: container.resolve(DeletePageRevisionUseCase)\n    };\n}\n\ndescribe(\"DeletePageRevisionUseCaseReviewDecorator\", () => {\n    it(\"passes through to the decoratee when the delete succeeds\", async () => {\n        const { confirm, decoratee, useCase } = setup();\n        decoratee.execute.mockResolvedValue(true);\n\n        const result = await useCase.execute({ id: \"page-1#0002\" });\n\n        expect(result).toBe(true);\n        expect(decoratee.execute).toHaveBeenCalledWith({ id: \"page-1#0002\" });\n        expect(confirm).not.toHaveBeenCalled();\n    });\n\n    it(\"on the server refusal cancels only that revision's reviews, then repeats the delete (R235)\", async () => {\n        const { decoratee, useCases, useCase } = setup();\n        decoratee.execute.mockRejectedValueOnce(createRefusal()).mockResolvedValueOnce(true);\n\n        const result = await useCase.execute({ id: \"page-1#0002\" });\n\n        expect(result).toBe(true);\n        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledTimes(1);\n        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledWith({\n            namespace: \"wb.page\",\n            targetId: \"page-1\",\n            targetRevisionId: \"page-1#0002\",\n            action: \"delete\"\n        });\n        expect(decoratee.execute).toHaveBeenCalledTimes(2);\n    });\n\n    it(\"resolves false when the warning is dismissed\", async () => {\n        const { decoratee, useCases, useCase } = setup(\"dismiss\");\n        decoratee.execute.mockRejectedValue(createRefusal());\n\n        const result = await useCase.execute({ id: \"page-1#0002\" });\n\n        expect(result).toBe(false);\n        expect(useCases.cancelReviewsForDelete.execute).not.toHaveBeenCalled();\n    });\n\n    it(\"rethrows any other error unchanged\", async () => {\n        const { decoratee, useCase } = setup();\n        const failure = new Error(\"Network down\");\n        decoratee.execute.mockRejectedValue(failure);\n\n        const error = await useCase.execute({ id: \"page-1#0002\" }).catch(e => e);\n\n        expect(error).toBe(failure);\n    });\n});\n"],"names":["createRefusal","GraphQLOperationError","ReviewErrorCode","setup","decision","confirm","vi","_name","_params","execute","undefined","decoratee","useCases","createTrashUseCaseFakes","container","Container","Confirmation","Notifications","ActiveReviewBlockCollector","ActiveReviewGuard","registerTrashUseCaseFakes","DeletePageRevisionUseCase","DeletePageRevisionUseCaseReviewDecorator","describe","it","useCase","result","expect","failure","Error","error","e"],"mappings":"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"}

package/features/trash/DeletePageUseCaseReviewDecorator.d.ts

@@ -0,0 +1,13 @@
+import { DeletePageUseCase } from "@webiny/app-website-builder/features/pages/deletePage/abstractions.js";
+import type { DeletePageParams } from "@webiny/app-website-builder/features/pages/deletePage/abstractions.js";
+import { ActiveReviewGuard } from "@webiny/app-workflows/review/trash/ActiveReviewGuard/abstractions.js";
+declare class DeletePageUseCaseReviewDecoratorImpl implements DeletePageUseCase.Interface {
+    private guard;
+    private decoratee;
+    constructor(guard: ActiveReviewGuard.Interface, decoratee: DeletePageUseCase.Interface);
+    execute(params: DeletePageParams): Promise<boolean>;
+}
+export declare const DeletePageUseCaseReviewDecorator: typeof DeletePageUseCaseReviewDecoratorImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/app-website-builder/features/pages/deletePage/abstractions.js").IDeletePageUseCase>;
+};
+export {};

package/features/trash/DeletePageUseCaseReviewDecorator.js

@@ -0,0 +1,23 @@
+import { DeletePageUseCase } from "@webiny/app-website-builder/features/pages/deletePage/abstractions.js";
+import { ActiveReviewGuard } from "@webiny/app-workflows/review/trash/ActiveReviewGuard/abstractions.js";
+class DeletePageUseCaseReviewDecoratorImpl {
+    constructor(guard, decoratee){
+        this.guard = guard;
+        this.decoratee = decoratee;
+    }
+    async execute(params) {
+        return this.guard.run({
+            action: ()=>this.decoratee.execute(params),
+            revisionId: null
+        });
+    }
+}
+const DeletePageUseCaseReviewDecorator = DeletePageUseCase.createDecorator({
+    decorator: DeletePageUseCaseReviewDecoratorImpl,
+    dependencies: [
+        ActiveReviewGuard
+    ]
+});
+export { DeletePageUseCaseReviewDecorator };
+
+//# sourceMappingURL=DeletePageUseCaseReviewDecorator.js.map

package/features/trash/DeletePageUseCaseReviewDecorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/trash/DeletePageUseCaseReviewDecorator.js","sources":["../../../src/features/trash/DeletePageUseCaseReviewDecorator.ts"],"sourcesContent":["import { DeletePageUseCase } from \"@webiny/app-website-builder/features/pages/deletePage/abstractions.js\";\nimport type { DeletePageParams } from \"@webiny/app-website-builder/features/pages/deletePage/abstractions.js\";\nimport { ActiveReviewGuard } from \"@webiny/app-workflows/review/trash/ActiveReviewGuard/abstractions.js\";\n\nclass DeletePageUseCaseReviewDecoratorImpl implements DeletePageUseCase.Interface {\n    constructor(\n        private guard: ActiveReviewGuard.Interface,\n        private decoratee: DeletePageUseCase.Interface\n    ) {}\n\n    async execute(params: DeletePageParams): Promise<boolean> {\n        return this.guard.run({\n            action: () => this.decoratee.execute(params),\n            revisionId: null\n        });\n    }\n}\n\nexport const DeletePageUseCaseReviewDecorator = DeletePageUseCase.createDecorator({\n    decorator: DeletePageUseCaseReviewDecoratorImpl,\n    dependencies: [ActiveReviewGuard]\n});\n"],"names":["DeletePageUseCaseReviewDecoratorImpl","guard","decoratee","params","DeletePageUseCaseReviewDecorator","DeletePageUseCase","ActiveReviewGuard"],"mappings":";;AAIA,MAAMA;IACF,YACYC,KAAkC,EAClCC,SAAsC,CAChD;aAFUD,KAAK,GAALA;aACAC,SAAS,GAATA;IACT;IAEH,MAAM,QAAQC,MAAwB,EAAoB;QACtD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAClB,QAAQ,IAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAACA;YACrC,YAAY;QAChB;IACJ;AACJ;AAEO,MAAMC,mCAAmCC,kBAAkB,eAAe,CAAC;IAC9E,WAAWL;IACX,cAAc;QAACM;KAAkB;AACrC"}

package/features/trash/DeletePageUseCaseReviewDecorator.test.d.ts

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

package/features/trash/DeletePageUseCaseReviewDecorator.test.js

@@ -0,0 +1,134 @@
+import { describe, expect, it, vi } from "vitest";
+import { Container } from "@webiny/di";
+import { GraphQLOperationError } from "@webiny/app/errors/index.js";
+import { Confirmation } from "@webiny/app-admin/features/confirmation/abstractions.js";
+import { Notifications } from "@webiny/app-admin/features/notifications/abstractions.js";
+import { DeletePageUseCase } from "@webiny/app-website-builder/features/pages/deletePage/abstractions.js";
+import { ReviewErrorCode } from "@webiny/app-workflows/review/domain/ReviewErrorCode.js";
+import { ActiveReviewBlockCollector } from "@webiny/app-workflows/review/trash/ActiveReviewBlockCollector/ActiveReviewBlockCollector.js";
+import { ActiveReviewGuard } from "@webiny/app-workflows/review/trash/ActiveReviewGuard/ActiveReviewGuard.js";
+import { createTrashUseCaseFakes } from "@webiny/app-workflows/review/testing/createTrashUseCaseFakes.js";
+import { registerTrashUseCaseFakes } from "@webiny/app-workflows/review/testing/registerTrashUseCaseFakes.js";
+import { DeletePageUseCaseReviewDecorator } from "./DeletePageUseCaseReviewDecorator.js";
+function createRefusal() {
+    return new GraphQLOperationError({
+        message: "This content has a review in progress.",
+        code: ReviewErrorCode.ActiveReviewOnTrash,
+        data: {
+            model: "wb.page",
+            action: "trash",
+            reviews: [
+                {
+                    reviewId: "review-1",
+                    model: "wb.page",
+                    targetId: "page-1",
+                    targetRevisionId: "page-1#0002",
+                    title: "Home page",
+                    stepPosition: 1,
+                    stepCount: 2,
+                    stepName: "Editor"
+                }
+            ]
+        }
+    });
+}
+function setup(decision = "confirm") {
+    const confirm = vi.fn(async (_name, _params, execute)=>{
+        if ("dismiss" === decision) return false;
+        return execute ? execute(void 0) : void 0;
+    });
+    const decoratee = {
+        execute: vi.fn()
+    };
+    const useCases = createTrashUseCaseFakes();
+    const container = new Container();
+    container.registerInstance(Confirmation, {
+        confirm
+    });
+    container.registerInstance(Notifications, {
+        notify: vi.fn(),
+        success: vi.fn(),
+        warning: vi.fn()
+    });
+    container.register(ActiveReviewBlockCollector).inSingletonScope();
+    container.register(ActiveReviewGuard).inSingletonScope();
+    registerTrashUseCaseFakes(container, useCases);
+    container.registerInstance(DeletePageUseCase, decoratee);
+    container.registerDecorator(DeletePageUseCaseReviewDecorator);
+    return {
+        confirm,
+        decoratee,
+        useCases,
+        useCase: container.resolve(DeletePageUseCase)
+    };
+}
+describe("DeletePageUseCaseReviewDecorator", ()=>{
+    it("passes through to the decoratee when the trash succeeds", async ()=>{
+        const { confirm, decoratee, useCases, useCase } = setup();
+        decoratee.execute.mockResolvedValue(true);
+        const result = await useCase.execute({
+            id: "page-1#0002",
+            permanently: false
+        });
+        expect(result).toBe(true);
+        expect(decoratee.execute).toHaveBeenCalledWith({
+            id: "page-1#0002",
+            permanently: false
+        });
+        expect(confirm).not.toHaveBeenCalled();
+        expect(useCases.cancelReviewsForDelete.execute).not.toHaveBeenCalled();
+    });
+    it("on the server refusal warns, cancels every revision of the page once and repeats the trash", async ()=>{
+        const { confirm, decoratee, useCases, useCase } = setup();
+        decoratee.execute.mockRejectedValueOnce(createRefusal()).mockResolvedValueOnce(true);
+        const result = await useCase.execute({
+            id: "page-1#0002",
+            permanently: false
+        });
+        expect(result).toBe(true);
+        expect(confirm).toHaveBeenCalledTimes(1);
+        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledTimes(1);
+        expect(useCases.cancelReviewsForDelete.execute).toHaveBeenCalledWith({
+            namespace: "wb.page",
+            targetId: "page-1",
+            targetRevisionId: null,
+            action: "trash"
+        });
+        expect(decoratee.execute).toHaveBeenCalledTimes(2);
+    });
+    it("resolves false when the warning is dismissed, with nothing cancelled or repeated", async ()=>{
+        const { decoratee, useCases, useCase } = setup("dismiss");
+        decoratee.execute.mockRejectedValue(createRefusal());
+        const result = await useCase.execute({
+            id: "page-1#0002",
+            permanently: false
+        });
+        expect(result).toBe(false);
+        expect(useCases.cancelReviewsForDelete.execute).not.toHaveBeenCalled();
+        expect(decoratee.execute).toHaveBeenCalledTimes(1);
+    });
+    it("rethrows any other error unchanged", async ()=>{
+        const { confirm, decoratee, useCase } = setup();
+        const failure = new Error("Network down");
+        decoratee.execute.mockRejectedValue(failure);
+        const error = await useCase.execute({
+            id: "page-1#0002",
+            permanently: false
+        }).catch((e)=>e);
+        expect(error).toBe(failure);
+        expect(confirm).not.toHaveBeenCalled();
+    });
+    it("propagates a second refusal after the repeat", async ()=>{
+        const { confirm, decoratee, useCase } = setup();
+        const second = createRefusal();
+        decoratee.execute.mockRejectedValueOnce(createRefusal()).mockRejectedValueOnce(second);
+        const error = await useCase.execute({
+            id: "page-1#0002",
+            permanently: false
+        }).catch((e)=>e);
+        expect(error).toBe(second);
+        expect(confirm).toHaveBeenCalledTimes(1);
+    });
+});
+
+//# sourceMappingURL=DeletePageUseCaseReviewDecorator.test.js.map