@webiny/app-headless-cms 6.5.0-beta.9 → 6.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-headless-cms",
-	"version": "6.5.0-beta.9",
+	"version": "6.5.0",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -28,25 +28,25 @@
 		"@fortawesome/react-fontawesome": "3.5.0",
 		"@lexical/utils": "0.52.0",
 		"@types/react": "18.3.31",
-		"@webiny/admin-ui": "6.5.0-beta.9",
-		"@webiny/app": "6.5.0-beta.9",
-		"@webiny/app-aco": "6.5.0-beta.9",
-		"@webiny/app-admin": "6.5.0-beta.9",
-		"@webiny/app-graphql-playground": "6.5.0-beta.9",
-		"@webiny/app-headless-cms-common": "6.5.0-beta.9",
-		"@webiny/cms-sdk": "6.5.0-beta.9",
+		"@webiny/admin-ui": "6.5.0",
+		"@webiny/app": "6.5.0",
+		"@webiny/app-aco": "6.5.0",
+		"@webiny/app-admin": "6.5.0",
+		"@webiny/app-graphql-playground": "6.5.0",
+		"@webiny/app-headless-cms-common": "6.5.0",
+		"@webiny/cms-sdk": "6.5.0",
 		"@webiny/di": "1.1.0",
-		"@webiny/feature": "6.5.0-beta.9",
-		"@webiny/form": "6.5.0-beta.9",
-		"@webiny/frontend-settings": "6.5.0-beta.9",
-		"@webiny/icons": "6.5.0-beta.9",
-		"@webiny/lexical-editor": "6.5.0-beta.9",
-		"@webiny/lexical-nodes": "6.5.0-beta.9",
-		"@webiny/plugins": "6.5.0-beta.9",
-		"@webiny/react-composition": "6.5.0-beta.9",
-		"@webiny/react-properties": "6.5.0-beta.9",
-		"@webiny/utils": "6.5.0-beta.9",
-		"@webiny/validation": "6.5.0-beta.9",
+		"@webiny/feature": "6.5.0",
+		"@webiny/form": "6.5.0",
+		"@webiny/frontend-settings": "6.5.0",
+		"@webiny/icons": "6.5.0",
+		"@webiny/lexical-editor": "6.5.0",
+		"@webiny/lexical-nodes": "6.5.0",
+		"@webiny/plugins": "6.5.0",
+		"@webiny/react-composition": "6.5.0",
+		"@webiny/react-properties": "6.5.0",
+		"@webiny/utils": "6.5.0",
+		"@webiny/validation": "6.5.0",
 		"dot-prop-immutable": "2.1.1",
 		"graphql": "16.14.2",
 		"graphql-tag": "2.12.7",
@@ -60,13 +60,13 @@
 		"react-helmet": "6.1.0",
 		"slugify": "1.6.9",
 		"use-deep-compare-effect": "1.8.1",
