@webiny/app-website-builder 6.5.0-beta.0 → 6.5.0-beta.2

package/features/pages/deletePageRevision/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/pages/deletePageRevision/abstractions.js","sources":["../../../../src/features/pages/deletePageRevision/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { Page } from \"~/domain/Page/Page.js\";\n\n//\n// Params\n//\nexport interface DeletePageRevisionParams {\n    id: string;\n    permanently: boolean;\n}\n\n//\n// UseCase\n//\nexport interface IDeletePageRevisionUseCase {\n    execute(params: DeletePageRevisionParams): Promise<void>;\n}\n\nexport const DeletePageRevisionUseCase = createAbstraction<IDeletePageRevisionUseCase>(\n    \"WebsiteBuilder/DeletePageRevisionUseCase\"\n);\n\nexport namespace DeletePageRevisionUseCase {\n    export type Interface = IDeletePageRevisionUseCase;\n    export type Params = DeletePageRevisionParams;\n}\n\n//\n// Repository\n//\nexport interface IDeletePageRevisionRepository {\n    execute(page: Page, permanently: boolean): Promise<void>;\n}\n\nexport const DeletePageRevisionRepository = createAbstraction<IDeletePageRevisionRepository>(\n    \"WebsiteBuilder/DeletePageRevisionRepository\"\n);\n\nexport namespace DeletePageRevisionRepository {\n    export type Interface = IDeletePageRevisionRepository;\n}\n\n//\n// Gateway\n//\nexport interface IDeletePageRevisionGateway {\n    execute(id: string, permanently: boolean): Promise<void>;\n}\n\nexport const DeletePageRevisionGateway = createAbstraction<IDeletePageRevisionGateway>(\n    \"WebsiteBuilder/DeletePageRevisionGateway\"\n);\n\nexport namespace DeletePageRevisionGateway {\n    export type Interface = IDeletePageRevisionGateway;\n}\n"],"names":["DeletePageRevisionUseCase","createAbstraction","DeletePageRevisionRepository","DeletePageRevisionGateway"],"mappings":";AAkBO,MAAMA,4BAA4BC,kBACrC;AAeG,MAAMC,+BAA+BD,kBACxC;AAcG,MAAME,4BAA4BF,kBACrC"}
+{"version":3,"file":"features/pages/deletePageRevision/abstractions.js","sources":["../../../../src/features/pages/deletePageRevision/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { Page } from \"~/domain/Page/Page.js\";\n\n//\n// Params\n//\nexport interface DeletePageRevisionParams {\n    id: string;\n}\n\n//\n// UseCase\n//\nexport interface IDeletePageRevisionUseCase {\n    execute(params: DeletePageRevisionParams): Promise<void>;\n}\n\nexport const DeletePageRevisionUseCase = createAbstraction<IDeletePageRevisionUseCase>(\n    \"WebsiteBuilder/DeletePageRevisionUseCase\"\n);\n\nexport namespace DeletePageRevisionUseCase {\n    export type Interface = IDeletePageRevisionUseCase;\n    export type Params = DeletePageRevisionParams;\n}\n\n//\n// Repository\n//\nexport interface IDeletePageRevisionRepository {\n    execute(page: Page): Promise<void>;\n}\n\nexport const DeletePageRevisionRepository = createAbstraction<IDeletePageRevisionRepository>(\n    \"WebsiteBuilder/DeletePageRevisionRepository\"\n);\n\nexport namespace DeletePageRevisionRepository {\n    export type Interface = IDeletePageRevisionRepository;\n}\n\n//\n// Gateway\n//\nexport interface IDeletePageRevisionGateway {\n    execute(id: string): Promise<void>;\n}\n\nexport const DeletePageRevisionGateway = createAbstraction<IDeletePageRevisionGateway>(\n    \"WebsiteBuilder/DeletePageRevisionGateway\"\n);\n\nexport namespace DeletePageRevisionGateway {\n    export type Interface = IDeletePageRevisionGateway;\n}\n"],"names":["DeletePageRevisionUseCase","createAbstraction","DeletePageRevisionRepository","DeletePageRevisionGateway"],"mappings":";AAiBO,MAAMA,4BAA4BC,kBACrC;AAeG,MAAMC,+BAA+BD,kBACxC;AAcG,MAAME,4BAA4BF,kBACrC"}

package/features/pages/getPage/PageGatewayDto.d.ts

@@ -4,6 +4,8 @@ export interface PageGatewayDto {
     id: string;
     entryId: string;
     status: WbStatus;
+    version: number;
+    locked: boolean;
     location: WbLocation;
     properties: Record<string, any>;
     metadata: Record<string, any>;

package/features/pages/publishPage/PublishPage.test.js

@@ -2,10 +2,11 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import { Container } from "@webiny/di";
 import { WbPageStatus } from "../../../constants.js";
 import { Page, fullPageCache, pageListCache } from "../../../domain/Page/index.js";
+import { PageRevision, pageRevisionsCacheFactory } from "../../../domain/PageRevision/index.js";
 import { PublishPageGateway, PublishPageUseCase } from "./abstractions.js";
 import { PublishPageUseCase as external_PublishPageUseCase_js_PublishPageUseCase } from "./PublishPageUseCase.js";
 import { PublishPageRepository } from "./PublishPageRepository.js";
-import { FullPageCache, PageListCache } from "../shared/abstractions.js";
+import { FullPageCache, PageListCache, PageRevisionsCache } from "../shared/abstractions.js";
 describe("PublishPage", ()=>{
     const gateway = {
         execute: vi.fn().mockResolvedValue({
@@ -90,6 +91,7 @@ describe("PublishPage", ()=>{
         const container = new Container();
         container.registerInstance(PageListCache, pagesCache);
         container.registerInstance(FullPageCache, fullPageCache);
+        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());
         container.registerInstance(PublishPageGateway, gateway);
         container.register(PublishPageRepository).inSingletonScope();
         container.register(external_PublishPageUseCase_js_PublishPageUseCase);
@@ -124,6 +126,7 @@ describe("PublishPage", ()=>{
         const container = new Container();
         container.registerInstance(PageListCache, pagesCache);
         container.registerInstance(FullPageCache, fullPageCache);
+        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());
         container.registerInstance(PublishPageGateway, gateway);
         container.register(PublishPageRepository).inSingletonScope();
         container.register(external_PublishPageUseCase_js_PublishPageUseCase);
@@ -136,6 +139,43 @@ describe("PublishPage", ()=>{
         expect(publishedItem?.id).toEqual("page-1#0001");
         expect(publishedItem?.status).toEqual(WbPageStatus.Draft);
     });
+    it("should publish the revision and unpublish the previously published one", async ()=>{
+        const revisionsCache = pageRevisionsCacheFactory.getCache();
+        revisionsCache.clear();
+        const makeRevision = (id, version, status)=>PageRevision.create({
+                id,
+                entryId: "page-1",
+                version,
+                status,
+                savedOn: "2026-09-21T00:00:00.000Z",
+                title: "Page 1",
+                locked: false,
+                createdBy: {
+                    id: "admin",
+                    displayName: "Admin",
+                    type: "admin"
+                },
+                createdOn: "2026-09-21T00:00:00.000Z",
+                revisionDescription: void 0
+            });
+        revisionsCache.addItems([
+            makeRevision("page-1#0001", 1, WbPageStatus.Draft),
+            makeRevision("page-1#0002", 2, WbPageStatus.Published)
+        ]);
+        const container = new Container();
+        container.registerInstance(PageListCache, pagesCache);
+        container.registerInstance(FullPageCache, fullPageCache);
+        container.registerInstance(PageRevisionsCache, revisionsCache);
+        container.registerInstance(PublishPageGateway, gateway);
+        container.register(PublishPageRepository).inSingletonScope();
+        container.register(external_PublishPageUseCase_js_PublishPageUseCase);
+        const publishPage = container.resolve(PublishPageUseCase);
+        await publishPage.execute({
+            id: "page-1#0001"
+        });
+        expect(revisionsCache.getItem((r)=>"page-1#0001" === r.id)?.status).toEqual(WbPageStatus.Published);
+        expect(revisionsCache.getItem((r)=>"page-1#0002" === r.id)?.status).toEqual(WbPageStatus.Unpublished);
+    });
 });
 
 //# sourceMappingURL=PublishPage.test.js.map

package/features/pages/publishPage/PublishPage.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/pages/publishPage/PublishPage.test.js","sources":["../../../../src/features/pages/publishPage/PublishPage.test.ts"],"sourcesContent":["import { describe, it, expect, beforeEach, vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { WbPageStatus } from \"~/constants.js\";\nimport { Page, pageListCache, fullPageCache } from \"~/domain/Page/index.js\";\nimport {\n    PublishPageUseCase as UseCaseAbstraction,\n    PublishPageGateway as GatewayAbstraction\n} from \"./abstractions.js\";\nimport { PublishPageUseCase } from \"./PublishPageUseCase.js\";\nimport { PublishPageRepository } from \"./PublishPageRepository.js\";\nimport { PageListCache, FullPageCache } from \"~/features/pages/shared/abstractions.js\";\n\ndescribe(\"PublishPage\", () => {\n    const gateway = {\n        execute: vi.fn().mockResolvedValue({\n            id: \"page-1#0001\",\n            entryId: \"page-1\",\n            status: WbPageStatus.Published,\n            location: {\n                folderId: \"folder-1\"\n            },\n            properties: {\n                title: \"Page 1\"\n            },\n            metadata: {\n                metadata: \"data-1\"\n            },\n            elements: {\n                element1: \"element\"\n            },\n            bindings: {\n                data: \"any-data\"\n            },\n            extensions: {\n                ext1: \"ext-data\"\n            }\n        })\n    };\n\n    const pagesCache = pageListCache;\n    const detailsCache = fullPageCache;\n\n    beforeEach(() => {\n        vi.clearAllMocks();\n        pagesCache.clear();\n        detailsCache.clear();\n        pagesCache.addItems([\n            Page.create({\n                id: \"page-1#0001\",\n                entryId: \"page-1\",\n                status: WbPageStatus.Draft,\n                location: {\n                    folderId: \"folder-1\"\n                },\n                properties: {\n                    title: \"Page 1\"\n                },\n                metadata: {\n                    metadata: \"data-1\"\n                },\n                elements: {\n                    element1: \"element\"\n                },\n                bindings: {\n                    data: \"any-data\"\n                }\n            })\n        ]);\n        detailsCache.addItems([\n            Page.create({\n                id: \"page-1#0001\",\n                entryId: \"page-1\",\n                status: WbPageStatus.Draft,\n                location: {\n                    folderId: \"folder-1\"\n                },\n                properties: {\n                    title: \"Page 1\"\n                },\n                metadata: {\n                    metadata: \"data-1\"\n                },\n                elements: {\n                    element1: \"element\"\n                },\n                bindings: {\n                    data: \"any-data\"\n                },\n                extensions: {\n                    ext1: \"ext-data\"\n                }\n            })\n        ]);\n    });\n\n    it(\"should be able to publish a page\", async () => {\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, fullPageCache);\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(PublishPageRepository).inSingletonScope();\n        container.register(PublishPageUseCase);\n\n        const publishPage = container.resolve(UseCaseAbstraction);\n\n        expect(pagesCache.hasItems()).toBeTrue();\n        const item = pagesCache.getItem(page => page.id === \"page-1#0001\");\n        expect(item?.id).toEqual(\"page-1#0001\");\n\n        await publishPage.execute({\n            id: \"page-1#0001\"\n        });\n\n        expect(gateway.execute).toHaveBeenCalledTimes(1);\n        expect(gateway.execute).toHaveBeenLastCalledWith(\"page-1#0001\");\n\n        expect(pagesCache.hasItems()).toBeTrue();\n        const publishedItem = pagesCache.getItem(page => page.entryId === \"page-1\");\n\n        expect(publishedItem?.id).toEqual(\"page-1#0001\");\n        expect(publishedItem?.status).toEqual(WbPageStatus.Published);\n\n        // Details cache is updated with the full gateway result including document fields\n        const detailItem = detailsCache.getItem(page => page.entryId === \"page-1\");\n        expect(detailItem).toBeDefined();\n        expect(detailItem?.id).toEqual(\"page-1#0001\");\n        expect(detailItem?.status).toEqual(WbPageStatus.Published);\n        expect(detailItem?.elements).toMatchObject({ element1: \"element\" });\n        expect(detailItem?.bindings).toMatchObject({ data: \"any-data\" });\n        expect(detailItem?.extensions).toMatchObject({ ext1: \"ext-data\" });\n    });\n\n    it(\"should not publish a page if id is missing\", async () => {\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, fullPageCache);\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(PublishPageRepository).inSingletonScope();\n        container.register(PublishPageUseCase);\n\n        const publishPage = container.resolve(UseCaseAbstraction);\n\n        await publishPage.execute({\n            id: \"\"\n        });\n\n        expect(gateway.execute).toHaveBeenCalledTimes(1);\n\n        const publishedItem = pagesCache.getItem(page => page.entryId === \"page-1\");\n\n        expect(publishedItem?.id).toEqual(\"page-1#0001\");\n        expect(publishedItem?.status).toEqual(WbPageStatus.Draft);\n    });\n});\n"],"names":["describe","gateway","vi","WbPageStatus","pagesCache","pageListCache","detailsCache","fullPageCache","beforeEach","Page","it","container","Container","PageListCache","FullPageCache","GatewayAbstraction","PublishPageRepository","PublishPageUseCase","publishPage","UseCaseAbstraction","expect","item","page","publishedItem","detailItem"],"mappings":"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"}
+{"version":3,"file":"features/pages/publishPage/PublishPage.test.js","sources":["../../../../src/features/pages/publishPage/PublishPage.test.ts"],"sourcesContent":["import { describe, it, expect, beforeEach, vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { WbPageStatus, type WbStatus } from \"~/constants.js\";\nimport { Page, pageListCache, fullPageCache } from \"~/domain/Page/index.js\";\nimport { PageRevision, pageRevisionsCacheFactory } from \"~/domain/PageRevision/index.js\";\nimport {\n    PublishPageUseCase as UseCaseAbstraction,\n    PublishPageGateway as GatewayAbstraction\n} from \"./abstractions.js\";\nimport { PublishPageUseCase } from \"./PublishPageUseCase.js\";\nimport { PublishPageRepository } from \"./PublishPageRepository.js\";\nimport {\n    PageListCache,\n    FullPageCache,\n    PageRevisionsCache\n} from \"~/features/pages/shared/abstractions.js\";\n\ndescribe(\"PublishPage\", () => {\n    const gateway = {\n        execute: vi.fn().mockResolvedValue({\n            id: \"page-1#0001\",\n            entryId: \"page-1\",\n            status: WbPageStatus.Published,\n            location: {\n                folderId: \"folder-1\"\n            },\n            properties: {\n                title: \"Page 1\"\n            },\n            metadata: {\n                metadata: \"data-1\"\n            },\n            elements: {\n                element1: \"element\"\n            },\n            bindings: {\n                data: \"any-data\"\n            },\n            extensions: {\n                ext1: \"ext-data\"\n            }\n        })\n    };\n\n    const pagesCache = pageListCache;\n    const detailsCache = fullPageCache;\n\n    beforeEach(() => {\n        vi.clearAllMocks();\n        pagesCache.clear();\n        detailsCache.clear();\n        pagesCache.addItems([\n            Page.create({\n                id: \"page-1#0001\",\n                entryId: \"page-1\",\n                status: WbPageStatus.Draft,\n                location: {\n                    folderId: \"folder-1\"\n                },\n                properties: {\n                    title: \"Page 1\"\n                },\n                metadata: {\n                    metadata: \"data-1\"\n                },\n                elements: {\n                    element1: \"element\"\n                },\n                bindings: {\n                    data: \"any-data\"\n                }\n            })\n        ]);\n        detailsCache.addItems([\n            Page.create({\n                id: \"page-1#0001\",\n                entryId: \"page-1\",\n                status: WbPageStatus.Draft,\n                location: {\n                    folderId: \"folder-1\"\n                },\n                properties: {\n                    title: \"Page 1\"\n                },\n                metadata: {\n                    metadata: \"data-1\"\n                },\n                elements: {\n                    element1: \"element\"\n                },\n                bindings: {\n                    data: \"any-data\"\n                },\n                extensions: {\n                    ext1: \"ext-data\"\n                }\n            })\n        ]);\n    });\n\n    it(\"should be able to publish a page\", async () => {\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, fullPageCache);\n        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(PublishPageRepository).inSingletonScope();\n        container.register(PublishPageUseCase);\n\n        const publishPage = container.resolve(UseCaseAbstraction);\n\n        expect(pagesCache.hasItems()).toBeTrue();\n        const item = pagesCache.getItem(page => page.id === \"page-1#0001\");\n        expect(item?.id).toEqual(\"page-1#0001\");\n\n        await publishPage.execute({\n            id: \"page-1#0001\"\n        });\n\n        expect(gateway.execute).toHaveBeenCalledTimes(1);\n        expect(gateway.execute).toHaveBeenLastCalledWith(\"page-1#0001\");\n\n        expect(pagesCache.hasItems()).toBeTrue();\n        const publishedItem = pagesCache.getItem(page => page.entryId === \"page-1\");\n\n        expect(publishedItem?.id).toEqual(\"page-1#0001\");\n        expect(publishedItem?.status).toEqual(WbPageStatus.Published);\n\n        // Details cache is updated with the full gateway result including document fields\n        const detailItem = detailsCache.getItem(page => page.entryId === \"page-1\");\n        expect(detailItem).toBeDefined();\n        expect(detailItem?.id).toEqual(\"page-1#0001\");\n        expect(detailItem?.status).toEqual(WbPageStatus.Published);\n        expect(detailItem?.elements).toMatchObject({ element1: \"element\" });\n        expect(detailItem?.bindings).toMatchObject({ data: \"any-data\" });\n        expect(detailItem?.extensions).toMatchObject({ ext1: \"ext-data\" });\n    });\n\n    it(\"should not publish a page if id is missing\", async () => {\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, fullPageCache);\n        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(PublishPageRepository).inSingletonScope();\n        container.register(PublishPageUseCase);\n\n        const publishPage = container.resolve(UseCaseAbstraction);\n\n        await publishPage.execute({\n            id: \"\"\n        });\n\n        expect(gateway.execute).toHaveBeenCalledTimes(1);\n\n        const publishedItem = pagesCache.getItem(page => page.entryId === \"page-1\");\n\n        expect(publishedItem?.id).toEqual(\"page-1#0001\");\n        expect(publishedItem?.status).toEqual(WbPageStatus.Draft);\n    });\n\n    it(\"should publish the revision and unpublish the previously published one\", async () => {\n        const revisionsCache = pageRevisionsCacheFactory.getCache();\n        revisionsCache.clear();\n\n        const makeRevision = (id: string, version: number, status: WbStatus) =>\n            PageRevision.create({\n                id,\n                entryId: \"page-1\",\n                version,\n                status,\n                savedOn: \"2026-09-21T00:00:00.000Z\",\n                title: \"Page 1\",\n                locked: false,\n                createdBy: { id: \"admin\", displayName: \"Admin\", type: \"admin\" },\n                createdOn: \"2026-09-21T00:00:00.000Z\",\n                revisionDescription: undefined\n            });\n\n        revisionsCache.addItems([\n            makeRevision(\"page-1#0001\", 1, WbPageStatus.Draft),\n            makeRevision(\"page-1#0002\", 2, WbPageStatus.Published)\n        ]);\n\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, fullPageCache);\n        container.registerInstance(PageRevisionsCache, revisionsCache);\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(PublishPageRepository).inSingletonScope();\n        container.register(PublishPageUseCase);\n\n        const publishPage = container.resolve(UseCaseAbstraction);\n\n        await publishPage.execute({ id: \"page-1#0001\" });\n\n        expect(revisionsCache.getItem(r => r.id === \"page-1#0001\")?.status).toEqual(\n            WbPageStatus.Published\n        );\n        expect(revisionsCache.getItem(r => r.id === \"page-1#0002\")?.status).toEqual(\n            WbPageStatus.Unpublished\n        );\n    });\n});\n"],"names":["describe","gateway","vi","WbPageStatus","pagesCache","pageListCache","detailsCache","fullPageCache","beforeEach","Page","it","container","Container","PageListCache","FullPageCache","PageRevisionsCache","pageRevisionsCacheFactory","GatewayAbstraction","PublishPageRepository","PublishPageUseCase","publishPage","UseCaseAbstraction","expect","item","page","publishedItem","detailItem","revisionsCache","makeRevision","id","version","status","PageRevision","undefined","r"],"mappings":";;;;;;;;;AAiBAA,SAAS,eAAe;IACpB,MAAMC,UAAU;QACZ,SAASC,GAAG,EAAE,GAAG,iBAAiB,CAAC;YAC/B,IAAI;YACJ,SAAS;YACT,QAAQC,aAAa,SAAS;YAC9B,UAAU;gBACN,UAAU;YACd;YACA,YAAY;gBACR,OAAO;YACX;YACA,UAAU;gBACN,UAAU;YACd;YACA,UAAU;gBACN,UAAU;YACd;YACA,UAAU;gBACN,MAAM;YACV;YACA,YAAY;gBACR,MAAM;YACV;QACJ;IACJ;IAEA,MAAMC,aAAaC;IACnB,MAAMC,eAAeC;IAErBC,WAAW;QACPN,GAAG,aAAa;QAChBE,WAAW,KAAK;QAChBE,aAAa,KAAK;QAClBF,WAAW,QAAQ,CAAC;YAChBK,KAAK,MAAM,CAAC;gBACR,IAAI;gBACJ,SAAS;gBACT,QAAQN,aAAa,KAAK;gBAC1B,UAAU;oBACN,UAAU;gBACd;gBACA,YAAY;oBACR,OAAO;gBACX;gBACA,UAAU;oBACN,UAAU;gBACd;gBACA,UAAU;oBACN,UAAU;gBACd;gBACA,UAAU;oBACN,MAAM;gBACV;YACJ;SACH;QACDG,aAAa,QAAQ,CAAC;YAClBG,KAAK,MAAM,CAAC;gBACR,IAAI;gBACJ,SAAS;gBACT,QAAQN,aAAa,KAAK;gBAC1B,UAAU;oBACN,UAAU;gBACd;gBACA,YAAY;oBACR,OAAO;gBACX;gBACA,UAAU;oBACN,UAAU;gBACd;gBACA,UAAU;oBACN,UAAU;gBACd;gBACA,UAAU;oBACN,MAAM;gBACV;gBACA,YAAY;oBACR,MAAM;gBACV;YACJ;SACH;IACL;IAEAO,GAAG,oCAAoC;QACnC,MAAMC,YAAY,IAAIC;QACtBD,UAAU,gBAAgB,CAACE,eAAeT;QAC1CO,UAAU,gBAAgB,CAACG,eAAeP;QAC1CI,UAAU,gBAAgB,CAACI,oBAAoBC,0BAA0B,QAAQ;QACjFL,UAAU,gBAAgB,CAACM,oBAAoBhB;QAC/CU,UAAU,QAAQ,CAACO,uBAAuB,gBAAgB;QAC1DP,UAAU,QAAQ,CAACQ;QAEnB,MAAMC,cAAcT,UAAU,OAAO,CAACU;QAEtCC,OAAOlB,WAAW,QAAQ,IAAI,QAAQ;QACtC,MAAMmB,OAAOnB,WAAW,OAAO,CAACoB,CAAAA,OAAQA,AAAY,kBAAZA,KAAK,EAAE;QAC/CF,OAAOC,MAAM,IAAI,OAAO,CAAC;QAEzB,MAAMH,YAAY,OAAO,CAAC;YACtB,IAAI;QACR;QAEAE,OAAOrB,QAAQ,OAAO,EAAE,qBAAqB,CAAC;QAC9CqB,OAAOrB,QAAQ,OAAO,EAAE,wBAAwB,CAAC;QAEjDqB,OAAOlB,WAAW,QAAQ,IAAI,QAAQ;QACtC,MAAMqB,gBAAgBrB,WAAW,OAAO,CAACoB,CAAAA,OAAQA,AAAiB,aAAjBA,KAAK,OAAO;QAE7DF,OAAOG,eAAe,IAAI,OAAO,CAAC;QAClCH,OAAOG,eAAe,QAAQ,OAAO,CAACtB,aAAa,SAAS;QAG5D,MAAMuB,aAAapB,aAAa,OAAO,CAACkB,CAAAA,OAAQA,AAAiB,aAAjBA,KAAK,OAAO;QAC5DF,OAAOI,YAAY,WAAW;QAC9BJ,OAAOI,YAAY,IAAI,OAAO,CAAC;QAC/BJ,OAAOI,YAAY,QAAQ,OAAO,CAACvB,aAAa,SAAS;QACzDmB,OAAOI,YAAY,UAAU,aAAa,CAAC;YAAE,UAAU;QAAU;QACjEJ,OAAOI,YAAY,UAAU,aAAa,CAAC;YAAE,MAAM;QAAW;QAC9DJ,OAAOI,YAAY,YAAY,aAAa,CAAC;YAAE,MAAM;QAAW;IACpE;IAEAhB,GAAG,8CAA8C;QAC7C,MAAMC,YAAY,IAAIC;QACtBD,UAAU,gBAAgB,CAACE,eAAeT;QAC1CO,UAAU,gBAAgB,CAACG,eAAeP;QAC1CI,UAAU,gBAAgB,CAACI,oBAAoBC,0BAA0B,QAAQ;QACjFL,UAAU,gBAAgB,CAACM,oBAAoBhB;QAC/CU,UAAU,QAAQ,CAACO,uBAAuB,gBAAgB;QAC1DP,UAAU,QAAQ,CAACQ;QAEnB,MAAMC,cAAcT,UAAU,OAAO,CAACU;QAEtC,MAAMD,YAAY,OAAO,CAAC;YACtB,IAAI;QACR;QAEAE,OAAOrB,QAAQ,OAAO,EAAE,qBAAqB,CAAC;QAE9C,MAAMwB,gBAAgBrB,WAAW,OAAO,CAACoB,CAAAA,OAAQA,AAAiB,aAAjBA,KAAK,OAAO;QAE7DF,OAAOG,eAAe,IAAI,OAAO,CAAC;QAClCH,OAAOG,eAAe,QAAQ,OAAO,CAACtB,aAAa,KAAK;IAC5D;IAEAO,GAAG,0EAA0E;QACzE,MAAMiB,iBAAiBX,0BAA0B,QAAQ;QACzDW,eAAe,KAAK;QAEpB,MAAMC,eAAe,CAACC,IAAYC,SAAiBC,SAC/CC,aAAa,MAAM,CAAC;gBAChBH;gBACA,SAAS;gBACTC;gBACAC;gBACA,SAAS;gBACT,OAAO;gBACP,QAAQ;gBACR,WAAW;oBAAE,IAAI;oBAAS,aAAa;oBAAS,MAAM;gBAAQ;gBAC9D,WAAW;gBACX,qBAAqBE;YACzB;QAEJN,eAAe,QAAQ,CAAC;YACpBC,aAAa,eAAe,GAAGzB,aAAa,KAAK;YACjDyB,aAAa,eAAe,GAAGzB,aAAa,SAAS;SACxD;QAED,MAAMQ,YAAY,IAAIC;QACtBD,UAAU,gBAAgB,CAACE,eAAeT;QAC1CO,UAAU,gBAAgB,CAACG,eAAeP;QAC1CI,UAAU,gBAAgB,CAACI,oBAAoBY;QAC/ChB,UAAU,gBAAgB,CAACM,oBAAoBhB;QAC/CU,UAAU,QAAQ,CAACO,uBAAuB,gBAAgB;QAC1DP,UAAU,QAAQ,CAACQ;QAEnB,MAAMC,cAAcT,UAAU,OAAO,CAACU;QAEtC,MAAMD,YAAY,OAAO,CAAC;YAAE,IAAI;QAAc;QAE9CE,OAAOK,eAAe,OAAO,CAACO,CAAAA,IAAKA,AAAS,kBAATA,EAAE,EAAE,GAAqB,QAAQ,OAAO,CACvE/B,aAAa,SAAS;QAE1BmB,OAAOK,eAAe,OAAO,CAACO,CAAAA,IAAKA,AAAS,kBAATA,EAAE,EAAE,GAAqB,QAAQ,OAAO,CACvE/B,aAAa,WAAW;IAEhC;AACJ"}

package/features/pages/publishPage/PublishPageRepository.d.ts

@@ -1,11 +1,12 @@
 import { PublishPageRepository as RepositoryAbstraction, PublishPageGateway } from "./abstractions.js";
 import { Page } from "../../../domain/Page/Page.js";
-import { PageListCache, FullPageCache } from "../../../features/pages/shared/abstractions.js";
+import { PageListCache, FullPageCache, PageRevisionsCache } from "../../../features/pages/shared/abstractions.js";
 declare class PublishPageRepositoryImpl implements RepositoryAbstraction.Interface {
     private listCache;
     private detailsCache;
+    private revisionsCache;
     private gateway;
-    constructor(listCache: PageListCache.Interface, detailsCache: FullPageCache.Interface, gateway: PublishPageGateway.Interface);
+    constructor(listCache: PageListCache.Interface, detailsCache: FullPageCache.Interface, revisionsCache: PageRevisionsCache.Interface, gateway: PublishPageGateway.Interface);
     execute(page: Page): Promise<void>;
 }
 export declare const PublishPageRepository: typeof PublishPageRepositoryImpl & {

package/features/pages/publishPage/PublishPageRepository.js

@@ -1,22 +1,32 @@
 import { PublishPageGateway, PublishPageRepository } from "./abstractions.js";
 import { Page } from "../../../domain/Page/Page.js";
-import { FullPageCache, PageListCache } from "../shared/abstractions.js";
+import { PageRevision } from "../../../domain/PageRevision/PageRevision.js";
+import { WbPageStatus } from "../../../constants.js";
+import { FullPageCache, PageListCache, PageRevisionsCache } from "../shared/abstractions.js";
 class PublishPageRepositoryImpl {
-    constructor(listCache, detailsCache, gateway){
+    constructor(listCache, detailsCache, revisionsCache, gateway){
         this.listCache = listCache;
         this.detailsCache = detailsCache;
+        this.revisionsCache = revisionsCache;
         this.gateway = gateway;
     }
     async execute(page) {
         const result = await this.gateway.execute(page.id);
+        const publishedPage = Page.create(result);
         this.listCache.updateItems((existingPage)=>{
-            if (existingPage.id === page.id) return Page.create(result);
+            if (existingPage.id === page.id) return publishedPage;
             return existingPage;
         });
         this.detailsCache.updateItems((existingPage)=>{
-            if (existingPage.id === page.id) return Page.create(result);
+            if (existingPage.id === page.id) return publishedPage;
             return existingPage;
         });
+        const publishedRevision = PageRevision.createFromPage(publishedPage);
+        this.revisionsCache.updateItems((revision)=>{
+            if (revision.id === publishedPage.id) return publishedRevision;
+            if (revision.entryId === publishedPage.entryId && revision.status === WbPageStatus.Published) return revision.withStatus(WbPageStatus.Unpublished);
+            return revision;
+        });
     }
 }
 const PublishPageRepository_PublishPageRepository = PublishPageRepository.createImplementation({
@@ -24,6 +34,7 @@ const PublishPageRepository_PublishPageRepository = PublishPageRepository.create
     dependencies: [
         PageListCache,
         FullPageCache,
+        PageRevisionsCache,
         PublishPageGateway
     ]
 });

package/features/pages/publishPage/PublishPageRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/pages/publishPage/PublishPageRepository.js","sources":["../../../../src/features/pages/publishPage/PublishPageRepository.ts"],"sourcesContent":["import {\n    PublishPageRepository as RepositoryAbstraction,\n    PublishPageGateway\n} from \"./abstractions.js\";\nimport { Page } from \"~/domain/Page/Page.js\";\nimport { PageListCache, FullPageCache } from \"~/features/pages/shared/abstractions.js\";\n\nclass PublishPageRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private listCache: PageListCache.Interface,\n        private detailsCache: FullPageCache.Interface,\n        private gateway: PublishPageGateway.Interface\n    ) {}\n\n    async execute(page: Page) {\n        const result = await this.gateway.execute(page.id);\n\n        this.listCache.updateItems(existingPage => {\n            if (existingPage.id === page.id) {\n                return Page.create(result);\n            }\n            return existingPage;\n        });\n\n        this.detailsCache.updateItems(existingPage => {\n            if (existingPage.id === page.id) {\n                return Page.create(result);\n            }\n            return existingPage;\n        });\n    }\n}\n\nexport const PublishPageRepository = RepositoryAbstraction.createImplementation({\n    implementation: PublishPageRepositoryImpl,\n    dependencies: [PageListCache, FullPageCache, PublishPageGateway]\n});\n"],"names":["PublishPageRepositoryImpl","listCache","detailsCache","gateway","page","result","existingPage","Page","PublishPageRepository","RepositoryAbstraction","PageListCache","FullPageCache","PublishPageGateway"],"mappings":";;;AAOA,MAAMA;IACF,YACYC,SAAkC,EAClCC,YAAqC,EACrCC,OAAqC,CAC/C;aAHUF,SAAS,GAATA;aACAC,YAAY,GAAZA;aACAC,OAAO,GAAPA;IACT;IAEH,MAAM,QAAQC,IAAU,EAAE;QACtB,MAAMC,SAAS,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACD,KAAK,EAAE;QAEjD,IAAI,CAAC,SAAS,CAAC,WAAW,CAACE,CAAAA;YACvB,IAAIA,aAAa,EAAE,KAAKF,KAAK,EAAE,EAC3B,OAAOG,KAAK,MAAM,CAACF;YAEvB,OAAOC;QACX;QAEA,IAAI,CAAC,YAAY,CAAC,WAAW,CAACA,CAAAA;YAC1B,IAAIA,aAAa,EAAE,KAAKF,KAAK,EAAE,EAC3B,OAAOG,KAAK,MAAM,CAACF;YAEvB,OAAOC;QACX;IACJ;AACJ;AAEO,MAAME,8CAAwBC,sBAAAA,oBAA0C,CAAC;IAC5E,gBAAgBT;IAChB,cAAc;QAACU;QAAeC;QAAeC;KAAmB;AACpE"}
+{"version":3,"file":"features/pages/publishPage/PublishPageRepository.js","sources":["../../../../src/features/pages/publishPage/PublishPageRepository.ts"],"sourcesContent":["import {\n    PublishPageRepository as RepositoryAbstraction,\n    PublishPageGateway\n} from \"./abstractions.js\";\nimport { Page } from \"~/domain/Page/Page.js\";\nimport { PageRevision } from \"~/domain/PageRevision/PageRevision.js\";\nimport { WbPageStatus } from \"~/constants.js\";\nimport {\n    PageListCache,\n    FullPageCache,\n    PageRevisionsCache\n} from \"~/features/pages/shared/abstractions.js\";\n\nclass PublishPageRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private listCache: PageListCache.Interface,\n        private detailsCache: FullPageCache.Interface,\n        private revisionsCache: PageRevisionsCache.Interface,\n        private gateway: PublishPageGateway.Interface\n    ) {}\n\n    async execute(page: Page) {\n        const result = await this.gateway.execute(page.id);\n        const publishedPage = Page.create(result);\n\n        this.listCache.updateItems(existingPage => {\n            if (existingPage.id === page.id) {\n                return publishedPage;\n            }\n            return existingPage;\n        });\n\n        this.detailsCache.updateItems(existingPage => {\n            if (existingPage.id === page.id) {\n                return publishedPage;\n            }\n            return existingPage;\n        });\n\n        const publishedRevision = PageRevision.createFromPage(publishedPage);\n\n        this.revisionsCache.updateItems(revision => {\n            if (revision.id === publishedPage.id) {\n                return publishedRevision;\n            }\n\n            // Only one revision of an entry can be published, so the previous one is now unpublished.\n            if (\n                revision.entryId === publishedPage.entryId &&\n                revision.status === WbPageStatus.Published\n            ) {\n                return revision.withStatus(WbPageStatus.Unpublished);\n            }\n\n            return revision;\n        });\n    }\n}\n\nexport const PublishPageRepository = RepositoryAbstraction.createImplementation({\n    implementation: PublishPageRepositoryImpl,\n    dependencies: [PageListCache, FullPageCache, PageRevisionsCache, PublishPageGateway]\n});\n"],"names":["PublishPageRepositoryImpl","listCache","detailsCache","revisionsCache","gateway","page","result","publishedPage","Page","existingPage","publishedRevision","PageRevision","revision","WbPageStatus","PublishPageRepository","RepositoryAbstraction","PageListCache","FullPageCache","PageRevisionsCache","PublishPageGateway"],"mappings":";;;;;AAaA,MAAMA;IACF,YACYC,SAAkC,EAClCC,YAAqC,EACrCC,cAA4C,EAC5CC,OAAqC,CAC/C;aAJUH,SAAS,GAATA;aACAC,YAAY,GAAZA;aACAC,cAAc,GAAdA;aACAC,OAAO,GAAPA;IACT;IAEH,MAAM,QAAQC,IAAU,EAAE;QACtB,MAAMC,SAAS,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACD,KAAK,EAAE;QACjD,MAAME,gBAAgBC,KAAK,MAAM,CAACF;QAElC,IAAI,CAAC,SAAS,CAAC,WAAW,CAACG,CAAAA;YACvB,IAAIA,aAAa,EAAE,KAAKJ,KAAK,EAAE,EAC3B,OAAOE;YAEX,OAAOE;QACX;QAEA,IAAI,CAAC,YAAY,CAAC,WAAW,CAACA,CAAAA;YAC1B,IAAIA,aAAa,EAAE,KAAKJ,KAAK,EAAE,EAC3B,OAAOE;YAEX,OAAOE;QACX;QAEA,MAAMC,oBAAoBC,aAAa,cAAc,CAACJ;QAEtD,IAAI,CAAC,cAAc,CAAC,WAAW,CAACK,CAAAA;YAC5B,IAAIA,SAAS,EAAE,KAAKL,cAAc,EAAE,EAChC,OAAOG;YAIX,IACIE,SAAS,OAAO,KAAKL,cAAc,OAAO,IAC1CK,SAAS,MAAM,KAAKC,aAAa,SAAS,EAE1C,OAAOD,SAAS,UAAU,CAACC,aAAa,WAAW;YAGvD,OAAOD;QACX;IACJ;AACJ;AAEO,MAAME,8CAAwBC,sBAAAA,oBAA0C,CAAC;IAC5E,gBAAgBf;IAChB,cAAc;QAACgB;QAAeC;QAAeC;QAAoBC;KAAmB;AACxF"}

package/features/pages/shared/pageGraphQLFields.js

@@ -3,6 +3,7 @@ const getPageGraphQLBaseFields = ()=>[
         "entryId",
         "status",
         "version",
+        "locked",
         `location {
             folderId
         }`,

package/features/pages/shared/pageGraphQLFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/pages/shared/pageGraphQLFields.js","sources":["../../../../src/features/pages/shared/pageGraphQLFields.ts"],"sourcesContent":["export const getPageGraphQLBaseFields = (): string[] => {\n    return [\n        `id`,\n        `entryId`,\n        `status`,\n        `version`,\n        `location {\n            folderId\n        }`,\n        `createdOn`,\n        `createdBy {\n            id\n            displayName\n        }`,\n        `savedOn`,\n        `savedBy {\n            id\n            displayName\n        }`,\n        `modifiedOn`,\n        `modifiedBy {\n            id\n            displayName\n        }`,\n        `live {\n            version\n        }\n        `,\n        `revisionDescription`\n    ];\n};\n\nexport const getPageGraphQLFields = (extraFields: string[]): string[] => {\n    return [...getPageGraphQLBaseFields(), ...extraFields];\n};\n"],"names":["getPageGraphQLBaseFields","getPageGraphQLFields","extraFields"],"mappings":"AAAO,MAAMA,2BAA2B,IAC7B;QACH;QACA;QACA;QACA;QACA,CAAC;;SAEA,CAAC;QACF;QACA,CAAC;;;SAGA,CAAC;QACF;QACA,CAAC;;;SAGA,CAAC;QACF;QACA,CAAC;;;SAGA,CAAC;QACF,CAAC;;;QAGD,CAAC;QACD;KACH;AAGE,MAAMC,uBAAuB,CAACC,cAC1B;WAAIF;WAA+BE;KAAY"}
+{"version":3,"file":"features/pages/shared/pageGraphQLFields.js","sources":["../../../../src/features/pages/shared/pageGraphQLFields.ts"],"sourcesContent":["export const getPageGraphQLBaseFields = (): string[] => {\n    return [\n        `id`,\n        `entryId`,\n        `status`,\n        `version`,\n        `locked`,\n        `location {\n            folderId\n        }`,\n        `createdOn`,\n        `createdBy {\n            id\n            displayName\n        }`,\n        `savedOn`,\n        `savedBy {\n            id\n            displayName\n        }`,\n        `modifiedOn`,\n        `modifiedBy {\n            id\n            displayName\n        }`,\n        `live {\n            version\n        }\n        `,\n        `revisionDescription`\n    ];\n};\n\nexport const getPageGraphQLFields = (extraFields: string[]): string[] => {\n    return [...getPageGraphQLBaseFields(), ...extraFields];\n};\n"],"names":["getPageGraphQLBaseFields","getPageGraphQLFields","extraFields"],"mappings":"AAAO,MAAMA,2BAA2B,IAC7B;QACH;QACA;QACA;QACA;QACA;QACA,CAAC;;SAEA,CAAC;QACF;QACA,CAAC;;;SAGA,CAAC;QACF;QACA,CAAC;;;SAGA,CAAC;QACF;QACA,CAAC;;;SAGA,CAAC;QACF,CAAC;;;QAGD,CAAC;QACD;KACH;AAGE,MAAMC,uBAAuB,CAACC,cAC1B;WAAIF;WAA+BE;KAAY"}

package/features/pages/unpublishPage/UnpublishPage.test.js

@@ -2,10 +2,11 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import { Container } from "@webiny/di";
 import { WbPageStatus } from "../../../constants.js";
 import { Page, fullPageCache, pageListCache } from "../../../domain/Page/index.js";
+import { pageRevisionsCacheFactory } from "../../../domain/PageRevision/index.js";
 import { UnpublishPageGateway, UnpublishPageUseCase } from "./abstractions.js";
 import { UnpublishPageUseCase as external_UnpublishPageUseCase_js_UnpublishPageUseCase } from "./UnpublishPageUseCase.js";
 import { UnpublishPageRepository } from "./UnpublishPageRepository.js";
-import { FullPageCache, PageListCache } from "../shared/abstractions.js";
+import { FullPageCache, PageListCache, PageRevisionsCache } from "../shared/abstractions.js";
 describe("UnpublishPage", ()=>{
     const gateway = {
         execute: vi.fn().mockResolvedValue({
@@ -84,6 +85,7 @@ describe("UnpublishPage", ()=>{
         const container = new Container();
         container.registerInstance(PageListCache, pagesCache);
         container.registerInstance(FullPageCache, detailsCache);
+        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());
         container.registerInstance(UnpublishPageGateway, gateway);
         container.register(UnpublishPageRepository).inSingletonScope();
         container.register(external_UnpublishPageUseCase_js_UnpublishPageUseCase);
@@ -118,6 +120,7 @@ describe("UnpublishPage", ()=>{
         const container = new Container();
         container.registerInstance(PageListCache, pagesCache);
         container.registerInstance(FullPageCache, detailsCache);
+        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());
         container.registerInstance(UnpublishPageGateway, gateway);
         container.register(UnpublishPageRepository).inSingletonScope();
         container.register(external_UnpublishPageUseCase_js_UnpublishPageUseCase);

package/features/pages/unpublishPage/UnpublishPage.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/pages/unpublishPage/UnpublishPage.test.js","sources":["../../../../src/features/pages/unpublishPage/UnpublishPage.test.ts"],"sourcesContent":["import { describe, it, expect, beforeEach, vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { WbPageStatus } from \"~/constants.js\";\nimport { Page, pageListCache, fullPageCache } from \"~/domain/Page/index.js\";\nimport {\n    UnpublishPageUseCase as UseCaseAbstraction,\n    UnpublishPageGateway as GatewayAbstraction\n} from \"./abstractions.js\";\nimport { UnpublishPageUseCase } from \"./UnpublishPageUseCase.js\";\nimport { UnpublishPageRepository } from \"./UnpublishPageRepository.js\";\nimport { PageListCache, FullPageCache } from \"~/features/pages/shared/abstractions.js\";\n\ndescribe(\"UnpublishPage\", () => {\n    const gateway = {\n        execute: vi.fn().mockResolvedValue({\n            id: \"page-1#0001\",\n            entryId: \"page-1\",\n            status: WbPageStatus.Unpublished,\n            location: {\n                folderId: \"folder-1\"\n            },\n            properties: {\n                title: \"Page 1\"\n            },\n            metadata: {\n                metadata: \"data-1\"\n            },\n            elements: {\n                element1: \"element\"\n            },\n            bindings: {\n                data: \"any-data\"\n            },\n            extensions: {\n                ext1: \"ext-data\"\n            }\n        })\n    };\n\n    const pagesCache = pageListCache;\n    const detailsCache = fullPageCache;\n\n    beforeEach(() => {\n        vi.clearAllMocks();\n        pagesCache.clear();\n        detailsCache.clear();\n        pagesCache.addItems([\n            Page.create({\n                id: \"page-1#0001\",\n                entryId: \"page-1\",\n                status: WbPageStatus.Published,\n                location: {\n                    folderId: \"folder-1\"\n                },\n                properties: {\n                    title: \"Page 1\"\n                },\n                elements: {\n                    element1: \"element\"\n                },\n                bindings: {\n                    data: \"any-data\"\n                }\n            })\n        ]);\n        detailsCache.addItems([\n            Page.create({\n                id: \"page-1#0001\",\n                entryId: \"page-1\",\n                status: WbPageStatus.Published,\n                location: {\n                    folderId: \"folder-1\"\n                },\n                properties: {\n                    title: \"Page 1\"\n                },\n                elements: {\n                    element1: \"element\"\n                },\n                bindings: {\n                    data: \"any-data\"\n                },\n                extensions: {\n                    ext1: \"ext-data\"\n                }\n            })\n        ]);\n    });\n\n    it(\"should be able to unpublish a page\", async () => {\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, detailsCache);\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(UnpublishPageRepository).inSingletonScope();\n        container.register(UnpublishPageUseCase);\n\n        const unpublishPage = container.resolve(UseCaseAbstraction);\n\n        expect(pagesCache.hasItems()).toBeTrue();\n        const item = pagesCache.getItem(page => page.id === \"page-1#0001\");\n        expect(item?.id).toEqual(\"page-1#0001\");\n\n        await unpublishPage.execute({\n            id: \"page-1#0001\"\n        });\n\n        expect(gateway.execute).toHaveBeenCalledTimes(1);\n        expect(gateway.execute).toHaveBeenLastCalledWith(\"page-1#0001\");\n\n        expect(pagesCache.hasItems()).toBeTrue();\n        const publishedItem = pagesCache.getItem(page => page.entryId === \"page-1\");\n\n        expect(publishedItem?.id).toEqual(\"page-1#0001\");\n        expect(publishedItem?.status).toEqual(WbPageStatus.Unpublished);\n\n        // Details cache is updated with the full gateway result including document fields\n        const detailItem = detailsCache.getItem(page => page.entryId === \"page-1\");\n        expect(detailItem).toBeDefined();\n        expect(detailItem?.id).toEqual(\"page-1#0001\");\n        expect(detailItem?.status).toEqual(WbPageStatus.Unpublished);\n        expect(detailItem?.elements).toMatchObject({ element1: \"element\" });\n        expect(detailItem?.bindings).toMatchObject({ data: \"any-data\" });\n        expect(detailItem?.extensions).toMatchObject({ ext1: \"ext-data\" });\n    });\n\n    it(\"should not unpublish a page if id is missing\", async () => {\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, detailsCache);\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(UnpublishPageRepository).inSingletonScope();\n        container.register(UnpublishPageUseCase);\n\n        const unpublishPage = container.resolve(UseCaseAbstraction);\n\n        await unpublishPage.execute({\n            id: \"\"\n        });\n\n        expect(gateway.execute).toHaveBeenCalledTimes(1);\n\n        const publishedItem = pagesCache.getItem(page => page.entryId === \"page-1\");\n\n        expect(publishedItem?.id).toEqual(\"page-1#0001\");\n        expect(publishedItem?.status).toEqual(WbPageStatus.Published);\n    });\n});\n"],"names":["describe","gateway","vi","WbPageStatus","pagesCache","pageListCache","detailsCache","fullPageCache","beforeEach","Page","it","container","Container","PageListCache","FullPageCache","GatewayAbstraction","UnpublishPageRepository","UnpublishPageUseCase","unpublishPage","UseCaseAbstraction","expect","item","page","publishedItem","detailItem"],"mappings":"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"}
+{"version":3,"file":"features/pages/unpublishPage/UnpublishPage.test.js","sources":["../../../../src/features/pages/unpublishPage/UnpublishPage.test.ts"],"sourcesContent":["import { describe, it, expect, beforeEach, vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { WbPageStatus } from \"~/constants.js\";\nimport { Page, pageListCache, fullPageCache } from \"~/domain/Page/index.js\";\nimport { pageRevisionsCacheFactory } from \"~/domain/PageRevision/index.js\";\nimport {\n    UnpublishPageUseCase as UseCaseAbstraction,\n    UnpublishPageGateway as GatewayAbstraction\n} from \"./abstractions.js\";\nimport { UnpublishPageUseCase } from \"./UnpublishPageUseCase.js\";\nimport { UnpublishPageRepository } from \"./UnpublishPageRepository.js\";\nimport {\n    PageListCache,\n    FullPageCache,\n    PageRevisionsCache\n} from \"~/features/pages/shared/abstractions.js\";\n\ndescribe(\"UnpublishPage\", () => {\n    const gateway = {\n        execute: vi.fn().mockResolvedValue({\n            id: \"page-1#0001\",\n            entryId: \"page-1\",\n            status: WbPageStatus.Unpublished,\n            location: {\n                folderId: \"folder-1\"\n            },\n            properties: {\n                title: \"Page 1\"\n            },\n            metadata: {\n                metadata: \"data-1\"\n            },\n            elements: {\n                element1: \"element\"\n            },\n            bindings: {\n                data: \"any-data\"\n            },\n            extensions: {\n                ext1: \"ext-data\"\n            }\n        })\n    };\n\n    const pagesCache = pageListCache;\n    const detailsCache = fullPageCache;\n\n    beforeEach(() => {\n        vi.clearAllMocks();\n        pagesCache.clear();\n        detailsCache.clear();\n        pagesCache.addItems([\n            Page.create({\n                id: \"page-1#0001\",\n                entryId: \"page-1\",\n                status: WbPageStatus.Published,\n                location: {\n                    folderId: \"folder-1\"\n                },\n                properties: {\n                    title: \"Page 1\"\n                },\n                elements: {\n                    element1: \"element\"\n                },\n                bindings: {\n                    data: \"any-data\"\n                }\n            })\n        ]);\n        detailsCache.addItems([\n            Page.create({\n                id: \"page-1#0001\",\n                entryId: \"page-1\",\n                status: WbPageStatus.Published,\n                location: {\n                    folderId: \"folder-1\"\n                },\n                properties: {\n                    title: \"Page 1\"\n                },\n                elements: {\n                    element1: \"element\"\n                },\n                bindings: {\n                    data: \"any-data\"\n                },\n                extensions: {\n                    ext1: \"ext-data\"\n                }\n            })\n        ]);\n    });\n\n    it(\"should be able to unpublish a page\", async () => {\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, detailsCache);\n        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(UnpublishPageRepository).inSingletonScope();\n        container.register(UnpublishPageUseCase);\n\n        const unpublishPage = container.resolve(UseCaseAbstraction);\n\n        expect(pagesCache.hasItems()).toBeTrue();\n        const item = pagesCache.getItem(page => page.id === \"page-1#0001\");\n        expect(item?.id).toEqual(\"page-1#0001\");\n\n        await unpublishPage.execute({\n            id: \"page-1#0001\"\n        });\n\n        expect(gateway.execute).toHaveBeenCalledTimes(1);\n        expect(gateway.execute).toHaveBeenLastCalledWith(\"page-1#0001\");\n\n        expect(pagesCache.hasItems()).toBeTrue();\n        const publishedItem = pagesCache.getItem(page => page.entryId === \"page-1\");\n\n        expect(publishedItem?.id).toEqual(\"page-1#0001\");\n        expect(publishedItem?.status).toEqual(WbPageStatus.Unpublished);\n\n        // Details cache is updated with the full gateway result including document fields\n        const detailItem = detailsCache.getItem(page => page.entryId === \"page-1\");\n        expect(detailItem).toBeDefined();\n        expect(detailItem?.id).toEqual(\"page-1#0001\");\n        expect(detailItem?.status).toEqual(WbPageStatus.Unpublished);\n        expect(detailItem?.elements).toMatchObject({ element1: \"element\" });\n        expect(detailItem?.bindings).toMatchObject({ data: \"any-data\" });\n        expect(detailItem?.extensions).toMatchObject({ ext1: \"ext-data\" });\n    });\n\n    it(\"should not unpublish a page if id is missing\", async () => {\n        const container = new Container();\n        container.registerInstance(PageListCache, pagesCache);\n        container.registerInstance(FullPageCache, detailsCache);\n        container.registerInstance(PageRevisionsCache, pageRevisionsCacheFactory.getCache());\n        container.registerInstance(GatewayAbstraction, gateway);\n        container.register(UnpublishPageRepository).inSingletonScope();\n        container.register(UnpublishPageUseCase);\n\n        const unpublishPage = container.resolve(UseCaseAbstraction);\n\n        await unpublishPage.execute({\n            id: \"\"\n        });\n\n        expect(gateway.execute).toHaveBeenCalledTimes(1);\n\n        const publishedItem = pagesCache.getItem(page => page.entryId === \"page-1\");\n\n        expect(publishedItem?.id).toEqual(\"page-1#0001\");\n        expect(publishedItem?.status).toEqual(WbPageStatus.Published);\n    });\n});\n"],"names":["describe","gateway","vi","WbPageStatus","pagesCache","pageListCache","detailsCache","fullPageCache","beforeEach","Page","it","container","Container","PageListCache","FullPageCache","PageRevisionsCache","pageRevisionsCacheFactory","GatewayAbstraction","UnpublishPageRepository","UnpublishPageUseCase","unpublishPage","UseCaseAbstraction","expect","item","page","publishedItem","detailItem"],"mappings":"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"}

package/features/pages/unpublishPage/UnpublishPageRepository.d.ts

@@ -1,11 +1,12 @@
 import { UnpublishPageRepository as RepositoryAbstraction, UnpublishPageGateway } from "./abstractions.js";
 import { Page } from "../../../domain/Page/Page.js";
-import { PageListCache, FullPageCache } from "../../../features/pages/shared/abstractions.js";
+import { PageListCache, FullPageCache, PageRevisionsCache } from "../../../features/pages/shared/abstractions.js";
 declare class UnpublishPageRepositoryImpl implements RepositoryAbstraction.Interface {
     private listCache;
     private detailsCache;
+    private revisionsCache;
     private gateway;
-    constructor(listCache: PageListCache.Interface, detailsCache: FullPageCache.Interface, gateway: UnpublishPageGateway.Interface);
+    constructor(listCache: PageListCache.Interface, detailsCache: FullPageCache.Interface, revisionsCache: PageRevisionsCache.Interface, gateway: UnpublishPageGateway.Interface);
     execute(page: Page): Promise<void>;
 }
 export declare const UnpublishPageRepository: typeof UnpublishPageRepositoryImpl & {

package/features/pages/unpublishPage/UnpublishPageRepository.js

@@ -1,22 +1,29 @@
 import { UnpublishPageGateway, UnpublishPageRepository } from "./abstractions.js";
 import { Page } from "../../../domain/Page/Page.js";
-import { FullPageCache, PageListCache } from "../shared/abstractions.js";
+import { PageRevision } from "../../../domain/PageRevision/PageRevision.js";
+import { FullPageCache, PageListCache, PageRevisionsCache } from "../shared/abstractions.js";
 class UnpublishPageRepositoryImpl {
-    constructor(listCache, detailsCache, gateway){
+    constructor(listCache, detailsCache, revisionsCache, gateway){
         this.listCache = listCache;
         this.detailsCache = detailsCache;
+        this.revisionsCache = revisionsCache;
         this.gateway = gateway;
     }
     async execute(page) {
         const result = await this.gateway.execute(page.id);
+        const unpublishedPage = Page.create(result);
         this.listCache.updateItems((existingPage)=>{
-            if (existingPage.id === page.id) return Page.create(result);
+            if (existingPage.id === page.id) return unpublishedPage;
             return existingPage;
         });
         this.detailsCache.updateItems((existingPage)=>{
-            if (existingPage.id === page.id) return Page.create(result);
+            if (existingPage.id === page.id) return unpublishedPage;
             return existingPage;
         });
+        this.revisionsCache.updateItems((revision)=>{
+            if (revision.id === unpublishedPage.id) return PageRevision.createFromPage(unpublishedPage);
+            return revision;
+        });
     }
 }
 const UnpublishPageRepository_UnpublishPageRepository = UnpublishPageRepository.createImplementation({
@@ -24,6 +31,7 @@ const UnpublishPageRepository_UnpublishPageRepository = UnpublishPageRepository.
     dependencies: [
         PageListCache,
         FullPageCache,
+        PageRevisionsCache,
         UnpublishPageGateway
     ]
 });

package/features/pages/unpublishPage/UnpublishPageRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/pages/unpublishPage/UnpublishPageRepository.js","sources":["../../../../src/features/pages/unpublishPage/UnpublishPageRepository.ts"],"sourcesContent":["import {\n    UnpublishPageRepository as RepositoryAbstraction,\n    UnpublishPageGateway\n} from \"./abstractions.js\";\nimport { Page } from \"~/domain/Page/Page.js\";\nimport { PageListCache, FullPageCache } from \"~/features/pages/shared/abstractions.js\";\n\nclass UnpublishPageRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private listCache: PageListCache.Interface,\n        private detailsCache: FullPageCache.Interface,\n        private gateway: UnpublishPageGateway.Interface\n    ) {}\n\n    async execute(page: Page) {\n        const result = await this.gateway.execute(page.id);\n\n        this.listCache.updateItems(existingPage => {\n            if (existingPage.id === page.id) {\n                return Page.create(result);\n            }\n            return existingPage;\n        });\n\n        this.detailsCache.updateItems(existingPage => {\n            if (existingPage.id === page.id) {\n                return Page.create(result);\n            }\n            return existingPage;\n        });\n    }\n}\n\nexport const UnpublishPageRepository = RepositoryAbstraction.createImplementation({\n    implementation: UnpublishPageRepositoryImpl,\n    dependencies: [PageListCache, FullPageCache, UnpublishPageGateway]\n});\n"],"names":["UnpublishPageRepositoryImpl","listCache","detailsCache","gateway","page","result","existingPage","Page","UnpublishPageRepository","RepositoryAbstraction","PageListCache","FullPageCache","UnpublishPageGateway"],"mappings":";;;AAOA,MAAMA;IACF,YACYC,SAAkC,EAClCC,YAAqC,EACrCC,OAAuC,CACjD;aAHUF,SAAS,GAATA;aACAC,YAAY,GAAZA;aACAC,OAAO,GAAPA;IACT;IAEH,MAAM,QAAQC,IAAU,EAAE;QACtB,MAAMC,SAAS,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACD,KAAK,EAAE;QAEjD,IAAI,CAAC,SAAS,CAAC,WAAW,CAACE,CAAAA;YACvB,IAAIA,aAAa,EAAE,KAAKF,KAAK,EAAE,EAC3B,OAAOG,KAAK,MAAM,CAACF;YAEvB,OAAOC;QACX;QAEA,IAAI,CAAC,YAAY,CAAC,WAAW,CAACA,CAAAA;YAC1B,IAAIA,aAAa,EAAE,KAAKF,KAAK,EAAE,EAC3B,OAAOG,KAAK,MAAM,CAACF;YAEvB,OAAOC;QACX;IACJ;AACJ;AAEO,MAAME,kDAA0BC,wBAAAA,oBAA0C,CAAC;IAC9E,gBAAgBT;IAChB,cAAc;QAACU;QAAeC;QAAeC;KAAqB;AACtE"}
+{"version":3,"file":"features/pages/unpublishPage/UnpublishPageRepository.js","sources":["../../../../src/features/pages/unpublishPage/UnpublishPageRepository.ts"],"sourcesContent":["import {\n    UnpublishPageRepository as RepositoryAbstraction,\n    UnpublishPageGateway\n} from \"./abstractions.js\";\nimport { Page } from \"~/domain/Page/Page.js\";\nimport { PageRevision } from \"~/domain/PageRevision/PageRevision.js\";\nimport {\n    PageListCache,\n    FullPageCache,\n    PageRevisionsCache\n} from \"~/features/pages/shared/abstractions.js\";\n\nclass UnpublishPageRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private listCache: PageListCache.Interface,\n        private detailsCache: FullPageCache.Interface,\n        private revisionsCache: PageRevisionsCache.Interface,\n        private gateway: UnpublishPageGateway.Interface\n    ) {}\n\n    async execute(page: Page) {\n        const result = await this.gateway.execute(page.id);\n        const unpublishedPage = Page.create(result);\n\n        this.listCache.updateItems(existingPage => {\n            if (existingPage.id === page.id) {\n                return unpublishedPage;\n            }\n            return existingPage;\n        });\n\n        this.detailsCache.updateItems(existingPage => {\n            if (existingPage.id === page.id) {\n                return unpublishedPage;\n            }\n            return existingPage;\n        });\n\n        this.revisionsCache.updateItems(revision => {\n            if (revision.id === unpublishedPage.id) {\n                return PageRevision.createFromPage(unpublishedPage);\n            }\n            return revision;\n        });\n    }\n}\n\nexport const UnpublishPageRepository = RepositoryAbstraction.createImplementation({\n    implementation: UnpublishPageRepositoryImpl,\n    dependencies: [PageListCache, FullPageCache, PageRevisionsCache, UnpublishPageGateway]\n});\n"],"names":["UnpublishPageRepositoryImpl","listCache","detailsCache","revisionsCache","gateway","page","result","unpublishedPage","Page","existingPage","revision","PageRevision","UnpublishPageRepository","RepositoryAbstraction","PageListCache","FullPageCache","PageRevisionsCache","UnpublishPageGateway"],"mappings":";;;;AAYA,MAAMA;IACF,YACYC,SAAkC,EAClCC,YAAqC,EACrCC,cAA4C,EAC5CC,OAAuC,CACjD;aAJUH,SAAS,GAATA;aACAC,YAAY,GAAZA;aACAC,cAAc,GAAdA;aACAC,OAAO,GAAPA;IACT;IAEH,MAAM,QAAQC,IAAU,EAAE;QACtB,MAAMC,SAAS,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACD,KAAK,EAAE;QACjD,MAAME,kBAAkBC,KAAK,MAAM,CAACF;QAEpC,IAAI,CAAC,SAAS,CAAC,WAAW,CAACG,CAAAA;YACvB,IAAIA,aAAa,EAAE,KAAKJ,KAAK,EAAE,EAC3B,OAAOE;YAEX,OAAOE;QACX;QAEA,IAAI,CAAC,YAAY,CAAC,WAAW,CAACA,CAAAA;YAC1B,IAAIA,aAAa,EAAE,KAAKJ,KAAK,EAAE,EAC3B,OAAOE;YAEX,OAAOE;QACX;QAEA,IAAI,CAAC,cAAc,CAAC,WAAW,CAACC,CAAAA;YAC5B,IAAIA,SAAS,EAAE,KAAKH,gBAAgB,EAAE,EAClC,OAAOI,aAAa,cAAc,CAACJ;YAEvC,OAAOG;QACX;IACJ;AACJ;AAEO,MAAME,kDAA0BC,wBAAAA,oBAA0C,CAAC;IAC9E,gBAAgBb;IAChB,cAAc;QAACc;QAAeC;QAAeC;QAAoBC;KAAqB;AAC1F"}

package/inputRenderers/FileInput.js

@@ -4,7 +4,7 @@ import { FileManager } from "@webiny/app-admin";
 import { useBreakpoint } from "../BaseEditor/hooks/useBreakpoint.js";
 import { getAssetCropParam, normalizeToAsset } from "@webiny/website-builder-sdk";
 import { fileManagerItemToValue } from "../shared/fileManagerItemToValue.js";
-const isEditableImage = (asset)=>!!asset?.src && "string" == typeof asset.type && asset.type.startsWith("image/") && "image/svg+xml" !== asset.type;
+const isEditableImage = (asset)=>!!asset?.src && "string" == typeof asset.mimeType && asset.mimeType.startsWith("image/") && "image/svg+xml" !== asset.mimeType;
 const hasImageEdit = (image)=>{
     if (!image?.width || !image?.height) return false;
     const c = image.crop;

package/inputRenderers/FileInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"inputRenderers/FileInput.js","sources":["../../src/inputRenderers/FileInput.tsx"],"sourcesContent":["import React, { useState } from \"react\";\nimport {\n    FilePicker,\n    ImageEditor,\n    RichItemPreview,\n    getCroppedImageRenderStyles,\n    type ImageEditorValue\n} from \"@webiny/admin-ui\";\nimport type { ElementInputRendererProps } from \"~/BaseEditor/index.js\";\nimport { FileManager, type FileManagerFileItem } from \"@webiny/app-admin\";\nimport { useBreakpoint } from \"~/BaseEditor/hooks/useBreakpoint.js\";\nimport {\n    normalizeToAsset,\n    getAssetCropParam,\n    type Asset,\n    type AssetImage\n} from \"@webiny/website-builder-sdk\";\nimport type { FileInput } from \"@webiny/website-builder-sdk\";\nimport { fileManagerItemToValue } from \"~/shared/fileManagerItemToValue.js\";\n\nconst isEditableImage = (asset: Asset | undefined): asset is Asset => {\n    return (\n        !!asset?.src &&\n        typeof asset.type === \"string\" &&\n        asset.type.startsWith(\"image/\") &&\n        asset.type !== \"image/svg+xml\"\n    );\n};\n\n/** True when the image carries a non-trivial crop or focal point worth previewing. */\nconst hasImageEdit = (image: AssetImage | undefined): boolean => {\n    if (!image?.width || !image?.height) {\n        return false;\n    }\n    const c = image.crop;\n    const fullCrop = !c || (c.top === 0 && c.left === 0 && c.bottom === 0 && c.right === 0);\n    const fp = image.focalPoint;\n    const centeredFocal = !fp || (fp.x === 0.5 && fp.y === 0.5);\n    return !fullCrop || !centeredFocal;\n};\n\n/** Map the stored asset image into the shared `ImageEditor` value (focalPoint → hotspot). */\nconst toEditorValue = (image: AssetImage | undefined): ImageEditorValue | undefined => {\n    if (!image) {\n        return undefined;\n    }\n    return {\n        crop: image.crop,\n        hotspot: image.focalPoint\n            ? { x: image.focalPoint.x, y: image.focalPoint.y, width: 1, height: 1 }\n            : undefined,\n        alt: image.alt,\n        caption: image.caption\n    };\n};\n\nexport const FileInputRenderer = ({\n    value,\n    onChange,\n    label,\n    ...props\n}: ElementInputRendererProps) => {\n    const input = props.input as FileInput;\n    const { isBaseBreakpoint } = useBreakpoint();\n    const [editorOpen, setEditorOpen] = useState(false);\n\n    const asset = normalizeToAsset(value) ?? undefined;\n    const editable = isEditableImage(asset);\n\n    const onFileChange = (file: FileManagerFileItem) => {\n        onChange(({ value }) => {\n            value.set(fileManagerItemToValue(file));\n        });\n    };\n\n    const onRemove = () => {\n        onChange(({ value }) => {\n            if (isBaseBreakpoint) {\n                value.set(undefined);\n            } else {\n                value.set(null);\n            }\n        });\n    };\n\n    // Save the per-usage crop / focal point / alt override onto the element value,\n    // writing the unified asset shape (hotspot → focalPoint).\n    const onSaveEdit = (edit: ImageEditorValue) => {\n        onChange(({ value }) => {\n            if (!asset) {\n                return;\n            }\n            const image: AssetImage = {\n                width: asset.image?.width,\n                height: asset.image?.height,\n                crop: edit.crop,\n                focalPoint: edit.hotspot ? { x: edit.hotspot.x, y: edit.hotspot.y } : undefined,\n                alt: edit.alt,\n                caption: edit.caption\n            };\n            const updated = { ...asset, image };\n            const cropParam = getAssetCropParam(updated);\n            if (cropParam) {\n                const sep = asset.src.includes(\"?\") ? \"&\" : \"?\";\n                updated.url = `${asset.src}${sep}crop=${cropParam}`;\n            } else {\n                updated.url = asset.src;\n            }\n            value.set(updated);\n        });\n    };\n\n    return (\n        <FileManager\n            accept={input.allowedFileTypes}\n            onChange={onFileChange}\n            render={({ showFileManager }) => (\n                <>\n                    <FilePicker\n                        variant={\"secondary\"}\n                        label={label}\n                        description={input.description}\n                        type=\"compact\"\n                        value={asset?.src}\n                        // Reflect the per-usage crop + focal point in the thumbnail.\n                        renderFilePreview={\n                            editable && asset?.src && hasImageEdit(asset.image)\n                                ? previewProps => (\n                                      <RichItemPreview\n                                          {...previewProps}\n                                          renderImage={({ name }) => {\n                                              const { wrapper, image } =\n                                                  getCroppedImageRenderStyles(\n                                                      asset.image?.width ?? 0,\n                                                      asset.image?.height ?? 0,\n                                                      asset.image?.crop,\n                                                      asset.image?.focalPoint\n                                                          ? {\n                                                                x: asset.image.focalPoint.x,\n                                                                y: asset.image.focalPoint.y,\n                                                                width: 1,\n                                                                height: 1\n                                                            }\n                                                          : undefined,\n                                                      { boxWidth: 1, boxHeight: 1, fit: \"cover\" }\n                                                  );\n                                              return (\n                                                  <div style={wrapper}>\n                                                      <img\n                                                          src={asset.src as string}\n                                                          alt={name}\n                                                          draggable={false}\n                                                          style={image}\n                                                      />\n                                                  </div>\n                                              );\n                                          }}\n                                      />\n                                  )\n                                : undefined\n                        }\n                        onSelectItem={() => showFileManager()}\n                        onRemoveItem={onRemove}\n                        // The \"Edit\" (pencil) action edits the image (crop / focal\n                        // point / alt). Replacing the file is done by clicking the\n                        // preview. For non-images there is nothing to edit, so the\n                        // pencil is hidden.\n                        onEditItem={editable ? () => setEditorOpen(true) : undefined}\n                    />\n                    {editable ? (\n                        <ImageEditor\n                            open={editorOpen}\n                            onClose={() => setEditorOpen(false)}\n                            image={{\n                                src: asset.src,\n                                width: asset.image?.width ?? 0,\n                                height: asset.image?.height ?? 0\n                            }}\n                            value={toEditorValue(asset.image)}\n                            onSave={onSaveEdit}\n                        />\n                    ) : null}\n                </>\n            )}\n        />\n    );\n};\n"],"names":["isEditableImage","asset","hasImageEdit","image","c","fullCrop","fp","centeredFocal","toEditorValue","undefined","FileInputRenderer","value","onChange","label","props","input","isBaseBreakpoint","useBreakpoint","editorOpen","setEditorOpen","useState","normalizeToAsset","editable","onFileChange","file","fileManagerItemToValue","onRemove","onSaveEdit","edit","updated","cropParam","getAssetCropParam","sep","FileManager","showFileManager","FilePicker","previewProps","RichItemPreview","name","wrapper","getCroppedImageRenderStyles","ImageEditor"],"mappings":"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"}
+{"version":3,"file":"inputRenderers/FileInput.js","sources":["../../src/inputRenderers/FileInput.tsx"],"sourcesContent":["import React, { useState } from \"react\";\nimport {\n    FilePicker,\n    ImageEditor,\n    RichItemPreview,\n    getCroppedImageRenderStyles,\n    type ImageEditorValue\n} from \"@webiny/admin-ui\";\nimport type { ElementInputRendererProps } from \"~/BaseEditor/index.js\";\nimport { FileManager, type FileManagerFileItem } from \"@webiny/app-admin\";\nimport { useBreakpoint } from \"~/BaseEditor/hooks/useBreakpoint.js\";\nimport {\n    normalizeToAsset,\n    getAssetCropParam,\n    type Asset,\n    type AssetImage\n} from \"@webiny/website-builder-sdk\";\nimport type { FileInput } from \"@webiny/website-builder-sdk\";\nimport { fileManagerItemToValue } from \"~/shared/fileManagerItemToValue.js\";\n\nconst isEditableImage = (asset: Asset | undefined): asset is Asset => {\n    return (\n        !!asset?.src &&\n        typeof asset.mimeType === \"string\" &&\n        asset.mimeType.startsWith(\"image/\") &&\n        asset.mimeType !== \"image/svg+xml\"\n    );\n};\n\n/** True when the image carries a non-trivial crop or focal point worth previewing. */\nconst hasImageEdit = (image: AssetImage | undefined): boolean => {\n    if (!image?.width || !image?.height) {\n        return false;\n    }\n    const c = image.crop;\n    const fullCrop = !c || (c.top === 0 && c.left === 0 && c.bottom === 0 && c.right === 0);\n    const fp = image.focalPoint;\n    const centeredFocal = !fp || (fp.x === 0.5 && fp.y === 0.5);\n    return !fullCrop || !centeredFocal;\n};\n\n/** Map the stored asset image into the shared `ImageEditor` value (focalPoint → hotspot). */\nconst toEditorValue = (image: AssetImage | undefined): ImageEditorValue | undefined => {\n    if (!image) {\n        return undefined;\n    }\n    return {\n        crop: image.crop,\n        hotspot: image.focalPoint\n            ? { x: image.focalPoint.x, y: image.focalPoint.y, width: 1, height: 1 }\n            : undefined,\n        alt: image.alt,\n        caption: image.caption\n    };\n};\n\nexport const FileInputRenderer = ({\n    value,\n    onChange,\n    label,\n    ...props\n}: ElementInputRendererProps) => {\n    const input = props.input as FileInput;\n    const { isBaseBreakpoint } = useBreakpoint();\n    const [editorOpen, setEditorOpen] = useState(false);\n\n    const asset = normalizeToAsset(value) ?? undefined;\n    const editable = isEditableImage(asset);\n\n    const onFileChange = (file: FileManagerFileItem) => {\n        onChange(({ value }) => {\n            value.set(fileManagerItemToValue(file));\n        });\n    };\n\n    const onRemove = () => {\n        onChange(({ value }) => {\n            if (isBaseBreakpoint) {\n                value.set(undefined);\n            } else {\n                value.set(null);\n            }\n        });\n    };\n\n    // Save the per-usage crop / focal point / alt override onto the element value,\n    // writing the unified asset shape (hotspot → focalPoint).\n    const onSaveEdit = (edit: ImageEditorValue) => {\n        onChange(({ value }) => {\n            if (!asset) {\n                return;\n            }\n            const image: AssetImage = {\n                width: asset.image?.width,\n                height: asset.image?.height,\n                crop: edit.crop,\n                focalPoint: edit.hotspot ? { x: edit.hotspot.x, y: edit.hotspot.y } : undefined,\n                alt: edit.alt,\n                caption: edit.caption\n            };\n            const updated = { ...asset, image };\n            const cropParam = getAssetCropParam(updated);\n            if (cropParam) {\n                const sep = asset.src.includes(\"?\") ? \"&\" : \"?\";\n                updated.url = `${asset.src}${sep}crop=${cropParam}`;\n            } else {\n                updated.url = asset.src;\n            }\n            value.set(updated);\n        });\n    };\n\n    return (\n        <FileManager\n            accept={input.allowedFileTypes}\n            onChange={onFileChange}\n            render={({ showFileManager }) => (\n                <>\n                    <FilePicker\n                        variant={\"secondary\"}\n                        label={label}\n                        description={input.description}\n                        type=\"compact\"\n                        value={asset?.src}\n                        // Reflect the per-usage crop + focal point in the thumbnail.\n                        renderFilePreview={\n                            editable && asset?.src && hasImageEdit(asset.image)\n                                ? previewProps => (\n                                      <RichItemPreview\n                                          {...previewProps}\n                                          renderImage={({ name }) => {\n                                              const { wrapper, image } =\n                                                  getCroppedImageRenderStyles(\n                                                      asset.image?.width ?? 0,\n                                                      asset.image?.height ?? 0,\n                                                      asset.image?.crop,\n                                                      asset.image?.focalPoint\n                                                          ? {\n                                                                x: asset.image.focalPoint.x,\n                                                                y: asset.image.focalPoint.y,\n                                                                width: 1,\n                                                                height: 1\n                                                            }\n                                                          : undefined,\n                                                      { boxWidth: 1, boxHeight: 1, fit: \"cover\" }\n                                                  );\n                                              return (\n                                                  <div style={wrapper}>\n                                                      <img\n                                                          src={asset.src as string}\n                                                          alt={name}\n                                                          draggable={false}\n                                                          style={image}\n                                                      />\n                                                  </div>\n                                              );\n                                          }}\n                                      />\n                                  )\n                                : undefined\n                        }\n                        onSelectItem={() => showFileManager()}\n                        onRemoveItem={onRemove}\n                        // The \"Edit\" (pencil) action edits the image (crop / focal\n                        // point / alt). Replacing the file is done by clicking the\n                        // preview. For non-images there is nothing to edit, so the\n                        // pencil is hidden.\n                        onEditItem={editable ? () => setEditorOpen(true) : undefined}\n                    />\n                    {editable ? (\n                        <ImageEditor\n                            open={editorOpen}\n                            onClose={() => setEditorOpen(false)}\n                            image={{\n                                src: asset.src,\n                                width: asset.image?.width ?? 0,\n                                height: asset.image?.height ?? 0\n                            }}\n                            value={toEditorValue(asset.image)}\n                            onSave={onSaveEdit}\n                        />\n                    ) : null}\n                </>\n            )}\n        />\n    );\n};\n"],"names":["isEditableImage","asset","hasImageEdit","image","c","fullCrop","fp","centeredFocal","toEditorValue","undefined","FileInputRenderer","value","onChange","label","props","input","isBaseBreakpoint","useBreakpoint","editorOpen","setEditorOpen","useState","normalizeToAsset","editable","onFileChange","file","fileManagerItemToValue","onRemove","onSaveEdit","edit","updated","cropParam","getAssetCropParam","sep","FileManager","showFileManager","FilePicker","previewProps","RichItemPreview","name","wrapper","getCroppedImageRenderStyles","ImageEditor"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-website-builder",
-	"version": "6.5.0-beta.0",
+	"version": "6.5.0-beta.2",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -19,28 +19,28 @@
 		"@lexical/utils": "0.48.0",
 		"@monaco-editor/react": "4.7.0",
 		"@types/react": "18.3.31",
-		"@webiny/admin-ui": "6.5.0-beta.0",
-		"@webiny/app": "6.5.0-beta.0",
-		"@webiny/app-aco": "6.5.0-beta.0",
-		"@webiny/app-admin": "6.5.0-beta.0",
-		"@webiny/app-headless-cms": "6.5.0-beta.0",
-		"@webiny/app-headless-cms-common": "6.5.0-beta.0",
-		"@webiny/app-utils": "6.5.0-beta.0",
+		"@webiny/admin-ui": "6.5.0-beta.2",
+		"@webiny/app": "6.5.0-beta.2",
+		"@webiny/app-aco": "6.5.0-beta.2",
+		"@webiny/app-admin": "6.5.0-beta.2",
+		"@webiny/app-headless-cms": "6.5.0-beta.2",
+		"@webiny/app-headless-cms-common": "6.5.0-beta.2",
+		"@webiny/app-utils": "6.5.0-beta.2",
 		"@webiny/di": "1.0.2",
-		"@webiny/feature": "6.5.0-beta.0",
-		"@webiny/form": "6.5.0-beta.0",
-		"@webiny/frontend-settings": "6.5.0-beta.0",
-		"@webiny/icons": "6.5.0-beta.0",
-		"@webiny/languages": "6.5.0-beta.0",
-		"@webiny/lexical-converter": "6.5.0-beta.0",
-		"@webiny/lexical-editor": "6.5.0-beta.0",
-		"@webiny/lexical-nodes": "6.5.0-beta.0",
-		"@webiny/lexical-theme": "6.5.0-beta.0",
-		"@webiny/react-composition": "6.5.0-beta.0",
-		"@webiny/react-properties": "6.5.0-beta.0",
-		"@webiny/utils": "6.5.0-beta.0",
-		"@webiny/validation": "6.5.0-beta.0",
-		"@webiny/website-builder-sdk": "6.5.0-beta.0",
+		"@webiny/feature": "6.5.0-beta.2",
+		"@webiny/form": "6.5.0-beta.2",
+		"@webiny/frontend-settings": "6.5.0-beta.2",
+		"@webiny/icons": "6.5.0-beta.2",
+		"@webiny/languages": "6.5.0-beta.2",
+		"@webiny/lexical-converter": "6.5.0-beta.2",
+		"@webiny/lexical-editor": "6.5.0-beta.2",
+		"@webiny/lexical-nodes": "6.5.0-beta.2",
+		"@webiny/lexical-theme": "6.5.0-beta.2",
+		"@webiny/react-composition": "6.5.0-beta.2",
+		"@webiny/react-properties": "6.5.0-beta.2",
+		"@webiny/utils": "6.5.0-beta.2",
+		"@webiny/validation": "6.5.0-beta.2",
+		"@webiny/website-builder-sdk": "6.5.0-beta.2",
 		"classnames": "2.5.1",
 		"deep-equal": "2.2.3",
 		"graphql": "16.14.2",
@@ -61,7 +61,7 @@
 	"devDependencies": {
 		"@types/deep-equal": "1.0.4",
 		"@types/is-hotkey": "0.1.10",
-		"@webiny/build-tools": "6.5.0-beta.0",
+		"@webiny/build-tools": "6.5.0-beta.2",
 		"execa": "5.1.1",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",

package/presentation/pages/PageEditor/Revisions/RevisionListDrawer.js

@@ -17,6 +17,10 @@ const RevisionListDrawer = (props)=>{
         title: "Entry revisions",
         open: isRevisionListOpen,
         onOpenChange: (open)=>openRevisionList(open),
+        onInteractOutside: (e)=>{
+            const target = e.target;
+            if (target.closest("[data-role='dialog']")) e.preventDefault();
+        },
         modal: true,
         bodyPadding: false,
         headerSeparator: true,

package/presentation/pages/PageEditor/Revisions/RevisionListDrawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/pages/PageEditor/Revisions/RevisionListDrawer.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/RevisionListDrawer.tsx"],"sourcesContent":["import React from \"react\";\nimport { useHotkeys } from \"@webiny/app-admin\";\nimport { RevisionsList } from \"./RevisionsList.js\";\nimport { Drawer } from \"@webiny/admin-ui\";\nimport type { Page } from \"~/domain/Page/Page.js\";\nimport { usePageEditorDrawer } from \"./usePageEditorDrawer.js\";\n\ninterface IRevisionListDrawerProps {\n    page: Pick<Page, \"id\">;\n}\n\nexport const RevisionListDrawer = (props: IRevisionListDrawerProps) => {\n    const { page } = props;\n    const { isRevisionListOpen, openRevisionList } = usePageEditorDrawer();\n\n    useHotkeys({\n        zIndex: 55,\n        disabled: !isRevisionListOpen,\n        keys: {\n            esc: () => openRevisionList(false)\n        }\n    });\n\n    return (\n        <Drawer\n            title={\"Entry revisions\"}\n            open={isRevisionListOpen}\n            onOpenChange={open => openRevisionList(open)}\n            modal\n            bodyPadding={false}\n            headerSeparator={true}\n            width={1000}\n        >\n            <RevisionsList page={page} />\n        </Drawer>\n    );\n};\n"],"names":["RevisionListDrawer","props","page","isRevisionListOpen","openRevisionList","usePageEditorDrawer","useHotkeys","Drawer","open","RevisionsList"],"mappings":";;;;;AAWO,MAAMA,qBAAqB,CAACC;IAC/B,MAAM,EAAEC,IAAI,EAAE,GAAGD;IACjB,MAAM,EAAEE,kBAAkB,EAAEC,gBAAgB,EAAE,GAAGC;IAEjDC,WAAW;QACP,QAAQ;QACR,UAAU,CAACH;QACX,MAAM;YACF,KAAK,IAAMC,iBAAiB;QAChC;IACJ;IAEA,OAAO,WAAP,GACI,oBAACG,QAAMA;QACH,OAAO;QACP,MAAMJ;QACN,cAAcK,CAAAA,OAAQJ,iBAAiBI;QACvC;QACA,aAAa;QACb,iBAAiB;QACjB,OAAO;qBAEP,oBAACC,eAAaA;QAAC,MAAMP;;AAGjC"}
+{"version":3,"file":"presentation/pages/PageEditor/Revisions/RevisionListDrawer.js","sources":["../../../../../src/presentation/pages/PageEditor/Revisions/RevisionListDrawer.tsx"],"sourcesContent":["import React from \"react\";\nimport { useHotkeys } from \"@webiny/app-admin\";\nimport { RevisionsList } from \"./RevisionsList.js\";\nimport { Drawer } from \"@webiny/admin-ui\";\nimport type { Page } from \"~/domain/Page/Page.js\";\nimport { usePageEditorDrawer } from \"./usePageEditorDrawer.js\";\n\ninterface IRevisionListDrawerProps {\n    page: Pick<Page, \"id\">;\n}\n\nexport const RevisionListDrawer = (props: IRevisionListDrawerProps) => {\n    const { page } = props;\n    const { isRevisionListOpen, openRevisionList } = usePageEditorDrawer();\n\n    useHotkeys({\n        zIndex: 55,\n        disabled: !isRevisionListOpen,\n        keys: {\n            esc: () => openRevisionList(false)\n        }\n    });\n\n    return (\n        <Drawer\n            title={\"Entry revisions\"}\n            open={isRevisionListOpen}\n            onOpenChange={open => openRevisionList(open)}\n            onInteractOutside={e => {\n                // Confirmation dialogs render above the drawer; clicking their overlay must not\n                // close the drawer underneath them.\n                const target = e.target as HTMLElement;\n                if (target.closest(\"[data-role='dialog']\")) {\n                    e.preventDefault();\n                }\n            }}\n            modal\n            bodyPadding={false}\n            headerSeparator={true}\n            width={1000}\n        >\n            <RevisionsList page={page} />\n        </Drawer>\n    );\n};\n"],"names":["RevisionListDrawer","props","page","isRevisionListOpen","openRevisionList","usePageEditorDrawer","useHotkeys","Drawer","open","e","target","RevisionsList"],"mappings":";;;;;AAWO,MAAMA,qBAAqB,CAACC;IAC/B,MAAM,EAAEC,IAAI,EAAE,GAAGD;IACjB,MAAM,EAAEE,kBAAkB,EAAEC,gBAAgB,EAAE,GAAGC;IAEjDC,WAAW;QACP,QAAQ;QACR,UAAU,CAACH;QACX,MAAM;YACF,KAAK,IAAMC,iBAAiB;QAChC;IACJ;IAEA,OAAO,WAAP,GACI,oBAACG,QAAMA;QACH,OAAO;QACP,MAAMJ;QACN,cAAcK,CAAAA,OAAQJ,iBAAiBI;QACvC,mBAAmBC,CAAAA;YAGf,MAAMC,SAASD,EAAE,MAAM;YACvB,IAAIC,OAAO,OAAO,CAAC,yBACfD,EAAE,cAAc;QAExB;QACA;QACA,aAAa;QACb,iBAAiB;QACjB,OAAO;qBAEP,oBAACE,eAAaA;QAAC,MAAMT;;AAGjC"}

package/presentation/pages/PageEditor/Revisions/RevisionListItem.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
-import type { PageRevision } from "../../../../domain/PageRevision/index.js";
+import type { RevisionListPresenter } from "../../../../presentation/pages/RevisionList/abstractions.js";
 interface RevisionListItemProps {
-    revision: PageRevision;
+    item: RevisionListPresenter.ItemViewModel;
 }
-declare const RevisionListItem: ({ revision }: RevisionListItemProps) => React.JSX.Element;
+declare const RevisionListItem: ({ item }: RevisionListItemProps) => React.JSX.Element;
 export default RevisionListItem;