-		"zod": "4.6.5"
+		"zod": "4.6.7"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.5.0-beta.9",
+		"@webiny/build-tools": "6.5.0",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",
-		"vitest": "5.0.3"
+		"vitest": "5.0.5"
 	},
 	"publishConfig": {
 		"access": "public"

package/presentation/contentEntries/form/ContentEntryFormPresenter.js

@@ -15,6 +15,7 @@ import { TRASH_ENTRY_DIALOG } from "../list/ContentEntriesPresenter.js";
 import { CreateRevisionFromUseCase } from "../../../features/contentEntry/createRevisionFrom/abstractions.js";
 import { toFormErrors } from "./toFormErrors.js";
 const PUBLISH_ENTRY_DIALOG = "publish-entry";
+const SAVING = "Saving...";
 class ContentEntryFormPresenterImpl {
     constructor(formModelFactory, cmsFormModelBuilder, confirmation, modelAccessor, getEntryUseCase, createEntryUseCase, createRevisionFromUseCase, updateEntryUseCase, publishEntryUseCase, unpublishEntryUseCase, deleteEntryUseCase, updateRevisionDescriptionUseCase, formModelModifiers){
         this.formModelFactory = formModelFactory;
@@ -81,55 +82,53 @@ class ContentEntryFormPresenterImpl {
         if (!this.form) return false;
         const form = this.form;
         const model = this.model;
+        const isCurrent = ()=>this.form === form && this.model.modelId === model.modelId;
         const skipValidation = options?.skipValidation ?? true;
         const data = await form.submit({
             skipValidation
         });
-        if (!data) return false;
+        if (!data || !isCurrent()) return false;
+        const entry = this.entry;
+        const folderId = this.folderId;
         runInAction(()=>{
-            this.loading = "Saving...";
+            this.loading = SAVING;
         });
         try {
-            if (this.entry) {
-                const entry = await this.saveEntry({
-                    entry: this.entry,
-                    data,
-                    skipValidation
-                });
-                runInAction(()=>{
-                    if (this.form !== form) return;
-                    this.entry = entry;
-                    form.setData(entry.values);
-                    form.reset();
-                });
-            } else {
+            let savedEntry;
+            if (entry) savedEntry = await this.saveEntry({
+                model,
+                entry,
+                data,
+                skipValidation
+            });
+            else {
                 const createData = {
                     values: data
                 };
-                if (this.folderId) createData.wbyAco_location = {
-                    folderId: this.folderId
+                if (folderId) createData.wbyAco_location = {
+                    folderId
                 };
-                const entry = await this.createEntryUseCase.execute({
-                    model: this.model,
+                savedEntry = await this.createEntryUseCase.execute({
+                    model,
                     data: createData,
                     options: {
                         skipValidation
                     }
                 });
-                runInAction(()=>{
-                    if (this.form !== form) return;
-                    this.entry = entry;
-                    form.setData(entry.values);
-                    form.reset();
-                });
             }
+            if (!isCurrent()) return false;
+            runInAction(()=>{
+                this.entry = savedEntry;
+                form.setData(savedEntry.values);
+                form.reset();
+            });
             return true;
         } catch (error) {
-            if (this.form === form) form.setErrors(toFormErrors(error, model));
+            if (isCurrent()) form.setErrors(toFormErrors(error, model));
             return false;
         } finally{
             runInAction(()=>{
-                this.loading = null;
+                if (this.loading === SAVING) this.loading = null;
             });
         }
     }
@@ -246,6 +245,7 @@ class ContentEntryFormPresenterImpl {
     reset() {
         this.form = null;
         this.entry = null;
+        this.folderId = null;
     }
     buildForm() {
         const formConfig = this.cmsFormModelBuilder.build(this.model);
@@ -259,9 +259,9 @@ class ContentEntryFormPresenterImpl {
         this.form.reset();
     }
     async saveEntry(params) {
-        const { entry, data, skipValidation } = params;
+        const { model, entry, data, skipValidation } = params;
         if (entry.meta.locked) return await this.createRevisionFromUseCase.execute({
-            model: this.model,
+            model,
             revisionId: entry.id,
             data: {
                 values: data
@@ -271,7 +271,7 @@ class ContentEntryFormPresenterImpl {
             }
         });
         return await this.updateEntryUseCase.execute({
-            model: this.model,
+            model,
             revisionId: entry.id,
             data: {
                 values: data

package/presentation/contentEntries/form/ContentEntryFormPresenter.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/contentEntries/form/ContentEntryFormPresenter.js","sources":["../../../../src/presentation/contentEntries/form/ContentEntryFormPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable, runInAction, toJS } from \"mobx\";\nimport { FormModel, FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { Confirmation } from \"@webiny/app-admin/features/confirmation/abstractions.js\";\nimport type { CmsContentEntry } from \"~/types.js\";\nimport { GetEntryUseCase } from \"~/features/contentEntry/getEntry/abstractions.js\";\nimport { CreateEntryUseCase } from \"~/features/contentEntry/createEntry/abstractions.js\";\nimport { UpdateEntryUseCase } from \"~/features/contentEntry/updateEntry/abstractions.js\";\nimport { PublishEntryUseCase } from \"~/features/contentEntry/publishEntry/abstractions.js\";\nimport { UnpublishEntryUseCase } from \"~/features/contentEntry/unpublishEntry/abstractions.js\";\nimport { DeleteEntryUseCase } from \"~/features/contentEntry/deleteEntry/abstractions.js\";\nimport { UpdateRevisionDescriptionUseCase } from \"~/features/contentEntry/updateRevisionDescription/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsModelContext } from \"~/features/contentEntry/abstractions.js\";\nimport {\n    ContentEntryFormModelModifier,\n    ContentEntryFormPresenter as Abstraction\n} from \"./abstractions.js\";\nimport { TRASH_ENTRY_DIALOG } from \"~/presentation/contentEntries/list/ContentEntriesPresenter.js\";\nimport { CreateRevisionFromUseCase } from \"~/features/contentEntry/createRevisionFrom/abstractions.js\";\nimport { toFormErrors } from \"./toFormErrors.js\";\n\ninterface PublishEntryDialogData {\n    revisionDescription: string;\n}\n\ninterface SaveEntryParams {\n    entry: CmsContentEntry;\n    data: Record<string, unknown>;\n    skipValidation?: boolean;\n}\n\nexport const PUBLISH_ENTRY_DIALOG = \"publish-entry\";\n\nclass ContentEntryFormPresenterImpl implements Abstraction.Interface {\n    private entry: CmsContentEntry | null = null;\n    private form: FormModel.Interface | null = null;\n    private loading: string | null = null;\n    private folderId: string | null = null;\n\n    constructor(\n        private readonly formModelFactory: FormModelFactory.Interface,\n        private readonly cmsFormModelBuilder: CmsFormModelBuilder.Interface,\n        private readonly confirmation: Confirmation.Interface,\n        private readonly modelAccessor: CmsModelContext.Interface,\n        private readonly getEntryUseCase: GetEntryUseCase.Interface,\n        private readonly createEntryUseCase: CreateEntryUseCase.Interface,\n        private readonly createRevisionFromUseCase: CreateRevisionFromUseCase.Interface,\n        private readonly updateEntryUseCase: UpdateEntryUseCase.Interface,\n        private readonly publishEntryUseCase: PublishEntryUseCase.Interface,\n        private readonly unpublishEntryUseCase: UnpublishEntryUseCase.Interface,\n        private readonly deleteEntryUseCase: DeleteEntryUseCase.Interface,\n        private readonly updateRevisionDescriptionUseCase: UpdateRevisionDescriptionUseCase.Interface,\n        private readonly formModelModifiers: ContentEntryFormModelModifier.Interface[]\n    ) {\n        makeAutoObservable<\n            ContentEntryFormPresenterImpl,\n            | \"formModelFactory\"\n            | \"cmsFormModelBuilder\"\n            | \"confirmation\"\n            | \"modelAccessor\"\n            | \"getEntryUseCase\"\n            | \"createEntryUseCase\"\n            | \"updateEntryUseCase\"\n            | \"publishEntryUseCase\"\n            | \"unpublishEntryUseCase\"\n            | \"deleteEntryUseCase\"\n            | \"updateRevisionDescriptionUseCase\"\n            | \"formModelModifiers\"\n        >(this, {\n            formModelFactory: false,\n            cmsFormModelBuilder: false,\n            confirmation: false,\n            modelAccessor: false,\n            getEntryUseCase: false,\n            createEntryUseCase: false,\n            updateEntryUseCase: false,\n            publishEntryUseCase: false,\n            unpublishEntryUseCase: false,\n            deleteEntryUseCase: false,\n            updateRevisionDescriptionUseCase: false,\n            formModelModifiers: false,\n            vm: computed\n        });\n    }\n\n    private get model() {\n        return this.modelAccessor.getModel();\n    }\n\n    get vm(): Abstraction.ViewModel {\n        const entry = this.entry;\n        const meta = entry?.meta;\n        const isLocked = meta?.locked ?? false;\n        const status = meta?.status;\n        /**\n         * Can save if the entry is locked and published/unpublished - it will trigger create new revision.\n         * Or if the entry is not locked and the form is not null (meaning we are creating a new entry or editing an existing one).\n         */\n        const canSave =\n            (isLocked && (status === \"published\" || status === \"unpublished\")) ||\n            (!isLocked && this.form !== null);\n\n        return {\n            loading: this.loading,\n            model: this.model,\n            entry: toJS(this.entry),\n            form: this.form?.vm ?? null,\n            canSave,\n            status,\n            canCreateNewRevision:\n                !!status && canSave && [\"published\", \"unpublished\"].includes(status),\n            canPublish: this.entry !== null && status !== \"published\",\n            canUnpublish: this.entry !== null && status === \"published\",\n            canDelete: this.entry !== null,\n            isNewEntry: this.entry === null && this.form !== null,\n            isDirty: this.form?.isDirty ?? false\n        };\n    }\n\n    async saveRevision(options?: { skipValidation?: boolean }): Promise<boolean> {\n        if (!this.form) {\n            return false;\n        }\n\n        /*\n         * Saving is async, and the form can be reset or replaced by another entry before it\n         * finishes. Keep hold of the form and model being saved, and only write the result back\n         * while that form is still the one on screen.\n         */\n        const form = this.form;\n        const model = this.model;\n\n        const skipValidation = options?.skipValidation ?? true;\n        const data = await form.submit({ skipValidation });\n\n        if (!data) {\n            return false;\n        }\n\n        runInAction(() => {\n            this.loading = \"Saving...\";\n        });\n\n        try {\n            if (this.entry) {\n                /**\n                 * In case the entry already exists, and it is NOT locked, we will update the existing revision.\n                 * If it is locked, we will create a new revision from the existing one, and then update that new revision.\n                 */\n                const entry = await this.saveEntry({\n                    entry: this.entry,\n                    data,\n                    skipValidation\n                });\n\n                runInAction(() => {\n                    if (this.form !== form) {\n                        return;\n                    }\n                    this.entry = entry;\n                    form.setData(entry.values);\n                    form.reset();\n                });\n            } else {\n                const createData: Record<string, unknown> = { values: data };\n                if (this.folderId) {\n                    createData.wbyAco_location = { folderId: this.folderId };\n                }\n\n                const entry = await this.createEntryUseCase.execute({\n                    model: this.model,\n                    data: createData,\n                    options: { skipValidation }\n                });\n\n                runInAction(() => {\n                    if (this.form !== form) {\n                        return;\n                    }\n                    this.entry = entry;\n                    form.setData(entry.values);\n                    form.reset();\n                });\n            }\n\n            return true;\n        } catch (error) {\n            if (this.form === form) {\n                form.setErrors(toFormErrors(error, model));\n            }\n            return false;\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    async publishRevision(): Promise<boolean> {\n        if (!this.entry) {\n            return false;\n        }\n\n        const result = await this.confirmation.confirm<PublishEntryDialogData>(\n            PUBLISH_ENTRY_DIALOG,\n            { entry: this.entry }\n        );\n\n        if (result === false) {\n            return false;\n        }\n\n        runInAction(() => {\n            this.loading = \"Publishing...\";\n        });\n\n        try {\n            if (result.revisionDescription) {\n                await this.updateRevisionDescriptionUseCase.execute({\n                    model: this.model,\n                    id: this.entry.id,\n                    revisionDescription: result.revisionDescription\n                });\n            }\n\n            const entry = await this.publishEntryUseCase.execute({\n                model: this.model,\n                revisionId: this.entry.id\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n            });\n\n            return true;\n        } catch {\n            return false;\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    async unpublishRevision(): Promise<boolean> {\n        if (!this.entry) {\n            return false;\n        }\n\n        this.loading = \"Unpublishing...\";\n\n        try {\n            const entry = await this.unpublishEntryUseCase.execute({\n                model: this.model,\n                revisionId: this.entry.id\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n            });\n\n            return true;\n        } catch {\n            return false;\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    async deleteEntry(): Promise<boolean> {\n        if (!this.entry) {\n            return false;\n        }\n\n        const model = this.model;\n        const entry = this.entry;\n\n        return this.confirmation.confirm(\n            TRASH_ENTRY_DIALOG,\n            { entryId: entry.entryId },\n            async () => {\n                try {\n                    await this.deleteEntryUseCase.execute({\n                        model,\n                        id: entry.entryId\n                    });\n\n                    runInAction(() => {\n                        this.entry = null;\n                        this.form = null;\n                    });\n\n                    return true;\n                } catch {\n                    return false;\n                }\n            }\n        );\n    }\n\n    async loadRevision(id: string): Promise<void> {\n        this.loading = \"Loading entry...\";\n\n        try {\n            const entry = await this.getEntryUseCase.execute({\n                model: this.model,\n                id\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n                this.buildAndPopulateForm(entry);\n            });\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    setFolderId(folderId: string | null): void {\n        this.folderId = folderId;\n    }\n\n    newEntry(initialValues?: Record<string, unknown>): void {\n        this.entry = null;\n        this.form = this.buildForm();\n        if (initialValues) {\n            this.form.setData(initialValues, { dirty: true });\n        }\n    }\n\n    patchEntryMeta(meta: Partial<CmsContentEntry[\"meta\"]>): void {\n        if (!this.entry) {\n            return;\n        }\n        this.entry = {\n            ...this.entry,\n            meta: { ...this.entry.meta, ...meta }\n        };\n    }\n\n    reset(): void {\n        this.form = null;\n        this.entry = null;\n    }\n\n    private buildForm(): FormModel.Interface {\n        const formConfig = this.cmsFormModelBuilder.build(this.model);\n        const form = this.formModelFactory.create(formConfig);\n        for (const modifier of this.formModelModifiers) {\n            modifier.modifyForm(form, this.model);\n        }\n        return form;\n    }\n\n    private buildAndPopulateForm(entry: CmsContentEntry): void {\n        this.form = this.buildForm();\n        this.form.setData(entry.values);\n        this.form.reset();\n    }\n    /**\n     * Depending on whether the entry is locked or not, this method will either create a new revision from the existing one and update it, or simply update the existing revision.\n     */\n    private async saveEntry(params: SaveEntryParams): Promise<any> {\n        const { entry, data, skipValidation } = params;\n\n        if (entry.meta.locked) {\n            return await this.createRevisionFromUseCase.execute({\n                model: this.model,\n                revisionId: entry.id,\n                data: {\n                    values: data\n                },\n                options: { skipValidation }\n            });\n        }\n        return await this.updateEntryUseCase.execute({\n            model: this.model,\n            revisionId: entry.id,\n            data: {\n                values: data\n            },\n            options: { skipValidation }\n        });\n    }\n}\n\nexport const ContentEntryFormPresenter = Abstraction.createImplementation({\n    implementation: ContentEntryFormPresenterImpl,\n    dependencies: [\n        FormModelFactory,\n        CmsFormModelBuilder,\n        Confirmation,\n        CmsModelContext,\n        GetEntryUseCase,\n        CreateEntryUseCase,\n        CreateRevisionFromUseCase,\n        UpdateEntryUseCase,\n        PublishEntryUseCase,\n        UnpublishEntryUseCase,\n        DeleteEntryUseCase,\n        UpdateRevisionDescriptionUseCase,\n        [ContentEntryFormModelModifier, { multiple: true }]\n    ]\n});\n"],"names":["PUBLISH_ENTRY_DIALOG","ContentEntryFormPresenterImpl","formModelFactory","cmsFormModelBuilder","confirmation","modelAccessor","getEntryUseCase","createEntryUseCase","createRevisionFromUseCase","updateEntryUseCase","publishEntryUseCase","unpublishEntryUseCase","deleteEntryUseCase","updateRevisionDescriptionUseCase","formModelModifiers","makeAutoObservable","computed","entry","meta","isLocked","status","canSave","toJS","options","form","model","skipValidation","data","runInAction","createData","error","toFormErrors","result","TRASH_ENTRY_DIALOG","id","folderId","initialValues","formConfig","modifier","params","ContentEntryFormPresenter","Abstraction","FormModelFactory","CmsFormModelBuilder","Confirmation","CmsModelContext","GetEntryUseCase","CreateEntryUseCase","CreateRevisionFromUseCase","UpdateEntryUseCase","PublishEntryUseCase","UnpublishEntryUseCase","DeleteEntryUseCase","UpdateRevisionDescriptionUseCase","ContentEntryFormModelModifier"],"mappings":";;;;;;;;;;;;;;;;AA+BO,MAAMA,uBAAuB;AAEpC,MAAMC;IAMF,YACqBC,gBAA4C,EAC5CC,mBAAkD,EAClDC,YAAoC,EACpCC,aAAwC,EACxCC,eAA0C,EAC1CC,kBAAgD,EAChDC,yBAA8D,EAC9DC,kBAAgD,EAChDC,mBAAkD,EAClDC,qBAAsD,EACtDC,kBAAgD,EAChDC,gCAA4E,EAC5EC,kBAA6D,CAChF;aAbmBZ,gBAAgB,GAAhBA;aACAC,mBAAmB,GAAnBA;aACAC,YAAY,GAAZA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;aACAC,kBAAkB,GAAlBA;aACAC,yBAAyB,GAAzBA;aACAC,kBAAkB,GAAlBA;aACAC,mBAAmB,GAAnBA;aACAC,qBAAqB,GAArBA;aACAC,kBAAkB,GAAlBA;aACAC,gCAAgC,GAAhCA;aACAC,kBAAkB,GAAlBA;aAlBb,KAAK,GAA2B;aAChC,IAAI,GAA+B;aACnC,OAAO,GAAkB;aACzB,QAAQ,GAAkB;QAiB9BC,mBAcE,IAAI,EAAE;YACJ,kBAAkB;YAClB,qBAAqB;YACrB,cAAc;YACd,eAAe;YACf,iBAAiB;YACjB,oBAAoB;YACpB,oBAAoB;YACpB,qBAAqB;YACrB,uBAAuB;YACvB,oBAAoB;YACpB,kCAAkC;YAClC,oBAAoB;YACpB,IAAIC;QACR;IACJ;IAEA,IAAY,QAAQ;QAChB,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ;IACtC;IAEA,IAAI,KAA4B;QAC5B,MAAMC,QAAQ,IAAI,CAAC,KAAK;QACxB,MAAMC,OAAOD,OAAO;QACpB,MAAME,WAAWD,MAAM,UAAU;QACjC,MAAME,SAASF,MAAM;QAKrB,MAAMG,UACDF,YAAaC,CAAAA,AAAW,gBAAXA,UAA0BA,AAAW,kBAAXA,MAAuB,KAC9D,CAACD,YAAY,AAAc,SAAd,IAAI,CAAC,IAAI;QAE3B,OAAO;YACH,SAAS,IAAI,CAAC,OAAO;YACrB,OAAO,IAAI,CAAC,KAAK;YACjB,OAAOG,KAAK,IAAI,CAAC,KAAK;YACtB,MAAM,IAAI,CAAC,IAAI,EAAE,MAAM;YACvBD;YACAD;YACA,sBACI,CAAC,CAACA,UAAUC,WAAW;gBAAC;gBAAa;aAAc,CAAC,QAAQ,CAACD;YACjE,YAAY,AAAe,SAAf,IAAI,CAAC,KAAK,IAAaA,AAAW,gBAAXA;YACnC,cAAc,AAAe,SAAf,IAAI,CAAC,KAAK,IAAaA,AAAW,gBAAXA;YACrC,WAAW,AAAe,SAAf,IAAI,CAAC,KAAK;YACrB,YAAY,AAAe,SAAf,IAAI,CAAC,KAAK,IAAa,AAAc,SAAd,IAAI,CAAC,IAAI;YAC5C,SAAS,IAAI,CAAC,IAAI,EAAE,WAAW;QACnC;IACJ;IAEA,MAAM,aAAaG,OAAsC,EAAoB;QACzE,IAAI,CAAC,IAAI,CAAC,IAAI,EACV,OAAO;QAQX,MAAMC,OAAO,IAAI,CAAC,IAAI;QACtB,MAAMC,QAAQ,IAAI,CAAC,KAAK;QAExB,MAAMC,iBAAiBH,SAAS,kBAAkB;QAClD,MAAMI,OAAO,MAAMH,KAAK,MAAM,CAAC;YAAEE;QAAe;QAEhD,IAAI,CAACC,MACD,OAAO;QAGXC,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;QAEA,IAAI;YACA,IAAI,IAAI,CAAC,KAAK,EAAE;gBAKZ,MAAMX,QAAQ,MAAM,IAAI,CAAC,SAAS,CAAC;oBAC/B,OAAO,IAAI,CAAC,KAAK;oBACjBU;oBACAD;gBACJ;gBAEAE,YAAY;oBACR,IAAI,IAAI,CAAC,IAAI,KAAKJ,MACd;oBAEJ,IAAI,CAAC,KAAK,GAAGP;oBACbO,KAAK,OAAO,CAACP,MAAM,MAAM;oBACzBO,KAAK,KAAK;gBACd;YACJ,OAAO;gBACH,MAAMK,aAAsC;oBAAE,QAAQF;gBAAK;gBAC3D,IAAI,IAAI,CAAC,QAAQ,EACbE,WAAW,eAAe,GAAG;oBAAE,UAAU,IAAI,CAAC,QAAQ;gBAAC;gBAG3D,MAAMZ,QAAQ,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;oBAChD,OAAO,IAAI,CAAC,KAAK;oBACjB,MAAMY;oBACN,SAAS;wBAAEH;oBAAe;gBAC9B;gBAEAE,YAAY;oBACR,IAAI,IAAI,CAAC,IAAI,KAAKJ,MACd;oBAEJ,IAAI,CAAC,KAAK,GAAGP;oBACbO,KAAK,OAAO,CAACP,MAAM,MAAM;oBACzBO,KAAK,KAAK;gBACd;YACJ;YAEA,OAAO;QACX,EAAE,OAAOM,OAAO;YACZ,IAAI,IAAI,CAAC,IAAI,KAAKN,MACdA,KAAK,SAAS,CAACO,aAAaD,OAAOL;YAEvC,OAAO;QACX,SAAU;YACNG,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,kBAAoC;QACtC,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,OAAO;QAGX,MAAMI,SAAS,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAC1ChC,sBACA;YAAE,OAAO,IAAI,CAAC,KAAK;QAAC;QAGxB,IAAIgC,AAAW,UAAXA,QACA,OAAO;QAGXJ,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;QAEA,IAAI;YACA,IAAII,OAAO,mBAAmB,EAC1B,MAAM,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC;gBAChD,OAAO,IAAI,CAAC,KAAK;gBACjB,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE;gBACjB,qBAAqBA,OAAO,mBAAmB;YACnD;YAGJ,MAAMf,QAAQ,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBACjD,OAAO,IAAI,CAAC,KAAK;gBACjB,YAAY,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B;YAEAW,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGX;YACjB;YAEA,OAAO;QACX,EAAE,OAAM;YACJ,OAAO;QACX,SAAU;YACNW,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,oBAAsC;QACxC,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,OAAO;QAGX,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMX,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;gBACnD,OAAO,IAAI,CAAC,KAAK;gBACjB,YAAY,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B;YAEAW,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGX;YACjB;YAEA,OAAO;QACX,EAAE,OAAM;YACJ,OAAO;QACX,SAAU;YACNW,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,cAAgC;QAClC,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,OAAO;QAGX,MAAMH,QAAQ,IAAI,CAAC,KAAK;QACxB,MAAMR,QAAQ,IAAI,CAAC,KAAK;QAExB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAC5BgB,oBACA;YAAE,SAAShB,MAAM,OAAO;QAAC,GACzB;YACI,IAAI;gBACA,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;oBAClCQ;oBACA,IAAIR,MAAM,OAAO;gBACrB;gBAEAW,YAAY;oBACR,IAAI,CAAC,KAAK,GAAG;oBACb,IAAI,CAAC,IAAI,GAAG;gBAChB;gBAEA,OAAO;YACX,EAAE,OAAM;gBACJ,OAAO;YACX;QACJ;IAER;IAEA,MAAM,aAAaM,EAAU,EAAiB;QAC1C,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMjB,QAAQ,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC7C,OAAO,IAAI,CAAC,KAAK;gBACjBiB;YACJ;YAEAN,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGX;gBACb,IAAI,CAAC,oBAAoB,CAACA;YAC9B;QACJ,SAAU;YACNW,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,YAAYO,QAAuB,EAAQ;QACvC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,SAASC,aAAuC,EAAQ;QACpD,IAAI,CAAC,KAAK,GAAG;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS;QAC1B,IAAIA,eACA,IAAI,CAAC,IAAI,CAAC,OAAO,CAACA,eAAe;YAAE,OAAO;QAAK;IAEvD;IAEA,eAAelB,IAAsC,EAAQ;QACzD,IAAI,CAAC,IAAI,CAAC,KAAK,EACX;QAEJ,IAAI,CAAC,KAAK,GAAG;YACT,GAAG,IAAI,CAAC,KAAK;YACb,MAAM;gBAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI;gBAAE,GAAGA,IAAI;YAAC;QACxC;IACJ;IAEA,QAAc;QACV,IAAI,CAAC,IAAI,GAAG;QACZ,IAAI,CAAC,KAAK,GAAG;IACjB;IAEQ,YAAiC;QACrC,MAAMmB,aAAa,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;QAC5D,MAAMb,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAACa;QAC1C,KAAK,MAAMC,YAAY,IAAI,CAAC,kBAAkB,CAC1CA,SAAS,UAAU,CAACd,MAAM,IAAI,CAAC,KAAK;QAExC,OAAOA;IACX;IAEQ,qBAAqBP,KAAsB,EAAQ;QACvD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAACA,MAAM,MAAM;QAC9B,IAAI,CAAC,IAAI,CAAC,KAAK;IACnB;IAIA,MAAc,UAAUsB,MAAuB,EAAgB;QAC3D,MAAM,EAAEtB,KAAK,EAAEU,IAAI,EAAED,cAAc,EAAE,GAAGa;QAExC,IAAItB,MAAM,IAAI,CAAC,MAAM,EACjB,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC;YAChD,OAAO,IAAI,CAAC,KAAK;YACjB,YAAYA,MAAM,EAAE;YACpB,MAAM;gBACF,QAAQU;YACZ;YACA,SAAS;gBAAED;YAAe;QAC9B;QAEJ,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACzC,OAAO,IAAI,CAAC,KAAK;YACjB,YAAYT,MAAM,EAAE;YACpB,MAAM;gBACF,QAAQU;YACZ;YACA,SAAS;gBAAED;YAAe;QAC9B;IACJ;AACJ;AAEO,MAAMc,sDAA4BC,0BAAAA,oBAAgC,CAAC;IACtE,gBAAgBxC;IAChB,cAAc;QACVyC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACA;YAACC;YAA+B;gBAAE,UAAU;YAAK;SAAE;KACtD;AACL"}
+{"version":3,"file":"presentation/contentEntries/form/ContentEntryFormPresenter.js","sources":["../../../../src/presentation/contentEntries/form/ContentEntryFormPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable, runInAction, toJS } from \"mobx\";\nimport { FormModel, FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { Confirmation } from \"@webiny/app-admin/features/confirmation/abstractions.js\";\nimport type { CmsContentEntry, CmsModel } from \"~/types.js\";\nimport { GetEntryUseCase } from \"~/features/contentEntry/getEntry/abstractions.js\";\nimport { CreateEntryUseCase } from \"~/features/contentEntry/createEntry/abstractions.js\";\nimport { UpdateEntryUseCase } from \"~/features/contentEntry/updateEntry/abstractions.js\";\nimport { PublishEntryUseCase } from \"~/features/contentEntry/publishEntry/abstractions.js\";\nimport { UnpublishEntryUseCase } from \"~/features/contentEntry/unpublishEntry/abstractions.js\";\nimport { DeleteEntryUseCase } from \"~/features/contentEntry/deleteEntry/abstractions.js\";\nimport { UpdateRevisionDescriptionUseCase } from \"~/features/contentEntry/updateRevisionDescription/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsModelContext } from \"~/features/contentEntry/abstractions.js\";\nimport {\n    ContentEntryFormModelModifier,\n    ContentEntryFormPresenter as Abstraction\n} from \"./abstractions.js\";\nimport { TRASH_ENTRY_DIALOG } from \"~/presentation/contentEntries/list/ContentEntriesPresenter.js\";\nimport { CreateRevisionFromUseCase } from \"~/features/contentEntry/createRevisionFrom/abstractions.js\";\nimport { toFormErrors } from \"./toFormErrors.js\";\n\ninterface PublishEntryDialogData {\n    revisionDescription: string;\n}\n\ninterface SaveEntryParams {\n    model: CmsModel;\n    entry: CmsContentEntry;\n    data: Record<string, unknown>;\n    skipValidation?: boolean;\n}\n\nexport const PUBLISH_ENTRY_DIALOG = \"publish-entry\";\n\nconst SAVING = \"Saving...\";\n\nclass ContentEntryFormPresenterImpl implements Abstraction.Interface {\n    private entry: CmsContentEntry | null = null;\n    private form: FormModel.Interface | null = null;\n    private loading: string | null = null;\n    private folderId: string | null = null;\n\n    constructor(\n        private readonly formModelFactory: FormModelFactory.Interface,\n        private readonly cmsFormModelBuilder: CmsFormModelBuilder.Interface,\n        private readonly confirmation: Confirmation.Interface,\n        private readonly modelAccessor: CmsModelContext.Interface,\n        private readonly getEntryUseCase: GetEntryUseCase.Interface,\n        private readonly createEntryUseCase: CreateEntryUseCase.Interface,\n        private readonly createRevisionFromUseCase: CreateRevisionFromUseCase.Interface,\n        private readonly updateEntryUseCase: UpdateEntryUseCase.Interface,\n        private readonly publishEntryUseCase: PublishEntryUseCase.Interface,\n        private readonly unpublishEntryUseCase: UnpublishEntryUseCase.Interface,\n        private readonly deleteEntryUseCase: DeleteEntryUseCase.Interface,\n        private readonly updateRevisionDescriptionUseCase: UpdateRevisionDescriptionUseCase.Interface,\n        private readonly formModelModifiers: ContentEntryFormModelModifier.Interface[]\n    ) {\n        makeAutoObservable<\n            ContentEntryFormPresenterImpl,\n            | \"formModelFactory\"\n            | \"cmsFormModelBuilder\"\n            | \"confirmation\"\n            | \"modelAccessor\"\n            | \"getEntryUseCase\"\n            | \"createEntryUseCase\"\n            | \"updateEntryUseCase\"\n            | \"publishEntryUseCase\"\n            | \"unpublishEntryUseCase\"\n            | \"deleteEntryUseCase\"\n            | \"updateRevisionDescriptionUseCase\"\n            | \"formModelModifiers\"\n        >(this, {\n            formModelFactory: false,\n            cmsFormModelBuilder: false,\n            confirmation: false,\n            modelAccessor: false,\n            getEntryUseCase: false,\n            createEntryUseCase: false,\n            updateEntryUseCase: false,\n            publishEntryUseCase: false,\n            unpublishEntryUseCase: false,\n            deleteEntryUseCase: false,\n            updateRevisionDescriptionUseCase: false,\n            formModelModifiers: false,\n            vm: computed\n        });\n    }\n\n    private get model() {\n        return this.modelAccessor.getModel();\n    }\n\n    get vm(): Abstraction.ViewModel {\n        const entry = this.entry;\n        const meta = entry?.meta;\n        const isLocked = meta?.locked ?? false;\n        const status = meta?.status;\n        /**\n         * Can save if the entry is locked and published/unpublished - it will trigger create new revision.\n         * Or if the entry is not locked and the form is not null (meaning we are creating a new entry or editing an existing one).\n         */\n        const canSave =\n            (isLocked && (status === \"published\" || status === \"unpublished\")) ||\n            (!isLocked && this.form !== null);\n\n        return {\n            loading: this.loading,\n            model: this.model,\n            entry: toJS(this.entry),\n            form: this.form?.vm ?? null,\n            canSave,\n            status,\n            canCreateNewRevision:\n                !!status && canSave && [\"published\", \"unpublished\"].includes(status),\n            canPublish: this.entry !== null && status !== \"published\",\n            canUnpublish: this.entry !== null && status === \"published\",\n            canDelete: this.entry !== null,\n            isNewEntry: this.entry === null && this.form !== null,\n            isDirty: this.form?.isDirty ?? false\n        };\n    }\n\n    async saveRevision(options?: { skipValidation?: boolean }): Promise<boolean> {\n        if (!this.form) {\n            return false;\n        }\n\n        /*\n         * Saving is async, and the form can be reset or replaced by another entry before it\n         * finishes. Keep hold of the form and model being saved, and only write the result back\n         * while that form is still the one on screen.\n         */\n        const form = this.form;\n        const model = this.model;\n        const isCurrent = () => this.form === form && this.model.modelId === model.modelId;\n\n        const skipValidation = options?.skipValidation ?? true;\n        const data = await form.submit({ skipValidation });\n\n        /*\n         * Validation is async too. If another entry was opened in the meantime, `this.entry`\n         * already points at it, and saving now would write this form's values onto that entry.\n         */\n        if (!data || !isCurrent()) {\n            return false;\n        }\n\n        // Read the write target once, before the first await, so the write stays on this entry.\n        const entry = this.entry;\n        const folderId = this.folderId;\n\n        runInAction(() => {\n            this.loading = SAVING;\n        });\n\n        try {\n            let savedEntry: CmsContentEntry;\n            if (entry) {\n                /**\n                 * In case the entry already exists, and it is NOT locked, we will update the existing revision.\n                 * If it is locked, we will create a new revision from the existing one, and then update that new revision.\n                 */\n                savedEntry = await this.saveEntry({ model, entry, data, skipValidation });\n            } else {\n                const createData: Record<string, unknown> = { values: data };\n                if (folderId) {\n                    createData.wbyAco_location = { folderId };\n                }\n\n                savedEntry = await this.createEntryUseCase.execute({\n                    model,\n                    data: createData,\n                    options: { skipValidation }\n                });\n            }\n\n            /*\n             * The write went to the right entry, but another form is on screen now. Leave it\n             * alone and return false, so callers don't select, toast or publish the entry that\n             * is open now instead of the one that was saved.\n             */\n            if (!isCurrent()) {\n                return false;\n            }\n\n            runInAction(() => {\n                this.entry = savedEntry;\n                form.setData(savedEntry.values);\n                form.reset();\n            });\n\n            return true;\n        } catch (error) {\n            if (isCurrent()) {\n                form.setErrors(toFormErrors(error, model));\n            }\n            return false;\n        } finally {\n            runInAction(() => {\n                // Opening another entry sets its own loading message. Don't clear that one.\n                if (this.loading === SAVING) {\n                    this.loading = null;\n                }\n            });\n        }\n    }\n\n    async publishRevision(): Promise<boolean> {\n        if (!this.entry) {\n            return false;\n        }\n\n        const result = await this.confirmation.confirm<PublishEntryDialogData>(\n            PUBLISH_ENTRY_DIALOG,\n            { entry: this.entry }\n        );\n\n        if (result === false) {\n            return false;\n        }\n\n        runInAction(() => {\n            this.loading = \"Publishing...\";\n        });\n\n        try {\n            if (result.revisionDescription) {\n                await this.updateRevisionDescriptionUseCase.execute({\n                    model: this.model,\n                    id: this.entry.id,\n                    revisionDescription: result.revisionDescription\n                });\n            }\n\n            const entry = await this.publishEntryUseCase.execute({\n                model: this.model,\n                revisionId: this.entry.id\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n            });\n\n            return true;\n        } catch {\n            return false;\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    async unpublishRevision(): Promise<boolean> {\n        if (!this.entry) {\n            return false;\n        }\n\n        this.loading = \"Unpublishing...\";\n\n        try {\n            const entry = await this.unpublishEntryUseCase.execute({\n                model: this.model,\n                revisionId: this.entry.id\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n            });\n\n            return true;\n        } catch {\n            return false;\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    async deleteEntry(): Promise<boolean> {\n        if (!this.entry) {\n            return false;\n        }\n\n        const model = this.model;\n        const entry = this.entry;\n\n        return this.confirmation.confirm(\n            TRASH_ENTRY_DIALOG,\n            { entryId: entry.entryId },\n            async () => {\n                try {\n                    await this.deleteEntryUseCase.execute({\n                        model,\n                        id: entry.entryId\n                    });\n\n                    runInAction(() => {\n                        this.entry = null;\n                        this.form = null;\n                    });\n\n                    return true;\n                } catch {\n                    return false;\n                }\n            }\n        );\n    }\n\n    async loadRevision(id: string): Promise<void> {\n        this.loading = \"Loading entry...\";\n\n        try {\n            const entry = await this.getEntryUseCase.execute({\n                model: this.model,\n                id\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n                this.buildAndPopulateForm(entry);\n            });\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    setFolderId(folderId: string | null): void {\n        this.folderId = folderId;\n    }\n\n    newEntry(initialValues?: Record<string, unknown>): void {\n        this.entry = null;\n        this.form = this.buildForm();\n        if (initialValues) {\n            this.form.setData(initialValues, { dirty: true });\n        }\n    }\n\n    patchEntryMeta(meta: Partial<CmsContentEntry[\"meta\"]>): void {\n        if (!this.entry) {\n            return;\n        }\n        this.entry = {\n            ...this.entry,\n            meta: { ...this.entry.meta, ...meta }\n        };\n    }\n\n    reset(): void {\n        this.form = null;\n        this.entry = null;\n        this.folderId = null;\n    }\n\n    private buildForm(): FormModel.Interface {\n        const formConfig = this.cmsFormModelBuilder.build(this.model);\n        const form = this.formModelFactory.create(formConfig);\n        for (const modifier of this.formModelModifiers) {\n            modifier.modifyForm(form, this.model);\n        }\n        return form;\n    }\n\n    private buildAndPopulateForm(entry: CmsContentEntry): void {\n        this.form = this.buildForm();\n        this.form.setData(entry.values);\n        this.form.reset();\n    }\n    /**\n     * Depending on whether the entry is locked or not, this method will either create a new revision from the existing one and update it, or simply update the existing revision.\n     */\n    private async saveEntry(params: SaveEntryParams): Promise<CmsContentEntry> {\n        const { model, entry, data, skipValidation } = params;\n\n        if (entry.meta.locked) {\n            return await this.createRevisionFromUseCase.execute({\n                model,\n                revisionId: entry.id,\n                data: {\n                    values: data\n                },\n                options: { skipValidation }\n            });\n        }\n        return await this.updateEntryUseCase.execute({\n            model,\n            revisionId: entry.id,\n            data: {\n                values: data\n            },\n            options: { skipValidation }\n        });\n    }\n}\n\nexport const ContentEntryFormPresenter = Abstraction.createImplementation({\n    implementation: ContentEntryFormPresenterImpl,\n    dependencies: [\n        FormModelFactory,\n        CmsFormModelBuilder,\n        Confirmation,\n        CmsModelContext,\n        GetEntryUseCase,\n        CreateEntryUseCase,\n        CreateRevisionFromUseCase,\n        UpdateEntryUseCase,\n        PublishEntryUseCase,\n        UnpublishEntryUseCase,\n        DeleteEntryUseCase,\n        UpdateRevisionDescriptionUseCase,\n        [ContentEntryFormModelModifier, { multiple: true }]\n    ]\n});\n"],"names":["PUBLISH_ENTRY_DIALOG","SAVING","ContentEntryFormPresenterImpl","formModelFactory","cmsFormModelBuilder","confirmation","modelAccessor","getEntryUseCase","createEntryUseCase","createRevisionFromUseCase","updateEntryUseCase","publishEntryUseCase","unpublishEntryUseCase","deleteEntryUseCase","updateRevisionDescriptionUseCase","formModelModifiers","makeAutoObservable","computed","entry","meta","isLocked","status","canSave","toJS","options","form","model","isCurrent","skipValidation","data","folderId","runInAction","savedEntry","createData","error","toFormErrors","result","TRASH_ENTRY_DIALOG","id","initialValues","formConfig","modifier","params","ContentEntryFormPresenter","Abstraction","FormModelFactory","CmsFormModelBuilder","Confirmation","CmsModelContext","GetEntryUseCase","CreateEntryUseCase","CreateRevisionFromUseCase","UpdateEntryUseCase","PublishEntryUseCase","UnpublishEntryUseCase","DeleteEntryUseCase","UpdateRevisionDescriptionUseCase","ContentEntryFormModelModifier"],"mappings":";;;;;;;;;;;;;;;;AAgCO,MAAMA,uBAAuB;AAEpC,MAAMC,SAAS;AAEf,MAAMC;IAMF,YACqBC,gBAA4C,EAC5CC,mBAAkD,EAClDC,YAAoC,EACpCC,aAAwC,EACxCC,eAA0C,EAC1CC,kBAAgD,EAChDC,yBAA8D,EAC9DC,kBAAgD,EAChDC,mBAAkD,EAClDC,qBAAsD,EACtDC,kBAAgD,EAChDC,gCAA4E,EAC5EC,kBAA6D,CAChF;aAbmBZ,gBAAgB,GAAhBA;aACAC,mBAAmB,GAAnBA;aACAC,YAAY,GAAZA;aACAC,aAAa,GAAbA;aACAC,eAAe,GAAfA;aACAC,kBAAkB,GAAlBA;aACAC,yBAAyB,GAAzBA;aACAC,kBAAkB,GAAlBA;aACAC,mBAAmB,GAAnBA;aACAC,qBAAqB,GAArBA;aACAC,kBAAkB,GAAlBA;aACAC,gCAAgC,GAAhCA;aACAC,kBAAkB,GAAlBA;aAlBb,KAAK,GAA2B;aAChC,IAAI,GAA+B;aACnC,OAAO,GAAkB;aACzB,QAAQ,GAAkB;QAiB9BC,mBAcE,IAAI,EAAE;YACJ,kBAAkB;YAClB,qBAAqB;YACrB,cAAc;YACd,eAAe;YACf,iBAAiB;YACjB,oBAAoB;YACpB,oBAAoB;YACpB,qBAAqB;YACrB,uBAAuB;YACvB,oBAAoB;YACpB,kCAAkC;YAClC,oBAAoB;YACpB,IAAIC;QACR;IACJ;IAEA,IAAY,QAAQ;QAChB,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ;IACtC;IAEA,IAAI,KAA4B;QAC5B,MAAMC,QAAQ,IAAI,CAAC,KAAK;QACxB,MAAMC,OAAOD,OAAO;QACpB,MAAME,WAAWD,MAAM,UAAU;QACjC,MAAME,SAASF,MAAM;QAKrB,MAAMG,UACDF,YAAaC,CAAAA,AAAW,gBAAXA,UAA0BA,AAAW,kBAAXA,MAAuB,KAC9D,CAACD,YAAY,AAAc,SAAd,IAAI,CAAC,IAAI;QAE3B,OAAO;YACH,SAAS,IAAI,CAAC,OAAO;YACrB,OAAO,IAAI,CAAC,KAAK;YACjB,OAAOG,KAAK,IAAI,CAAC,KAAK;YACtB,MAAM,IAAI,CAAC,IAAI,EAAE,MAAM;YACvBD;YACAD;YACA,sBACI,CAAC,CAACA,UAAUC,WAAW;gBAAC;gBAAa;aAAc,CAAC,QAAQ,CAACD;YACjE,YAAY,AAAe,SAAf,IAAI,CAAC,KAAK,IAAaA,AAAW,gBAAXA;YACnC,cAAc,AAAe,SAAf,IAAI,CAAC,KAAK,IAAaA,AAAW,gBAAXA;YACrC,WAAW,AAAe,SAAf,IAAI,CAAC,KAAK;YACrB,YAAY,AAAe,SAAf,IAAI,CAAC,KAAK,IAAa,AAAc,SAAd,IAAI,CAAC,IAAI;YAC5C,SAAS,IAAI,CAAC,IAAI,EAAE,WAAW;QACnC;IACJ;IAEA,MAAM,aAAaG,OAAsC,EAAoB;QACzE,IAAI,CAAC,IAAI,CAAC,IAAI,EACV,OAAO;QAQX,MAAMC,OAAO,IAAI,CAAC,IAAI;QACtB,MAAMC,QAAQ,IAAI,CAAC,KAAK;QACxB,MAAMC,YAAY,IAAM,IAAI,CAAC,IAAI,KAAKF,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,KAAKC,MAAM,OAAO;QAElF,MAAME,iBAAiBJ,SAAS,kBAAkB;QAClD,MAAMK,OAAO,MAAMJ,KAAK,MAAM,CAAC;YAAEG;QAAe;QAMhD,IAAI,CAACC,QAAQ,CAACF,aACV,OAAO;QAIX,MAAMT,QAAQ,IAAI,CAAC,KAAK;QACxB,MAAMY,WAAW,IAAI,CAAC,QAAQ;QAE9BC,YAAY;YACR,IAAI,CAAC,OAAO,GAAG9B;QACnB;QAEA,IAAI;YACA,IAAI+B;YACJ,IAAId,OAKAc,aAAa,MAAM,IAAI,CAAC,SAAS,CAAC;gBAAEN;gBAAOR;gBAAOW;gBAAMD;YAAe;iBACpE;gBACH,MAAMK,aAAsC;oBAAE,QAAQJ;gBAAK;gBAC3D,IAAIC,UACAG,WAAW,eAAe,GAAG;oBAAEH;gBAAS;gBAG5CE,aAAa,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;oBAC/CN;oBACA,MAAMO;oBACN,SAAS;wBAAEL;oBAAe;gBAC9B;YACJ;YAOA,IAAI,CAACD,aACD,OAAO;YAGXI,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGC;gBACbP,KAAK,OAAO,CAACO,WAAW,MAAM;gBAC9BP,KAAK,KAAK;YACd;YAEA,OAAO;QACX,EAAE,OAAOS,OAAO;YACZ,IAAIP,aACAF,KAAK,SAAS,CAACU,aAAaD,OAAOR;YAEvC,OAAO;QACX,SAAU;YACNK,YAAY;gBAER,IAAI,IAAI,CAAC,OAAO,KAAK9B,QACjB,IAAI,CAAC,OAAO,GAAG;YAEvB;QACJ;IACJ;IAEA,MAAM,kBAAoC;QACtC,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,OAAO;QAGX,MAAMmC,SAAS,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAC1CpC,sBACA;YAAE,OAAO,IAAI,CAAC,KAAK;QAAC;QAGxB,IAAIoC,AAAW,UAAXA,QACA,OAAO;QAGXL,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;QAEA,IAAI;YACA,IAAIK,OAAO,mBAAmB,EAC1B,MAAM,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC;gBAChD,OAAO,IAAI,CAAC,KAAK;gBACjB,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE;gBACjB,qBAAqBA,OAAO,mBAAmB;YACnD;YAGJ,MAAMlB,QAAQ,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBACjD,OAAO,IAAI,CAAC,KAAK;gBACjB,YAAY,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B;YAEAa,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGb;YACjB;YAEA,OAAO;QACX,EAAE,OAAM;YACJ,OAAO;QACX,SAAU;YACNa,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,oBAAsC;QACxC,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,OAAO;QAGX,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMb,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;gBACnD,OAAO,IAAI,CAAC,KAAK;gBACjB,YAAY,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B;YAEAa,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGb;YACjB;YAEA,OAAO;QACX,EAAE,OAAM;YACJ,OAAO;QACX,SAAU;YACNa,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,cAAgC;QAClC,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,OAAO;QAGX,MAAML,QAAQ,IAAI,CAAC,KAAK;QACxB,MAAMR,QAAQ,IAAI,CAAC,KAAK;QAExB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAC5BmB,oBACA;YAAE,SAASnB,MAAM,OAAO;QAAC,GACzB;YACI,IAAI;gBACA,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;oBAClCQ;oBACA,IAAIR,MAAM,OAAO;gBACrB;gBAEAa,YAAY;oBACR,IAAI,CAAC,KAAK,GAAG;oBACb,IAAI,CAAC,IAAI,GAAG;gBAChB;gBAEA,OAAO;YACX,EAAE,OAAM;gBACJ,OAAO;YACX;QACJ;IAER;IAEA,MAAM,aAAaO,EAAU,EAAiB;QAC1C,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMpB,QAAQ,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC7C,OAAO,IAAI,CAAC,KAAK;gBACjBoB;YACJ;YAEAP,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGb;gBACb,IAAI,CAAC,oBAAoB,CAACA;YAC9B;QACJ,SAAU;YACNa,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,YAAYD,QAAuB,EAAQ;QACvC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,SAASS,aAAuC,EAAQ;QACpD,IAAI,CAAC,KAAK,GAAG;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS;QAC1B,IAAIA,eACA,IAAI,CAAC,IAAI,CAAC,OAAO,CAACA,eAAe;YAAE,OAAO;QAAK;IAEvD;IAEA,eAAepB,IAAsC,EAAQ;QACzD,IAAI,CAAC,IAAI,CAAC,KAAK,EACX;QAEJ,IAAI,CAAC,KAAK,GAAG;YACT,GAAG,IAAI,CAAC,KAAK;YACb,MAAM;gBAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI;gBAAE,GAAGA,IAAI;YAAC;QACxC;IACJ;IAEA,QAAc;QACV,IAAI,CAAC,IAAI,GAAG;QACZ,IAAI,CAAC,KAAK,GAAG;QACb,IAAI,CAAC,QAAQ,GAAG;IACpB;IAEQ,YAAiC;QACrC,MAAMqB,aAAa,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;QAC5D,MAAMf,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAACe;QAC1C,KAAK,MAAMC,YAAY,IAAI,CAAC,kBAAkB,CAC1CA,SAAS,UAAU,CAAChB,MAAM,IAAI,CAAC,KAAK;QAExC,OAAOA;IACX;IAEQ,qBAAqBP,KAAsB,EAAQ;QACvD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAACA,MAAM,MAAM;QAC9B,IAAI,CAAC,IAAI,CAAC,KAAK;IACnB;IAIA,MAAc,UAAUwB,MAAuB,EAA4B;QACvE,MAAM,EAAEhB,KAAK,EAAER,KAAK,EAAEW,IAAI,EAAED,cAAc,EAAE,GAAGc;QAE/C,IAAIxB,MAAM,IAAI,CAAC,MAAM,EACjB,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC;YAChDQ;YACA,YAAYR,MAAM,EAAE;YACpB,MAAM;gBACF,QAAQW;YACZ;YACA,SAAS;gBAAED;YAAe;QAC9B;QAEJ,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACzCF;YACA,YAAYR,MAAM,EAAE;YACpB,MAAM;gBACF,QAAQW;YACZ;YACA,SAAS;gBAAED;YAAe;QAC9B;IACJ;AACJ;AAEO,MAAMe,sDAA4BC,0BAAAA,oBAAgC,CAAC;IACtE,gBAAgB1C;IAChB,cAAc;QACV2C;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACA;YAACC;YAA+B;gBAAE,UAAU;YAAK;SAAE;KACtD;AACL"}

package/presentation/contentEntries/form/ContentEntryFormPresenter.test.js

@@ -14,12 +14,12 @@ import { CmsFormModelBuilder } from "../../../features/formModel/abstractions.js
 import { CmsModelContext } from "../../../features/contentEntry/abstractions.js";
 import { ContentEntryFormPresenter } from "./abstractions.js";
 import { ContentEntryFormPresenter as external_ContentEntryFormPresenter_js_ContentEntryFormPresenter } from "./ContentEntryFormPresenter.js";
-const createFakeForm = ()=>({
+const createFakeForm = (validation)=>({
         vm: {},
         isDirty: false,
-        submit: vi.fn(async ()=>({
+        submit: vi.fn(async ()=>validation ? validation : {
                 title: "Draft"
-            })),
+            }),
         setData: vi.fn(),
         reset: vi.fn(),
         setErrors: vi.fn()
@@ -37,13 +37,31 @@ const deferred = ()=>{
         reject
     };
 };
+const createEntry = (entryId)=>({
+        id: `${entryId}#0001`,
+        entryId,
+        meta: {
+            locked: false,
+            status: "draft",
+            title: entryId
+        },
+        values: {
+            title: entryId
+        }
+    });
 const setup = ()=>{
     const forms = [];
     const create = deferred();
+    const update = deferred();
+    let nextValidation;
+    const pendingLoads = new Map();
+    const createExecute = vi.fn(()=>create.promise);
+    const updateExecute = vi.fn(()=>update.promise);
     const container = new Container();
     container.registerInstance(FormModelFactory, {
         create: ()=>{
-            const form = createFakeForm();
+            const form = createFakeForm(nextValidation);
+            nextValidation = void 0;
             forms.push(form);
             return form;
         }
@@ -58,13 +76,17 @@ const setup = ()=>{
             })
     });
     container.registerInstance(CreateEntryUseCase, {
-        execute: ()=>create.promise
+        execute: createExecute
+    });
+    container.registerInstance(UpdateEntryUseCase, {
+        execute: updateExecute
+    });
+    container.registerInstance(GetEntryUseCase, {
+        execute: async ({ id })=>pendingLoads.get(id) ?? createEntry(id)
     });
     for (const abstraction of [
         Confirmation,
-        GetEntryUseCase,
         CreateRevisionFromUseCase,
-        UpdateEntryUseCase,
         PublishEntryUseCase,
         UnpublishEntryUseCase,
         DeleteEntryUseCase,
@@ -74,7 +96,16 @@ const setup = ()=>{
     return {
         presenter: container.resolve(ContentEntryFormPresenter),
         forms,
-        create
+        create,
+        createExecute,
+        update,
+        updateExecute,
+        pendingLoads,
+        slowValidation: ()=>{
+            const validation = deferred();
+            nextValidation = validation.promise;
+            return validation;
+        }
     };
 };
 describe("ContentEntryFormPresenter.saveRevision", ()=>{
@@ -86,18 +117,55 @@ describe("ContentEntryFormPresenter.saveRevision", ()=>{
         await expect(saving).resolves.toBe(false);
         expect(forms[0].setErrors).toHaveBeenCalledTimes(1);
     });
+    it("creates a new entry in the folder it was started in", async ()=>{
+        const { presenter, create, createExecute } = setup();
+        presenter.setFolderId("folder-1");
+        presenter.newEntry();
+        const saving = presenter.saveRevision();
+        create.resolve(createEntry("A"));
+        await expect(saving).resolves.toBe(true);
+        expect(createExecute).toHaveBeenCalledWith(expect.objectContaining({
+            data: {
+                values: {
+                    title: "Draft"
+                },
+                wbyAco_location: {
+                    folderId: "folder-1"
+                }
+            }
+        }));
+    });
+    it("does not carry the folder over to an entry started after a reset", async ()=>{
+        const { presenter, create, createExecute } = setup();
+        presenter.setFolderId("folder-1");
+        presenter.reset();
+        presenter.newEntry();
+        const saving = presenter.saveRevision();
+        create.resolve(createEntry("A"));
+        await expect(saving).resolves.toBe(true);
+        expect(createExecute).toHaveBeenCalledWith(expect.objectContaining({
+            data: {
+                values: {
+                    title: "Draft"
+                }
+            }
+        }));
+    });
     it("returns false instead of throwing when the form was reset mid-save", async ()=>{
-        const { presenter, create } = setup();
+        const { presenter, create, createExecute } = setup();
         presenter.newEntry();
         const saving = presenter.saveRevision();
+        await vi.waitFor(()=>expect(createExecute).toHaveBeenCalled());
         presenter.reset();
         create.reject(new Error("Value must be unique."));
         await expect(saving).resolves.toBe(false);
+        expect(presenter.vm.loading).toBe(null);
     });
     it("leaves a form built after the save started alone", async ()=>{
-        const { presenter, forms, create } = setup();
+        const { presenter, forms, create, createExecute } = setup();
         presenter.newEntry();
         const saving = presenter.saveRevision();
+        await vi.waitFor(()=>expect(createExecute).toHaveBeenCalled());
         presenter.newEntry();
         create.reject(new Error("Value must be unique."));
         await expect(saving).resolves.toBe(false);
@@ -105,6 +173,72 @@ describe("ContentEntryFormPresenter.saveRevision", ()=>{
         expect(forms[0].setErrors).not.toHaveBeenCalled();
         expect(forms[1].setErrors).not.toHaveBeenCalled();
     });
+    it("saves the open entry and puts the saved values on the form", async ()=>{
+        const { presenter, forms, update, updateExecute } = setup();
+        await presenter.loadRevision("A");
+        const saving = presenter.saveRevision();
+        await vi.waitFor(()=>expect(updateExecute).toHaveBeenCalled());
+        update.resolve(createEntry("A"));
+        await expect(saving).resolves.toBe(true);
+        expect(updateExecute).toHaveBeenCalledWith(expect.objectContaining({
+            revisionId: "A#0001",
+            data: {
+                values: {
+                    title: "Draft"
+                }
+            }
+        }));
+        expect(forms[0].setData).toHaveBeenLastCalledWith({
+            title: "A"
+        });
+    });
+    it("does not write to an entry opened while the form was validating", async ()=>{
+        const { presenter, update, updateExecute, slowValidation } = setup();
+        const validation = slowValidation();
+        await presenter.loadRevision("A");
+        const saving = presenter.saveRevision();
+        await presenter.loadRevision("B");
+        validation.resolve({
+            title: "Values typed into A"
+        });
+        update.resolve(createEntry("B"));
+        await expect(saving).resolves.toBe(false);
+        expect(updateExecute).not.toHaveBeenCalled();
+        expect(presenter.vm.entry?.entryId).toBe("B");
+    });
+    it("keeps a write on its entry and reports false when another entry was opened", async ()=>{
+        const { presenter, forms, update, updateExecute } = setup();
+        await presenter.loadRevision("A");
+        const saving = presenter.saveRevision();
+        await vi.waitFor(()=>expect(updateExecute).toHaveBeenCalled());
+        await presenter.loadRevision("B");
+        update.resolve(createEntry("A"));
+        await expect(saving).resolves.toBe(false);
+        expect(updateExecute).toHaveBeenCalledTimes(1);
+        expect(updateExecute).toHaveBeenCalledWith(expect.objectContaining({
+            revisionId: "A#0001"
+        }));
+        expect(presenter.vm.entry?.entryId).toBe("B");
+        expect(forms[1].setData).toHaveBeenCalledTimes(1);
+        expect(forms[1].setData).toHaveBeenCalledWith({
+            title: "B"
+        });
+    });
+    it("does not clear the loading message of an entry being opened", async ()=>{
+        const { presenter, update, updateExecute, pendingLoads } = setup();
+        await presenter.loadRevision("A");
+        const saving = presenter.saveRevision();
+        await vi.waitFor(()=>expect(updateExecute).toHaveBeenCalled());
+        const loadB = deferred();
+        pendingLoads.set("B", loadB.promise);
+        const loading = presenter.loadRevision("B");
+        update.resolve(createEntry("A"));
+        await expect(saving).resolves.toBe(true);
+        expect(presenter.vm.loading).toBe("Loading entry...");
+        loadB.resolve(createEntry("B"));
+        await loading;
+        expect(presenter.vm.loading).toBe(null);
+    });
 });
 
 //# sourceMappingURL=ContentEntryFormPresenter.test.js.map

package/presentation/contentEntries/form/ContentEntryFormPresenter.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/contentEntries/form/ContentEntryFormPresenter.test.js","sources":["../../../../src/presentation/contentEntries/form/ContentEntryFormPresenter.test.ts"],"sourcesContent":["// @vitest-environment jsdom\nimport { describe, it, expect, vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { Confirmation } from \"@webiny/app-admin/features/confirmation/abstractions.js\";\nimport { GetEntryUseCase } from \"~/features/contentEntry/getEntry/abstractions.js\";\nimport { CreateEntryUseCase } from \"~/features/contentEntry/createEntry/abstractions.js\";\nimport { UpdateEntryUseCase } from \"~/features/contentEntry/updateEntry/abstractions.js\";\nimport { PublishEntryUseCase } from \"~/features/contentEntry/publishEntry/abstractions.js\";\nimport { UnpublishEntryUseCase } from \"~/features/contentEntry/unpublishEntry/abstractions.js\";\nimport { DeleteEntryUseCase } from \"~/features/contentEntry/deleteEntry/abstractions.js\";\nimport { UpdateRevisionDescriptionUseCase } from \"~/features/contentEntry/updateRevisionDescription/abstractions.js\";\nimport { CreateRevisionFromUseCase } from \"~/features/contentEntry/createRevisionFrom/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsModelContext } from \"~/features/contentEntry/abstractions.js\";\nimport { ContentEntryFormPresenter as Abstraction } from \"./abstractions.js\";\nimport { ContentEntryFormPresenter } from \"./ContentEntryFormPresenter.js\";\n\nconst createFakeForm = () => ({\n    vm: {},\n    isDirty: false,\n    submit: vi.fn(async () => ({ title: \"Draft\" })),\n    setData: vi.fn(),\n    reset: vi.fn(),\n    setErrors: vi.fn()\n});\n\n/** A promise the test settles by hand, so it can act while a save is still in flight. */\nconst deferred = <T>() => {\n    let resolve!: (value: T) => void;\n    let reject!: (reason: unknown) => void;\n    const promise = new Promise<T>((res, rej) => {\n        resolve = res;\n        reject = rej;\n    });\n    return { promise, resolve, reject };\n};\n\nconst setup = () => {\n    const forms: ReturnType<typeof createFakeForm>[] = [];\n    const create = deferred<any>();\n\n    const container = new Container();\n    container.registerInstance(FormModelFactory, {\n        create: () => {\n            const form = createFakeForm();\n            forms.push(form);\n            return form;\n        }\n    } as unknown as FormModelFactory.Interface);\n    container.registerInstance(CmsFormModelBuilder, {\n        build: () => ({})\n    } as unknown as CmsFormModelBuilder.Interface);\n    container.registerInstance(CmsModelContext, {\n        getModel: () => ({ modelId: \"article\", fields: [] })\n    } as unknown as CmsModelContext.Interface);\n    container.registerInstance(CreateEntryUseCase, {\n        execute: () => create.promise\n    } as unknown as CreateEntryUseCase.Interface);\n\n    // Not reached by the create path these tests exercise.\n    for (const abstraction of [\n        Confirmation,\n        GetEntryUseCase,\n        CreateRevisionFromUseCase,\n        UpdateEntryUseCase,\n        PublishEntryUseCase,\n        UnpublishEntryUseCase,\n        DeleteEntryUseCase,\n        UpdateRevisionDescriptionUseCase\n    ]) {\n        container.registerInstance(abstraction as any, {});\n    }\n    container.register(ContentEntryFormPresenter);\n\n    return { presenter: container.resolve(Abstraction), forms, create };\n};\n\ndescribe(\"ContentEntryFormPresenter.saveRevision\", () => {\n    it(\"puts a rejected save's errors on the form\", async () => {\n        const { presenter, forms, create } = setup();\n        presenter.newEntry();\n\n        const saving = presenter.saveRevision();\n        create.reject(new Error(\"Value must be unique.\"));\n\n        await expect(saving).resolves.toBe(false);\n        expect(forms[0].setErrors).toHaveBeenCalledTimes(1);\n    });\n\n    it(\"returns false instead of throwing when the form was reset mid-save\", async () => {\n        const { presenter, create } = setup();\n        presenter.newEntry();\n\n        const saving = presenter.saveRevision();\n        presenter.reset();\n        create.reject(new Error(\"Value must be unique.\"));\n\n        await expect(saving).resolves.toBe(false);\n    });\n\n    it(\"leaves a form built after the save started alone\", async () => {\n        const { presenter, forms, create } = setup();\n        presenter.newEntry();\n\n        const saving = presenter.saveRevision();\n        presenter.newEntry();\n        create.reject(new Error(\"Value must be unique.\"));\n\n        await expect(saving).resolves.toBe(false);\n        expect(forms).toHaveLength(2);\n        expect(forms[0].setErrors).not.toHaveBeenCalled();\n        expect(forms[1].setErrors).not.toHaveBeenCalled();\n    });\n});\n"],"names":["createFakeForm","vi","deferred","resolve","reject","promise","Promise","res","rej","setup","forms","create","container","Container","FormModelFactory","form","CmsFormModelBuilder","CmsModelContext","CreateEntryUseCase","abstraction","Confirmation","GetEntryUseCase","CreateRevisionFromUseCase","UpdateEntryUseCase","PublishEntryUseCase","UnpublishEntryUseCase","DeleteEntryUseCase","UpdateRevisionDescriptionUseCase","ContentEntryFormPresenter","Abstraction","describe","it","presenter","saving","Error","expect"],"mappings":";;;;;;;;;;;;;;;;AAkBA,MAAMA,iBAAiB,IAAO;QAC1B,IAAI,CAAC;QACL,SAAS;QACT,QAAQC,GAAG,EAAE,CAAC,UAAa;gBAAE,OAAO;YAAQ;QAC5C,SAASA,GAAG,EAAE;QACd,OAAOA,GAAG,EAAE;QACZ,WAAWA,GAAG,EAAE;IACpB;AAGA,MAAMC,WAAW;IACb,IAAIC;IACJ,IAAIC;IACJ,MAAMC,UAAU,IAAIC,QAAW,CAACC,KAAKC;QACjCL,UAAUI;QACVH,SAASI;IACb;IACA,OAAO;QAAEH;QAASF;QAASC;IAAO;AACtC;AAEA,MAAMK,QAAQ;IACV,MAAMC,QAA6C,EAAE;IACrD,MAAMC,SAAST;IAEf,MAAMU,YAAY,IAAIC;IACtBD,UAAU,gBAAgB,CAACE,kBAAkB;QACzC,QAAQ;YACJ,MAAMC,OAAOf;YACbU,MAAM,IAAI,CAACK;YACX,OAAOA;QACX;IACJ;IACAH,UAAU,gBAAgB,CAACI,qBAAqB;QAC5C,OAAO,IAAO,EAAC;IACnB;IACAJ,UAAU,gBAAgB,CAACK,iBAAiB;QACxC,UAAU,IAAO;gBAAE,SAAS;gBAAW,QAAQ,EAAE;YAAC;IACtD;IACAL,UAAU,gBAAgB,CAACM,oBAAoB;QAC3C,SAAS,IAAMP,OAAO,OAAO;IACjC;IAGA,KAAK,MAAMQ,eAAe;QACtBC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;KACH,CACGf,UAAU,gBAAgB,CAACO,aAAoB,CAAC;IAEpDP,UAAU,QAAQ,CAACgB;IAEnB,OAAO;QAAE,WAAWhB,UAAU,OAAO,CAACiB;QAAcnB;QAAOC;IAAO;AACtE;AAEAmB,SAAS,0CAA0C;IAC/CC,GAAG,6CAA6C;QAC5C,MAAM,EAAEC,SAAS,EAAEtB,KAAK,EAAEC,MAAM,EAAE,GAAGF;QACrCuB,UAAU,QAAQ;QAElB,MAAMC,SAASD,UAAU,YAAY;QACrCrB,OAAO,MAAM,CAAC,IAAIuB,MAAM;QAExB,MAAMC,OAAOF,QAAQ,QAAQ,CAAC,IAAI,CAAC;QACnCE,OAAOzB,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,qBAAqB,CAAC;IACrD;IAEAqB,GAAG,sEAAsE;QACrE,MAAM,EAAEC,SAAS,EAAErB,MAAM,EAAE,GAAGF;QAC9BuB,UAAU,QAAQ;QAElB,MAAMC,SAASD,UAAU,YAAY;QACrCA,UAAU,KAAK;QACfrB,OAAO,MAAM,CAAC,IAAIuB,MAAM;QAExB,MAAMC,OAAOF,QAAQ,QAAQ,CAAC,IAAI,CAAC;IACvC;IAEAF,GAAG,oDAAoD;QACnD,MAAM,EAAEC,SAAS,EAAEtB,KAAK,EAAEC,MAAM,EAAE,GAAGF;QACrCuB,UAAU,QAAQ;QAElB,MAAMC,SAASD,UAAU,YAAY;QACrCA,UAAU,QAAQ;QAClBrB,OAAO,MAAM,CAAC,IAAIuB,MAAM;QAExB,MAAMC,OAAOF,QAAQ,QAAQ,CAAC,IAAI,CAAC;QACnCE,OAAOzB,OAAO,YAAY,CAAC;QAC3ByB,OAAOzB,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,gBAAgB;QAC/CyB,OAAOzB,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,gBAAgB;IACnD;AACJ"}
+{"version":3,"file":"presentation/contentEntries/form/ContentEntryFormPresenter.test.js","sources":["../../../../src/presentation/contentEntries/form/ContentEntryFormPresenter.test.ts"],"sourcesContent":["// @vitest-environment jsdom\nimport { describe, it, expect, vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { Confirmation } from \"@webiny/app-admin/features/confirmation/abstractions.js\";\nimport { GetEntryUseCase } from \"~/features/contentEntry/getEntry/abstractions.js\";\nimport { CreateEntryUseCase } from \"~/features/contentEntry/createEntry/abstractions.js\";\nimport { UpdateEntryUseCase } from \"~/features/contentEntry/updateEntry/abstractions.js\";\nimport { PublishEntryUseCase } from \"~/features/contentEntry/publishEntry/abstractions.js\";\nimport { UnpublishEntryUseCase } from \"~/features/contentEntry/unpublishEntry/abstractions.js\";\nimport { DeleteEntryUseCase } from \"~/features/contentEntry/deleteEntry/abstractions.js\";\nimport { UpdateRevisionDescriptionUseCase } from \"~/features/contentEntry/updateRevisionDescription/abstractions.js\";\nimport { CreateRevisionFromUseCase } from \"~/features/contentEntry/createRevisionFrom/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsModelContext } from \"~/features/contentEntry/abstractions.js\";\nimport { ContentEntryFormPresenter as Abstraction } from \"./abstractions.js\";\nimport { ContentEntryFormPresenter } from \"./ContentEntryFormPresenter.js\";\n\nconst createFakeForm = (validation?: Promise<unknown>) => ({\n    vm: {},\n    isDirty: false,\n    submit: vi.fn(async () => (validation ? validation : { title: \"Draft\" })),\n    setData: vi.fn(),\n    reset: vi.fn(),\n    setErrors: vi.fn()\n});\n\n/** A promise the test settles by hand, so it can act while a save is still in flight. */\nconst deferred = <T>() => {\n    let resolve!: (value: T) => void;\n    let reject!: (reason: unknown) => void;\n    const promise = new Promise<T>((res, rej) => {\n        resolve = res;\n        reject = rej;\n    });\n    return { promise, resolve, reject };\n};\n\nconst createEntry = (entryId: string) => ({\n    id: `${entryId}#0001`,\n    entryId,\n    meta: { locked: false, status: \"draft\", title: entryId },\n    values: { title: entryId }\n});\n\nconst setup = () => {\n    const forms: ReturnType<typeof createFakeForm>[] = [];\n    const create = deferred<any>();\n    const update = deferred<any>();\n    /** When set, the next form built validates only once the test resolves this. */\n    let nextValidation: Promise<unknown> | undefined;\n    /** Entries whose load the test settles by hand. */\n    const pendingLoads = new Map<string, Promise<any>>();\n\n    const createExecute = vi.fn(() => create.promise);\n    const updateExecute = vi.fn(() => update.promise);\n\n    const container = new Container();\n    container.registerInstance(FormModelFactory, {\n        create: () => {\n            const form = createFakeForm(nextValidation);\n            nextValidation = undefined;\n            forms.push(form);\n            return form;\n        }\n    } as unknown as FormModelFactory.Interface);\n    container.registerInstance(CmsFormModelBuilder, {\n        build: () => ({})\n    } as unknown as CmsFormModelBuilder.Interface);\n    container.registerInstance(CmsModelContext, {\n        getModel: () => ({ modelId: \"article\", fields: [] })\n    } as unknown as CmsModelContext.Interface);\n    container.registerInstance(CreateEntryUseCase, {\n        execute: createExecute\n    } as unknown as CreateEntryUseCase.Interface);\n    container.registerInstance(UpdateEntryUseCase, {\n        execute: updateExecute\n    } as unknown as UpdateEntryUseCase.Interface);\n    container.registerInstance(GetEntryUseCase, {\n        execute: async ({ id }: { id: string }) => pendingLoads.get(id) ?? createEntry(id)\n    } as unknown as GetEntryUseCase.Interface);\n\n    // Not reached by the paths these tests exercise.\n    for (const abstraction of [\n        Confirmation,\n        CreateRevisionFromUseCase,\n        PublishEntryUseCase,\n        UnpublishEntryUseCase,\n        DeleteEntryUseCase,\n        UpdateRevisionDescriptionUseCase\n    ]) {\n        container.registerInstance(abstraction as any, {});\n    }\n    container.register(ContentEntryFormPresenter);\n\n    return {\n        presenter: container.resolve(Abstraction),\n        forms,\n        create,\n        createExecute,\n        update,\n        updateExecute,\n        pendingLoads,\n        slowValidation: () => {\n            const validation = deferred<unknown>();\n            nextValidation = validation.promise;\n            return validation;\n        }\n    };\n};\n\ndescribe(\"ContentEntryFormPresenter.saveRevision\", () => {\n    it(\"puts a rejected save's errors on the form\", async () => {\n        const { presenter, forms, create } = setup();\n        presenter.newEntry();\n\n        const saving = presenter.saveRevision();\n        create.reject(new Error(\"Value must be unique.\"));\n\n        await expect(saving).resolves.toBe(false);\n        expect(forms[0].setErrors).toHaveBeenCalledTimes(1);\n    });\n\n    it(\"creates a new entry in the folder it was started in\", async () => {\n        const { presenter, create, createExecute } = setup();\n        presenter.setFolderId(\"folder-1\");\n        presenter.newEntry();\n\n        const saving = presenter.saveRevision();\n        create.resolve(createEntry(\"A\"));\n\n        await expect(saving).resolves.toBe(true);\n        expect(createExecute).toHaveBeenCalledWith(\n            expect.objectContaining({\n                data: { values: { title: \"Draft\" }, wbyAco_location: { folderId: \"folder-1\" } }\n            })\n        );\n    });\n\n    it(\"does not carry the folder over to an entry started after a reset\", async () => {\n        const { presenter, create, createExecute } = setup();\n        presenter.setFolderId(\"folder-1\");\n        presenter.reset();\n        presenter.newEntry();\n\n        const saving = presenter.saveRevision();\n        create.resolve(createEntry(\"A\"));\n\n        await expect(saving).resolves.toBe(true);\n        expect(createExecute).toHaveBeenCalledWith(\n            expect.objectContaining({ data: { values: { title: \"Draft\" } } })\n        );\n    });\n\n    it(\"returns false instead of throwing when the form was reset mid-save\", async () => {\n        const { presenter, create, createExecute } = setup();\n        presenter.newEntry();\n\n        const saving = presenter.saveRevision();\n        await vi.waitFor(() => expect(createExecute).toHaveBeenCalled());\n        presenter.reset();\n        create.reject(new Error(\"Value must be unique.\"));\n\n        await expect(saving).resolves.toBe(false);\n        expect(presenter.vm.loading).toBe(null);\n    });\n\n    it(\"leaves a form built after the save started alone\", async () => {\n        const { presenter, forms, create, createExecute } = setup();\n        presenter.newEntry();\n\n        const saving = presenter.saveRevision();\n        await vi.waitFor(() => expect(createExecute).toHaveBeenCalled());\n        presenter.newEntry();\n        create.reject(new Error(\"Value must be unique.\"));\n\n        await expect(saving).resolves.toBe(false);\n        expect(forms).toHaveLength(2);\n        expect(forms[0].setErrors).not.toHaveBeenCalled();\n        expect(forms[1].setErrors).not.toHaveBeenCalled();\n    });\n\n    it(\"saves the open entry and puts the saved values on the form\", async () => {\n        const { presenter, forms, update, updateExecute } = setup();\n        await presenter.loadRevision(\"A\");\n\n        const saving = presenter.saveRevision();\n        await vi.waitFor(() => expect(updateExecute).toHaveBeenCalled());\n        update.resolve(createEntry(\"A\"));\n\n        await expect(saving).resolves.toBe(true);\n        expect(updateExecute).toHaveBeenCalledWith(\n            expect.objectContaining({ revisionId: \"A#0001\", data: { values: { title: \"Draft\" } } })\n        );\n        expect(forms[0].setData).toHaveBeenLastCalledWith({ title: \"A\" });\n    });\n\n    it(\"does not write to an entry opened while the form was validating\", async () => {\n        const { presenter, update, updateExecute, slowValidation } = setup();\n        const validation = slowValidation();\n        await presenter.loadRevision(\"A\");\n\n        const saving = presenter.saveRevision();\n        await presenter.loadRevision(\"B\");\n        validation.resolve({ title: \"Values typed into A\" });\n        // Settled up front, so a write that wrongly goes out finishes instead of hanging.\n        update.resolve(createEntry(\"B\"));\n\n        await expect(saving).resolves.toBe(false);\n        expect(updateExecute).not.toHaveBeenCalled();\n        expect(presenter.vm.entry?.entryId).toBe(\"B\");\n    });\n\n    it(\"keeps a write on its entry and reports false when another entry was opened\", async () => {\n        const { presenter, forms, update, updateExecute } = setup();\n        await presenter.loadRevision(\"A\");\n\n        const saving = presenter.saveRevision();\n        await vi.waitFor(() => expect(updateExecute).toHaveBeenCalled());\n        await presenter.loadRevision(\"B\");\n        update.resolve(createEntry(\"A\"));\n\n        // False, so \"Save & Publish\" does not go on to publish B.\n        await expect(saving).resolves.toBe(false);\n        expect(updateExecute).toHaveBeenCalledTimes(1);\n        expect(updateExecute).toHaveBeenCalledWith(\n            expect.objectContaining({ revisionId: \"A#0001\" })\n        );\n        expect(presenter.vm.entry?.entryId).toBe(\"B\");\n        expect(forms[1].setData).toHaveBeenCalledTimes(1);\n        expect(forms[1].setData).toHaveBeenCalledWith({ title: \"B\" });\n    });\n\n    it(\"does not clear the loading message of an entry being opened\", async () => {\n        const { presenter, update, updateExecute, pendingLoads } = setup();\n        await presenter.loadRevision(\"A\");\n\n        const saving = presenter.saveRevision();\n        await vi.waitFor(() => expect(updateExecute).toHaveBeenCalled());\n\n        const loadB = deferred<any>();\n        pendingLoads.set(\"B\", loadB.promise);\n        const loading = presenter.loadRevision(\"B\");\n        update.resolve(createEntry(\"A\"));\n\n        // A's form is still on screen, because B hasn't loaded yet.\n        await expect(saving).resolves.toBe(true);\n        expect(presenter.vm.loading).toBe(\"Loading entry...\");\n\n        loadB.resolve(createEntry(\"B\"));\n        await loading;\n        expect(presenter.vm.loading).toBe(null);\n    });\n});\n"],"names":["createFakeForm","validation","vi","deferred","resolve","reject","promise","Promise","res","rej","createEntry","entryId","setup","forms","create","update","nextValidation","pendingLoads","Map","createExecute","updateExecute","container","Container","FormModelFactory","form","undefined","CmsFormModelBuilder","CmsModelContext","CreateEntryUseCase","UpdateEntryUseCase","GetEntryUseCase","id","abstraction","Confirmation","CreateRevisionFromUseCase","PublishEntryUseCase","UnpublishEntryUseCase","DeleteEntryUseCase","UpdateRevisionDescriptionUseCase","ContentEntryFormPresenter","Abstraction","describe","it","presenter","saving","Error","expect","slowValidation","loadB","loading"],"mappings":"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"}

package/presentation/contentEntries/preview/ModelEditorComponentDiscovery.js

@@ -20,7 +20,7 @@ const ModelEditorComponentDiscovery = ContentModelEditor.createDecorator((Origin
             }, [
             presenter
         ]);
-        return /*#__PURE__*/ react.createElement(react.Fragment, null, previewPath ? /*#__PURE__*/ react.createElement(ComponentDiscoveryIframe, {
+        return /*#__PURE__*/ react.createElement(react.Fragment, null, previewPath && previewDomain ? /*#__PURE__*/ react.createElement(ComponentDiscoveryIframe, {
             domain: previewDomain,
             previewPath: previewPath
         }) : null, /*#__PURE__*/ react.createElement(Original, null));

package/presentation/contentEntries/preview/ModelEditorComponentDiscovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/contentEntries/preview/ModelEditorComponentDiscovery.js","sources":["../../../../src/presentation/contentEntries/preview/ModelEditorComponentDiscovery.tsx"],"sourcesContent":["import React, { useEffect } from \"react\";\nimport { ContentModelEditor } from \"~/admin/components/ContentModelEditor/ContentModelEditor.js\";\nimport { useModelEditor } from \"~/admin/components/ContentModelEditor/useModelEditor.js\";\nimport { usePreviewDomain } from \"@webiny/frontend-settings/exports/admin.js\";\nimport { ComponentDiscoveryIframe } from \"./ComponentDiscoveryIframe.js\";\nimport { useLivePreviewPresenter } from \"./useLivePreviewPresenter.js\";\n\nexport const ModelEditorComponentDiscovery = ContentModelEditor.createDecorator(Original => {\n    return function ModelEditorWithDiscovery() {\n        const { data } = useModelEditor();\n        const presenter = useLivePreviewPresenter();\n        const previewPath = data?.settings?.previewPath as string | undefined;\n        const { previewDomain } = usePreviewDomain();\n\n        useEffect(() => {\n            if (!previewPath) {\n                presenter.clearComponents();\n            }\n        }, [previewPath, presenter]);\n\n        useEffect(() => {\n            return () => {\n                presenter.clearComponents();\n            };\n        }, [presenter]);\n\n        return (\n            <>\n                {previewPath ? (\n                    <ComponentDiscoveryIframe domain={previewDomain} previewPath={previewPath} />\n                ) : null}\n                <Original />\n            </>\n        );\n    };\n});\n"],"names":["ModelEditorComponentDiscovery","ContentModelEditor","Original","data","useModelEditor","presenter","useLivePreviewPresenter","previewPath","previewDomain","usePreviewDomain","useEffect","ComponentDiscoveryIframe"],"mappings":";;;;;;AAOO,MAAMA,gCAAgCC,mBAAmB,eAAe,CAACC,CAAAA,WACrE;QACH,MAAM,EAAEC,IAAI,EAAE,GAAGC;QACjB,MAAMC,YAAYC;QAClB,MAAMC,cAAcJ,MAAM,UAAU;QACpC,MAAM,EAAEK,aAAa,EAAE,GAAGC;QAE1BC,UAAU;YACN,IAAI,CAACH,aACDF,UAAU,eAAe;QAEjC,GAAG;YAACE;YAAaF;SAAU;QAE3BK,UAAU,IACC;gBACHL,UAAU,eAAe;YAC7B,GACD;YAACA;SAAU;QAEd,OAAO,WAAP,GACI,0CACKE,cAAc,WAAdA,GACG,oBAACI,0BAAwBA;YAAC,QAAQH;YAAe,aAAaD;aAC9D,oBACJ,oBAACL,UAAAA;IAGb"}
+{"version":3,"file":"presentation/contentEntries/preview/ModelEditorComponentDiscovery.js","sources":["../../../../src/presentation/contentEntries/preview/ModelEditorComponentDiscovery.tsx"],"sourcesContent":["import React, { useEffect } from \"react\";\nimport { ContentModelEditor } from \"~/admin/components/ContentModelEditor/ContentModelEditor.js\";\nimport { useModelEditor } from \"~/admin/components/ContentModelEditor/useModelEditor.js\";\nimport { usePreviewDomain } from \"@webiny/frontend-settings/exports/admin.js\";\nimport { ComponentDiscoveryIframe } from \"./ComponentDiscoveryIframe.js\";\nimport { useLivePreviewPresenter } from \"./useLivePreviewPresenter.js\";\n\nexport const ModelEditorComponentDiscovery = ContentModelEditor.createDecorator(Original => {\n    return function ModelEditorWithDiscovery() {\n        const { data } = useModelEditor();\n        const presenter = useLivePreviewPresenter();\n        const previewPath = data?.settings?.previewPath as string | undefined;\n        const { previewDomain } = usePreviewDomain();\n\n        useEffect(() => {\n            if (!previewPath) {\n                presenter.clearComponents();\n            }\n        }, [previewPath, presenter]);\n\n        useEffect(() => {\n            return () => {\n                presenter.clearComponents();\n            };\n        }, [presenter]);\n\n        return (\n            <>\n                {previewPath && previewDomain ? (\n                    <ComponentDiscoveryIframe domain={previewDomain} previewPath={previewPath} />\n                ) : null}\n                <Original />\n            </>\n        );\n    };\n});\n"],"names":["ModelEditorComponentDiscovery","ContentModelEditor","Original","data","useModelEditor","presenter","useLivePreviewPresenter","previewPath","previewDomain","usePreviewDomain","useEffect","ComponentDiscoveryIframe"],"mappings":";;;;;;AAOO,MAAMA,gCAAgCC,mBAAmB,eAAe,CAACC,CAAAA,WACrE;QACH,MAAM,EAAEC,IAAI,EAAE,GAAGC;QACjB,MAAMC,YAAYC;QAClB,MAAMC,cAAcJ,MAAM,UAAU;QACpC,MAAM,EAAEK,aAAa,EAAE,GAAGC;QAE1BC,UAAU;YACN,IAAI,CAACH,aACDF,UAAU,eAAe;QAEjC,GAAG;YAACE;YAAaF;SAAU;QAE3BK,UAAU,IACC;gBACHL,UAAU,eAAe;YAC7B,GACD;YAACA;SAAU;QAEd,OAAO,WAAP,GACI,0CACKE,eAAeC,gBAAgB,WAAhBA,GACZ,oBAACG,0BAAwBA;YAAC,QAAQH;YAAe,aAAaD;aAC9D,oBACJ,oBAACL,UAAAA;IAGb"}

package/presentation/contentEntries/preview/PreviewDecorator.js

@@ -5,6 +5,7 @@ import { usePreviewDomain } from "@webiny/frontend-settings/exports/admin.js";
 import { ContentEntryFormContent } from "../views/layout/ContentEntryFormContent.js";
 import { useContentEntryFormPresenter } from "../form/useContentEntryFormPresenter.js";
 import { PreviewPane } from "./PreviewPane.js";
+import { PreviewDomainStatus } from "./PreviewDomainStatus.js";
 import { useLivePreviewPresenter } from "./useLivePreviewPresenter.js";
 import { getPatternRefFieldIds, getRefValues, withRefValues } from "./resolvePreviewUrl.js";
 const PreviewDecorator = ContentEntryFormContent.createDecorator((Original)=>createReactiveComponent((props)=>{
@@ -12,7 +13,7 @@ const PreviewDecorator = ContentEntryFormContent.createDecorator((Original)=>cre
         const livePreview = useLivePreviewPresenter();
         const model = presenter.vm.model;
         const previewPath = model?.settings?.previewPath;
-        const { previewDomain } = usePreviewDomain();
+        const domain = usePreviewDomain();
         const form = presenter.vm.form;
         const entry = presenter.vm.entry;
         const formValues = form ? form.getData() : null;
@@ -49,12 +50,17 @@ const PreviewDecorator = ContentEntryFormContent.createDecorator((Original)=>cre
             style: {
                 overflowY: "hidden"
             }
-        }, /*#__PURE__*/ react.createElement(PreviewPane, {
-            domain: previewDomain,
+        }, domain.previewDomain ? /*#__PURE__*/ react.createElement(PreviewPane, {
+            domain: domain.previewDomain,
+            settingsDomain: domain.isOverridden ? domain.settingsDomain : null,
+            onResetDomain: domain.unsetPreviewDomain,
             previewPath: previewPath,
             entryId: entryId,
             entryData: entryData,
             urlEntryData: urlEntryData
+        }) : /*#__PURE__*/ react.createElement(PreviewDomainStatus, {
+            error: domain.error,
+            onRetry: domain.retry
         })));
     }));
 export { PreviewDecorator };