@webiny/app-headless-cms 6.5.0-beta.1 → 6.5.0-beta.11

package/presentation/contentEntries/preview/resolvePreviewUrl.test.js

@@ -0,0 +1,127 @@
+import { describe, expect, it } from "vitest";
+import { buildDisplayUrl, buildEditorUrl, getPatternRefFieldIds, getRefValues, resolveSlugPattern, withRefValues } from "./resolvePreviewUrl.js";
+const fields = [
+    {
+        fieldId: "slug",
+        type: "text"
+    },
+    {
+        fieldId: "location",
+        type: "ref"
+    },
+    {
+        fieldId: "tags",
+        type: "ref"
+    }
+];
+const resolvePreviewUrl_test_location = {
+    id: "loc1#0001",
+    modelId: "location"
+};
+describe("resolvePreviewUrl", ()=>{
+    it("should resolve plain values and fall back to `new` for missing ones", ()=>{
+        expect(resolveSlugPattern("/articles/{values.slug}", {
+            values: {
+                slug: "hello"
+            }
+        })).toBe("/articles/hello");
+        expect(resolveSlugPattern("/articles/{values.slug}", {
+            values: {}
+        })).toBe("/articles/new");
+    });
+    it("should build the iframe url from the static prefix only", ()=>{
+        expect(buildEditorUrl("https://site.com/", "/articles/{values.slug}")).toBe("https://site.com/articles/preview");
+        expect(buildEditorUrl("https://site.com", "/{values.location.slug}/{values.slug}")).toBe("https://site.com/preview");
+    });
+    it("should find ref fields the pattern reads through", ()=>{
+        expect(getPatternRefFieldIds("/{values.location.slug}/{values.slug}/{values.tags}", fields)).toEqual([
+            "location"
+        ]);
+        expect(getPatternRefFieldIds("/articles/{values.slug}", fields)).toEqual([]);
+    });
+    it("should collect ref values from single and multiple-value fields", ()=>{
+        const tag = {
+            id: "tag1#0001",
+            modelId: "tag"
+        };
+        expect(getRefValues({
+            location: resolvePreviewUrl_test_location,
+            tags: [
+                tag,
+                null
+            ],
+            slug: "x"
+        }, [
+            "location",
+            "tags"
+        ])).toEqual([
+            resolvePreviewUrl_test_location,
+            tag
+        ]);
+        expect(getRefValues({
+            location: null
+        }, [
+            "location"
+        ])).toEqual([]);
+    });
+    it("should resolve a ref field value once the referenced entry is loaded", ()=>{
+        const entry = {
+            id: "page1#0001",
+            values: {
+                slug: "climbing",
+                location: resolvePreviewUrl_test_location
+            }
+        };
+        const pattern = "/{values.location.slug}/{values.slug}";
+        const notLoaded = withRefValues(entry, [
+            "location"
+        ], {});
+        expect(buildDisplayUrl("https://site.com", pattern, notLoaded)).toBe("https://site.com/new/climbing");
+        const loaded = withRefValues(entry, [
+            "location"
+        ], {
+            [resolvePreviewUrl_test_location.id]: {
+                slug: "baker",
+                id: "should-not-win"
+            }
+        });
+        expect(buildDisplayUrl("https://site.com", pattern, loaded)).toBe("https://site.com/baker/climbing");
+        expect(loaded.values.location.id).toBe(resolvePreviewUrl_test_location.id);
+    });
+    it("should support indexing into multiple-value ref fields", ()=>{
+        const tag = {
+            id: "tag1#0001",
+            modelId: "tag"
+        };
+        const entry = {
+            values: {
+                tags: [
+                    tag
+                ]
+            }
+        };
+        const resolved = withRefValues(entry, [
+            "tags"
+        ], {
+            [tag.id]: {
+                slug: "news"
+            }
+        });
+        expect(resolveSlugPattern("/{values.tags.0.slug}", resolved)).toBe("/news");
+    });
+    it("should leave the entry untouched when there are no ref fields to fill in", ()=>{
+        const entry = {
+            values: {
+                slug: "x",
+                location: resolvePreviewUrl_test_location
+            }
+        };
+        expect(withRefValues(entry, [], {
+            [resolvePreviewUrl_test_location.id]: {
+                slug: "baker"
+            }
+        })).toBe(entry);
+    });
+});
+
+//# sourceMappingURL=resolvePreviewUrl.test.js.map

package/presentation/contentEntries/preview/resolvePreviewUrl.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"presentation/contentEntries/preview/resolvePreviewUrl.test.js","sources":["../../../../src/presentation/contentEntries/preview/resolvePreviewUrl.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport {\n    buildDisplayUrl,\n    buildEditorUrl,\n    getPatternRefFieldIds,\n    getRefValues,\n    resolveSlugPattern,\n    withRefValues\n} from \"./resolvePreviewUrl.js\";\n\nconst fields = [\n    { fieldId: \"slug\", type: \"text\" },\n    { fieldId: \"location\", type: \"ref\" },\n    { fieldId: \"tags\", type: \"ref\" }\n];\n\nconst location = { id: \"loc1#0001\", modelId: \"location\" };\n\ndescribe(\"resolvePreviewUrl\", () => {\n    it(\"should resolve plain values and fall back to `new` for missing ones\", () => {\n        expect(resolveSlugPattern(\"/articles/{values.slug}\", { values: { slug: \"hello\" } })).toBe(\n            \"/articles/hello\"\n        );\n        expect(resolveSlugPattern(\"/articles/{values.slug}\", { values: {} })).toBe(\"/articles/new\");\n    });\n\n    it(\"should build the iframe url from the static prefix only\", () => {\n        expect(buildEditorUrl(\"https://site.com/\", \"/articles/{values.slug}\")).toBe(\n            \"https://site.com/articles/preview\"\n        );\n        expect(buildEditorUrl(\"https://site.com\", \"/{values.location.slug}/{values.slug}\")).toBe(\n            \"https://site.com/preview\"\n        );\n    });\n\n    it(\"should find ref fields the pattern reads through\", () => {\n        expect(\n            getPatternRefFieldIds(\"/{values.location.slug}/{values.slug}/{values.tags}\", fields)\n        ).toEqual([\"location\"]);\n        expect(getPatternRefFieldIds(\"/articles/{values.slug}\", fields)).toEqual([]);\n    });\n\n    it(\"should collect ref values from single and multiple-value fields\", () => {\n        const tag = { id: \"tag1#0001\", modelId: \"tag\" };\n        expect(\n            getRefValues({ location, tags: [tag, null], slug: \"x\" }, [\"location\", \"tags\"])\n        ).toEqual([location, tag]);\n        expect(getRefValues({ location: null }, [\"location\"])).toEqual([]);\n    });\n\n    it(\"should resolve a ref field value once the referenced entry is loaded\", () => {\n        const entry = { id: \"page1#0001\", values: { slug: \"climbing\", location } };\n        const pattern = \"/{values.location.slug}/{values.slug}\";\n\n        const notLoaded = withRefValues(entry, [\"location\"], {});\n        expect(buildDisplayUrl(\"https://site.com\", pattern, notLoaded)).toBe(\n            \"https://site.com/new/climbing\"\n        );\n\n        const loaded = withRefValues(entry, [\"location\"], {\n            [location.id]: { slug: \"baker\", id: \"should-not-win\" }\n        });\n        expect(buildDisplayUrl(\"https://site.com\", pattern, loaded)).toBe(\n            \"https://site.com/baker/climbing\"\n        );\n        expect((loaded.values as any).location.id).toBe(location.id);\n    });\n\n    it(\"should support indexing into multiple-value ref fields\", () => {\n        const tag = { id: \"tag1#0001\", modelId: \"tag\" };\n        const entry = { values: { tags: [tag] } };\n        const resolved = withRefValues(entry, [\"tags\"], { [tag.id]: { slug: \"news\" } });\n        expect(resolveSlugPattern(\"/{values.tags.0.slug}\", resolved)).toBe(\"/news\");\n    });\n\n    it(\"should leave the entry untouched when there are no ref fields to fill in\", () => {\n        const entry = { values: { slug: \"x\", location } };\n        expect(withRefValues(entry, [], { [location.id]: { slug: \"baker\" } })).toBe(entry);\n    });\n});\n"],"names":["fields","location","describe","it","expect","resolveSlugPattern","buildEditorUrl","getPatternRefFieldIds","tag","getRefValues","entry","pattern","notLoaded","withRefValues","buildDisplayUrl","loaded","resolved"],"mappings":";;AAUA,MAAMA,SAAS;IACX;QAAE,SAAS;QAAQ,MAAM;IAAO;IAChC;QAAE,SAAS;QAAY,MAAM;IAAM;IACnC;QAAE,SAAS;QAAQ,MAAM;IAAM;CAClC;AAED,MAAMC,kCAAW;IAAE,IAAI;IAAa,SAAS;AAAW;AAExDC,SAAS,qBAAqB;IAC1BC,GAAG,uEAAuE;QACtEC,OAAOC,mBAAmB,2BAA2B;YAAE,QAAQ;gBAAE,MAAM;YAAQ;QAAE,IAAI,IAAI,CACrF;QAEJD,OAAOC,mBAAmB,2BAA2B;YAAE,QAAQ,CAAC;QAAE,IAAI,IAAI,CAAC;IAC/E;IAEAF,GAAG,2DAA2D;QAC1DC,OAAOE,eAAe,qBAAqB,4BAA4B,IAAI,CACvE;QAEJF,OAAOE,eAAe,oBAAoB,0CAA0C,IAAI,CACpF;IAER;IAEAH,GAAG,oDAAoD;QACnDC,OACIG,sBAAsB,uDAAuDP,SAC/E,OAAO,CAAC;YAAC;SAAW;QACtBI,OAAOG,sBAAsB,2BAA2BP,SAAS,OAAO,CAAC,EAAE;IAC/E;IAEAG,GAAG,mEAAmE;QAClE,MAAMK,MAAM;YAAE,IAAI;YAAa,SAAS;QAAM;QAC9CJ,OACIK,aAAa;YAAER,UAAAA;YAAU,MAAM;gBAACO;gBAAK;aAAK;YAAE,MAAM;QAAI,GAAG;YAAC;YAAY;SAAO,GAC/E,OAAO,CAAC;YAACP;YAAUO;SAAI;QACzBJ,OAAOK,aAAa;YAAE,UAAU;QAAK,GAAG;YAAC;SAAW,GAAG,OAAO,CAAC,EAAE;IACrE;IAEAN,GAAG,wEAAwE;QACvE,MAAMO,QAAQ;YAAE,IAAI;YAAc,QAAQ;gBAAE,MAAM;gBAAYT,UAAAA;YAAS;QAAE;QACzE,MAAMU,UAAU;QAEhB,MAAMC,YAAYC,cAAcH,OAAO;YAAC;SAAW,EAAE,CAAC;QACtDN,OAAOU,gBAAgB,oBAAoBH,SAASC,YAAY,IAAI,CAChE;QAGJ,MAAMG,SAASF,cAAcH,OAAO;YAAC;SAAW,EAAE;YAC9C,CAACT,gCAAS,EAAE,CAAC,EAAE;gBAAE,MAAM;gBAAS,IAAI;YAAiB;QACzD;QACAG,OAAOU,gBAAgB,oBAAoBH,SAASI,SAAS,IAAI,CAC7D;QAEJX,OAAQW,OAAO,MAAM,CAAS,QAAQ,CAAC,EAAE,EAAE,IAAI,CAACd,gCAAS,EAAE;IAC/D;IAEAE,GAAG,0DAA0D;QACzD,MAAMK,MAAM;YAAE,IAAI;YAAa,SAAS;QAAM;QAC9C,MAAME,QAAQ;YAAE,QAAQ;gBAAE,MAAM;oBAACF;iBAAI;YAAC;QAAE;QACxC,MAAMQ,WAAWH,cAAcH,OAAO;YAAC;SAAO,EAAE;YAAE,CAACF,IAAI,EAAE,CAAC,EAAE;gBAAE,MAAM;YAAO;QAAE;QAC7EJ,OAAOC,mBAAmB,yBAAyBW,WAAW,IAAI,CAAC;IACvE;IAEAb,GAAG,4EAA4E;QAC3E,MAAMO,QAAQ;YAAE,QAAQ;gBAAE,MAAM;gBAAKT,UAAAA;YAAS;QAAE;QAChDG,OAAOS,cAAcH,OAAO,EAAE,EAAE;YAAE,CAACT,gCAAS,EAAE,CAAC,EAAE;gBAAE,MAAM;YAAQ;QAAE,IAAI,IAAI,CAACS;IAChF;AACJ"}

package/presentation/contentEntries/singleEntry/SingleEntryPresenter.js

@@ -4,6 +4,7 @@ import { GetSingletonEntryUseCase, UpdateSingletonEntryUseCase } from "../../../
 import { CmsFormModelBuilder } from "../../../features/formModel/abstractions.js";
 import { CmsModelContext } from "../../../features/contentEntry/abstractions.js";
 import { SingleEntryPresenter } from "./abstractions.js";
+import { toFormErrors } from "../form/toFormErrors.js";
 class SingleEntryPresenterImpl {
     constructor(formModelFactory, cmsFormModelBuilder, modelAccessor, getSingletonEntryUseCase, updateSingletonEntryUseCase){
         this.formModelFactory = formModelFactory;
@@ -37,7 +38,9 @@ class SingleEntryPresenterImpl {
     }
     async save() {
         if (!this.form) return false;
-        const data = await this.form.submit();
+        const form = this.form;
+        const model = this.model;
+        const data = await form.submit();
         if (!data) return false;
         this.loading = "Saving...";
         try {
@@ -48,12 +51,14 @@ class SingleEntryPresenterImpl {
                 }
             });
             runInAction(()=>{
+                if (this.form !== form) return;
                 this.entry = entry;
-                this.form.setData(entry.values);
-                this.form.reset();
+                form.setData(entry.values);
+                form.reset();
             });
             return true;
-        } catch  {
+        } catch (error) {
+            if (this.form === form) form.setErrors(toFormErrors(error, model));
             return false;
         } finally{
             runInAction(()=>{

package/presentation/contentEntries/singleEntry/SingleEntryPresenter.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/contentEntries/singleEntry/SingleEntryPresenter.js","sources":["../../../../src/presentation/contentEntries/singleEntry/SingleEntryPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable, runInAction } from \"mobx\";\nimport type { IFormModel } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport type { CmsContentEntry } from \"~/types.js\";\nimport { GetSingletonEntryUseCase } from \"~/features/contentEntry/singletonEntry/abstractions.js\";\nimport { UpdateSingletonEntryUseCase } from \"~/features/contentEntry/singletonEntry/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsModelContext } from \"~/features/contentEntry/abstractions.js\";\nimport {\n    SingleEntryPresenter as Abstraction,\n    type ISingleEntryPresenter,\n    type ISingleEntryViewModel\n} from \"./abstractions.js\";\n\nclass SingleEntryPresenterImpl implements ISingleEntryPresenter {\n    private entry: CmsContentEntry | null = null;\n    private form: IFormModel | null = null;\n    private loading: string | null = null;\n\n    constructor(\n        private formModelFactory: FormModelFactory.Interface,\n        private cmsFormModelBuilder: CmsFormModelBuilder.Interface,\n        private modelAccessor: CmsModelContext.Interface,\n        private getSingletonEntryUseCase: GetSingletonEntryUseCase.Interface,\n        private updateSingletonEntryUseCase: UpdateSingletonEntryUseCase.Interface\n    ) {\n        makeAutoObservable<\n            SingleEntryPresenterImpl,\n            | \"formModelFactory\"\n            | \"cmsFormModelBuilder\"\n            | \"modelAccessor\"\n            | \"getSingletonEntryUseCase\"\n            | \"updateSingletonEntryUseCase\"\n        >(this, {\n            formModelFactory: false,\n            cmsFormModelBuilder: false,\n            modelAccessor: false,\n            getSingletonEntryUseCase: false,\n            updateSingletonEntryUseCase: false,\n            vm: computed\n        });\n    }\n\n    private get model() {\n        return this.modelAccessor.getModel();\n    }\n\n    get vm(): ISingleEntryViewModel {\n        return {\n            loading: this.loading,\n            entry: this.entry,\n            form: this.form?.vm ?? null,\n            canSave: this.form !== null,\n            isDirty: this.form?.isDirty ?? false\n        };\n    }\n\n    async save(): Promise<boolean> {\n        if (!this.form) {\n            return false;\n        }\n\n        const data = await this.form.submit();\n        if (!data) {\n            return false;\n        }\n\n        this.loading = \"Saving...\";\n\n        try {\n            const entry = await this.updateSingletonEntryUseCase.execute({\n                model: this.model,\n                data: {\n                    values: data\n                }\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n                this.form!.setData(entry.values);\n                this.form!.reset();\n            });\n\n            return true;\n        } catch {\n            return false;\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    async init(): Promise<void> {\n        this.loading = \"Loading...\";\n\n        try {\n            const entry = await this.getSingletonEntryUseCase.execute({\n                model: this.model\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n                const formConfig = this.cmsFormModelBuilder.build(this.model);\n                this.form = this.formModelFactory.create(formConfig);\n                this.form.setData(entry.values);\n                this.form.reset();\n            });\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    dispose(): void {\n        this.form = null;\n        this.entry = null;\n    }\n}\n\nexport const SingleEntryPresenter = Abstraction.createImplementation({\n    implementation: SingleEntryPresenterImpl,\n    dependencies: [\n        FormModelFactory,\n        CmsFormModelBuilder,\n        CmsModelContext,\n        GetSingletonEntryUseCase,\n        UpdateSingletonEntryUseCase\n    ]\n});\n"],"names":["SingleEntryPresenterImpl","formModelFactory","cmsFormModelBuilder","modelAccessor","getSingletonEntryUseCase","updateSingletonEntryUseCase","makeAutoObservable","computed","data","entry","runInAction","formConfig","SingleEntryPresenter","Abstraction","FormModelFactory","CmsFormModelBuilder","CmsModelContext","GetSingletonEntryUseCase","UpdateSingletonEntryUseCase"],"mappings":";;;;;;AAcA,MAAMA;IAKF,YACYC,gBAA4C,EAC5CC,mBAAkD,EAClDC,aAAwC,EACxCC,wBAA4D,EAC5DC,2BAAkE,CAC5E;aALUJ,gBAAgB,GAAhBA;aACAC,mBAAmB,GAAnBA;aACAC,aAAa,GAAbA;aACAC,wBAAwB,GAAxBA;aACAC,2BAA2B,GAA3BA;aATJ,KAAK,GAA2B;aAChC,IAAI,GAAsB;aAC1B,OAAO,GAAkB;QAS7BC,mBAOE,IAAI,EAAE;YACJ,kBAAkB;YAClB,qBAAqB;YACrB,eAAe;YACf,0BAA0B;YAC1B,6BAA6B;YAC7B,IAAIC;QACR;IACJ;IAEA,IAAY,QAAQ;QAChB,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ;IACtC;IAEA,IAAI,KAA4B;QAC5B,OAAO;YACH,SAAS,IAAI,CAAC,OAAO;YACrB,OAAO,IAAI,CAAC,KAAK;YACjB,MAAM,IAAI,CAAC,IAAI,EAAE,MAAM;YACvB,SAAS,AAAc,SAAd,IAAI,CAAC,IAAI;YAClB,SAAS,IAAI,CAAC,IAAI,EAAE,WAAW;QACnC;IACJ;IAEA,MAAM,OAAyB;QAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,EACV,OAAO;QAGX,MAAMC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM;QACnC,IAAI,CAACA,MACD,OAAO;QAGX,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMC,QAAQ,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC;gBACzD,OAAO,IAAI,CAAC,KAAK;gBACjB,MAAM;oBACF,QAAQD;gBACZ;YACJ;YAEAE,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGD;gBACb,IAAI,CAAC,IAAI,CAAE,OAAO,CAACA,MAAM,MAAM;gBAC/B,IAAI,CAAC,IAAI,CAAE,KAAK;YACpB;YAEA,OAAO;QACX,EAAE,OAAM;YACJ,OAAO;QACX,SAAU;YACNC,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,OAAsB;QACxB,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMD,QAAQ,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;gBACtD,OAAO,IAAI,CAAC,KAAK;YACrB;YAEAC,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGD;gBACb,MAAME,aAAa,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;gBAC5D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAACA;gBACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAACF,MAAM,MAAM;gBAC9B,IAAI,CAAC,IAAI,CAAC,KAAK;YACnB;QACJ,SAAU;YACNC,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,UAAgB;QACZ,IAAI,CAAC,IAAI,GAAG;QACZ,IAAI,CAAC,KAAK,GAAG;IACjB;AACJ;AAEO,MAAME,4CAAuBC,qBAAAA,oBAAgC,CAAC;IACjE,gBAAgBb;IAChB,cAAc;QACVc;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"presentation/contentEntries/singleEntry/SingleEntryPresenter.js","sources":["../../../../src/presentation/contentEntries/singleEntry/SingleEntryPresenter.ts"],"sourcesContent":["import { computed, makeAutoObservable, runInAction } from \"mobx\";\nimport type { IFormModel } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport type { CmsContentEntry } from \"~/types.js\";\nimport { GetSingletonEntryUseCase } from \"~/features/contentEntry/singletonEntry/abstractions.js\";\nimport { UpdateSingletonEntryUseCase } from \"~/features/contentEntry/singletonEntry/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsModelContext } from \"~/features/contentEntry/abstractions.js\";\nimport {\n    SingleEntryPresenter as Abstraction,\n    type ISingleEntryPresenter,\n    type ISingleEntryViewModel\n} from \"./abstractions.js\";\nimport { toFormErrors } from \"~/presentation/contentEntries/form/toFormErrors.js\";\n\nclass SingleEntryPresenterImpl implements ISingleEntryPresenter {\n    private entry: CmsContentEntry | null = null;\n    private form: IFormModel | null = null;\n    private loading: string | null = null;\n\n    constructor(\n        private formModelFactory: FormModelFactory.Interface,\n        private cmsFormModelBuilder: CmsFormModelBuilder.Interface,\n        private modelAccessor: CmsModelContext.Interface,\n        private getSingletonEntryUseCase: GetSingletonEntryUseCase.Interface,\n        private updateSingletonEntryUseCase: UpdateSingletonEntryUseCase.Interface\n    ) {\n        makeAutoObservable<\n            SingleEntryPresenterImpl,\n            | \"formModelFactory\"\n            | \"cmsFormModelBuilder\"\n            | \"modelAccessor\"\n            | \"getSingletonEntryUseCase\"\n            | \"updateSingletonEntryUseCase\"\n        >(this, {\n            formModelFactory: false,\n            cmsFormModelBuilder: false,\n            modelAccessor: false,\n            getSingletonEntryUseCase: false,\n            updateSingletonEntryUseCase: false,\n            vm: computed\n        });\n    }\n\n    private get model() {\n        return this.modelAccessor.getModel();\n    }\n\n    get vm(): ISingleEntryViewModel {\n        return {\n            loading: this.loading,\n            entry: this.entry,\n            form: this.form?.vm ?? null,\n            canSave: this.form !== null,\n            isDirty: this.form?.isDirty ?? false\n        };\n    }\n\n    async save(): Promise<boolean> {\n        if (!this.form) {\n            return false;\n        }\n\n        // The form can be disposed or rebuilt while saving; only the form being saved gets the result.\n        const form = this.form;\n        const model = this.model;\n\n        const data = await form.submit();\n        if (!data) {\n            return false;\n        }\n\n        this.loading = \"Saving...\";\n\n        try {\n            const entry = await this.updateSingletonEntryUseCase.execute({\n                model: this.model,\n                data: {\n                    values: data\n                }\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            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 init(): Promise<void> {\n        this.loading = \"Loading...\";\n\n        try {\n            const entry = await this.getSingletonEntryUseCase.execute({\n                model: this.model\n            });\n\n            runInAction(() => {\n                this.entry = entry;\n                const formConfig = this.cmsFormModelBuilder.build(this.model);\n                this.form = this.formModelFactory.create(formConfig);\n                this.form.setData(entry.values);\n                this.form.reset();\n            });\n        } finally {\n            runInAction(() => {\n                this.loading = null;\n            });\n        }\n    }\n\n    dispose(): void {\n        this.form = null;\n        this.entry = null;\n    }\n}\n\nexport const SingleEntryPresenter = Abstraction.createImplementation({\n    implementation: SingleEntryPresenterImpl,\n    dependencies: [\n        FormModelFactory,\n        CmsFormModelBuilder,\n        CmsModelContext,\n        GetSingletonEntryUseCase,\n        UpdateSingletonEntryUseCase\n    ]\n});\n"],"names":["SingleEntryPresenterImpl","formModelFactory","cmsFormModelBuilder","modelAccessor","getSingletonEntryUseCase","updateSingletonEntryUseCase","makeAutoObservable","computed","form","model","data","entry","runInAction","error","toFormErrors","formConfig","SingleEntryPresenter","Abstraction","FormModelFactory","CmsFormModelBuilder","CmsModelContext","GetSingletonEntryUseCase","UpdateSingletonEntryUseCase"],"mappings":";;;;;;;AAeA,MAAMA;IAKF,YACYC,gBAA4C,EAC5CC,mBAAkD,EAClDC,aAAwC,EACxCC,wBAA4D,EAC5DC,2BAAkE,CAC5E;aALUJ,gBAAgB,GAAhBA;aACAC,mBAAmB,GAAnBA;aACAC,aAAa,GAAbA;aACAC,wBAAwB,GAAxBA;aACAC,2BAA2B,GAA3BA;aATJ,KAAK,GAA2B;aAChC,IAAI,GAAsB;aAC1B,OAAO,GAAkB;QAS7BC,mBAOE,IAAI,EAAE;YACJ,kBAAkB;YAClB,qBAAqB;YACrB,eAAe;YACf,0BAA0B;YAC1B,6BAA6B;YAC7B,IAAIC;QACR;IACJ;IAEA,IAAY,QAAQ;QAChB,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ;IACtC;IAEA,IAAI,KAA4B;QAC5B,OAAO;YACH,SAAS,IAAI,CAAC,OAAO;YACrB,OAAO,IAAI,CAAC,KAAK;YACjB,MAAM,IAAI,CAAC,IAAI,EAAE,MAAM;YACvB,SAAS,AAAc,SAAd,IAAI,CAAC,IAAI;YAClB,SAAS,IAAI,CAAC,IAAI,EAAE,WAAW;QACnC;IACJ;IAEA,MAAM,OAAyB;QAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,EACV,OAAO;QAIX,MAAMC,OAAO,IAAI,CAAC,IAAI;QACtB,MAAMC,QAAQ,IAAI,CAAC,KAAK;QAExB,MAAMC,OAAO,MAAMF,KAAK,MAAM;QAC9B,IAAI,CAACE,MACD,OAAO;QAGX,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMC,QAAQ,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC;gBACzD,OAAO,IAAI,CAAC,KAAK;gBACjB,MAAM;oBACF,QAAQD;gBACZ;YACJ;YAEAE,YAAY;gBACR,IAAI,IAAI,CAAC,IAAI,KAAKJ,MACd;gBAEJ,IAAI,CAAC,KAAK,GAAGG;gBACbH,KAAK,OAAO,CAACG,MAAM,MAAM;gBACzBH,KAAK,KAAK;YACd;YAEA,OAAO;QACX,EAAE,OAAOK,OAAO;YACZ,IAAI,IAAI,CAAC,IAAI,KAAKL,MACdA,KAAK,SAAS,CAACM,aAAaD,OAAOJ;YAEvC,OAAO;QACX,SAAU;YACNG,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,OAAsB;QACxB,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMD,QAAQ,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;gBACtD,OAAO,IAAI,CAAC,KAAK;YACrB;YAEAC,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGD;gBACb,MAAMI,aAAa,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;gBAC5D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAACA;gBACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAACJ,MAAM,MAAM;gBAC9B,IAAI,CAAC,IAAI,CAAC,KAAK;YACnB;QACJ,SAAU;YACNC,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,UAAgB;QACZ,IAAI,CAAC,IAAI,GAAG;QACZ,IAAI,CAAC,KAAK,GAAG;IACjB;AACJ;AAEO,MAAMI,4CAAuBC,qBAAAA,oBAAgC,CAAC;IACjE,gBAAgBjB;IAChB,cAAc;QACVkB;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}

package/presentation/contentEntries/singleEntry/SingleEntryPresenter.test.d.ts

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

package/presentation/contentEntries/singleEntry/SingleEntryPresenter.test.js

@@ -0,0 +1,122 @@
+import { describe, expect, it, vi } from "vitest";
+import { Container } from "@webiny/di";
+import { FormModelFactory } from "@webiny/app-admin/features/formModel/abstractions.js";
+import { CmsFormModelBuilder } from "../../../features/formModel/abstractions.js";
+import { CmsModelContext } from "../../../features/contentEntry/abstractions.js";
+import { GetSingletonEntryUseCase, UpdateSingletonEntryUseCase } from "../../../features/contentEntry/singletonEntry/abstractions.js";
+import { SingleEntryPresenter } from "./abstractions.js";
+import { SingleEntryPresenter as external_SingleEntryPresenter_js_SingleEntryPresenter } from "./SingleEntryPresenter.js";
+const createFakeForm = ()=>({
+        vm: {},
+        isDirty: false,
+        submit: vi.fn(async ()=>({
+                title: "Draft"
+            })),
+        setData: vi.fn(),
+        reset: vi.fn(),
+        setErrors: vi.fn()
+    });
+const deferred = ()=>{
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej)=>{
+        resolve = res;
+        reject = rej;
+    });
+    return {
+        promise,
+        resolve,
+        reject
+    };
+};
+const setup = ()=>{
+    const forms = [];
+    let pendingUpdate = deferred();
+    const container = new Container();
+    container.registerInstance(FormModelFactory, {
+        create: ()=>{
+            const form = createFakeForm();
+            forms.push(form);
+            return form;
+        }
+    });
+    container.registerInstance(CmsFormModelBuilder, {
+        build: ()=>({})
+    });
+    container.registerInstance(CmsModelContext, {
+        getModel: ()=>({
+                modelId: "settings",
+                fields: []
+            })
+    });
+    container.registerInstance(GetSingletonEntryUseCase, {
+        execute: async ()=>({
+                id: "settings#0001",
+                values: {
+                    title: "Saved"
+                }
+            })
+    });
+    container.registerInstance(UpdateSingletonEntryUseCase, {
+        execute: ()=>pendingUpdate.promise
+    });
+    container.register(external_SingleEntryPresenter_js_SingleEntryPresenter);
+    return {
+        presenter: container.resolve(SingleEntryPresenter),
+        forms,
+        nextUpdate: ()=>{
+            pendingUpdate = deferred();
+            return pendingUpdate;
+        }
+    };
+};
+describe("SingleEntryPresenter.save", ()=>{
+    it("puts a rejected save's errors on the form", async ()=>{
+        const { presenter, forms, nextUpdate } = setup();
+        await presenter.init();
+        const update = nextUpdate();
+        const saving = presenter.save();
+        update.reject(new Error("Value must be unique."));
+        await expect(saving).resolves.toBe(false);
+        expect(forms[0].setErrors).toHaveBeenCalledTimes(1);
+    });
+    it("returns false instead of throwing when the form was disposed mid-save", async ()=>{
+        const { presenter, nextUpdate } = setup();
+        await presenter.init();
+        const update = nextUpdate();
+        const saving = presenter.save();
+        presenter.dispose();
+        update.reject(new Error("Value must be unique."));
+        await expect(saving).resolves.toBe(false);
+    });
+    it("doesn't put a rejected save's errors on a form built after it started", async ()=>{
+        const { presenter, forms, nextUpdate } = setup();
+        await presenter.init();
+        const update = nextUpdate();
+        const saving = presenter.save();
+        await presenter.init();
+        update.reject(new Error("Value must be unique."));
+        await expect(saving).resolves.toBe(false);
+        expect(forms).toHaveLength(2);
+        expect(forms[0].setErrors).not.toHaveBeenCalled();
+        expect(forms[1].setErrors).not.toHaveBeenCalled();
+    });
+    it("doesn't overwrite a form built after a successful save started", async ()=>{
+        const { presenter, forms, nextUpdate } = setup();
+        await presenter.init();
+        const update = nextUpdate();
+        const saving = presenter.save();
+        await presenter.init();
+        const setDataCallsBefore = forms[1].setData.mock.calls.length;
+        update.resolve({
+            id: "settings#0002",
+            values: {
+                title: "From the old save"
+            }
+        });
+        await expect(saving).resolves.toBe(true);
+        expect(forms[1].setData).toHaveBeenCalledTimes(setDataCallsBefore);
+    });
+});
+
+//# sourceMappingURL=SingleEntryPresenter.test.js.map

package/presentation/contentEntries/singleEntry/SingleEntryPresenter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"presentation/contentEntries/singleEntry/SingleEntryPresenter.test.js","sources":["../../../../src/presentation/contentEntries/singleEntry/SingleEntryPresenter.test.ts"],"sourcesContent":["import { describe, it, expect, vi } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsModelContext } from \"~/features/contentEntry/abstractions.js\";\nimport {\n    GetSingletonEntryUseCase,\n    UpdateSingletonEntryUseCase\n} from \"~/features/contentEntry/singletonEntry/abstractions.js\";\nimport { SingleEntryPresenter as Abstraction } from \"./abstractions.js\";\nimport { SingleEntryPresenter } from \"./SingleEntryPresenter.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    let pendingUpdate = 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: \"settings\", fields: [] })\n    } as unknown as CmsModelContext.Interface);\n    container.registerInstance(GetSingletonEntryUseCase, {\n        execute: async () => ({ id: \"settings#0001\", values: { title: \"Saved\" } })\n    } as unknown as GetSingletonEntryUseCase.Interface);\n    container.registerInstance(UpdateSingletonEntryUseCase, {\n        execute: () => pendingUpdate.promise\n    } as unknown as UpdateSingletonEntryUseCase.Interface);\n    container.register(SingleEntryPresenter);\n\n    return {\n        presenter: container.resolve(Abstraction),\n        forms,\n        nextUpdate: () => {\n            pendingUpdate = deferred<any>();\n            return pendingUpdate;\n        }\n    };\n};\n\ndescribe(\"SingleEntryPresenter.save\", () => {\n    it(\"puts a rejected save's errors on the form\", async () => {\n        const { presenter, forms, nextUpdate } = setup();\n        await presenter.init();\n        const update = nextUpdate();\n\n        const saving = presenter.save();\n        update.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 disposed mid-save\", async () => {\n        const { presenter, nextUpdate } = setup();\n        await presenter.init();\n        const update = nextUpdate();\n\n        const saving = presenter.save();\n        presenter.dispose();\n        update.reject(new Error(\"Value must be unique.\"));\n\n        await expect(saving).resolves.toBe(false);\n    });\n\n    it(\"doesn't put a rejected save's errors on a form built after it started\", async () => {\n        const { presenter, forms, nextUpdate } = setup();\n        await presenter.init();\n        const update = nextUpdate();\n\n        const saving = presenter.save();\n        await presenter.init();\n        update.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(\"doesn't overwrite a form built after a successful save started\", async () => {\n        const { presenter, forms, nextUpdate } = setup();\n        await presenter.init();\n        const update = nextUpdate();\n\n        const saving = presenter.save();\n        await presenter.init();\n        const setDataCallsBefore = forms[1].setData.mock.calls.length;\n        update.resolve({ id: \"settings#0002\", values: { title: \"From the old save\" } });\n\n        await expect(saving).resolves.toBe(true);\n        expect(forms[1].setData).toHaveBeenCalledTimes(setDataCallsBefore);\n    });\n});\n"],"names":["createFakeForm","vi","deferred","resolve","reject","promise","Promise","res","rej","setup","forms","pendingUpdate","container","Container","FormModelFactory","form","CmsFormModelBuilder","CmsModelContext","GetSingletonEntryUseCase","UpdateSingletonEntryUseCase","SingleEntryPresenter","Abstraction","describe","it","presenter","nextUpdate","update","saving","Error","expect","setDataCallsBefore"],"mappings":";;;;;;;;AAYA,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,IAAIC,gBAAgBT;IAEpB,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;gBAAY,QAAQ,EAAE;YAAC;IACvD;IACAL,UAAU,gBAAgB,CAACM,0BAA0B;QACjD,SAAS,UAAa;gBAAE,IAAI;gBAAiB,QAAQ;oBAAE,OAAO;gBAAQ;YAAE;IAC5E;IACAN,UAAU,gBAAgB,CAACO,6BAA6B;QACpD,SAAS,IAAMR,cAAc,OAAO;IACxC;IACAC,UAAU,QAAQ,CAACQ;IAEnB,OAAO;QACH,WAAWR,UAAU,OAAO,CAACS;QAC7BX;QACA,YAAY;YACRC,gBAAgBT;YAChB,OAAOS;QACX;IACJ;AACJ;AAEAW,SAAS,6BAA6B;IAClCC,GAAG,6CAA6C;QAC5C,MAAM,EAAEC,SAAS,EAAEd,KAAK,EAAEe,UAAU,EAAE,GAAGhB;QACzC,MAAMe,UAAU,IAAI;QACpB,MAAME,SAASD;QAEf,MAAME,SAASH,UAAU,IAAI;QAC7BE,OAAO,MAAM,CAAC,IAAIE,MAAM;QAExB,MAAMC,OAAOF,QAAQ,QAAQ,CAAC,IAAI,CAAC;QACnCE,OAAOnB,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,qBAAqB,CAAC;IACrD;IAEAa,GAAG,yEAAyE;QACxE,MAAM,EAAEC,SAAS,EAAEC,UAAU,EAAE,GAAGhB;QAClC,MAAMe,UAAU,IAAI;QACpB,MAAME,SAASD;QAEf,MAAME,SAASH,UAAU,IAAI;QAC7BA,UAAU,OAAO;QACjBE,OAAO,MAAM,CAAC,IAAIE,MAAM;QAExB,MAAMC,OAAOF,QAAQ,QAAQ,CAAC,IAAI,CAAC;IACvC;IAEAJ,GAAG,yEAAyE;QACxE,MAAM,EAAEC,SAAS,EAAEd,KAAK,EAAEe,UAAU,EAAE,GAAGhB;QACzC,MAAMe,UAAU,IAAI;QACpB,MAAME,SAASD;QAEf,MAAME,SAASH,UAAU,IAAI;QAC7B,MAAMA,UAAU,IAAI;QACpBE,OAAO,MAAM,CAAC,IAAIE,MAAM;QAExB,MAAMC,OAAOF,QAAQ,QAAQ,CAAC,IAAI,CAAC;QACnCE,OAAOnB,OAAO,YAAY,CAAC;QAC3BmB,OAAOnB,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,gBAAgB;QAC/CmB,OAAOnB,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,gBAAgB;IACnD;IAEAa,GAAG,kEAAkE;QACjE,MAAM,EAAEC,SAAS,EAAEd,KAAK,EAAEe,UAAU,EAAE,GAAGhB;QACzC,MAAMe,UAAU,IAAI;QACpB,MAAME,SAASD;QAEf,MAAME,SAASH,UAAU,IAAI;QAC7B,MAAMA,UAAU,IAAI;QACpB,MAAMM,qBAAqBpB,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;QAC7DgB,OAAO,OAAO,CAAC;YAAE,IAAI;YAAiB,QAAQ;gBAAE,OAAO;YAAoB;QAAE;QAE7E,MAAMG,OAAOF,QAAQ,QAAQ,CAAC,IAAI,CAAC;QACnCE,OAAOnB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,CAACoB;IACnD;AACJ"}

package/presentation/contentEntries/trashBin/CmsTrashBin.d.ts

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

package/presentation/contentEntries/views/CmsAdvancedSearch.d.ts

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

package/presentation/contentEntries/views/ContentEntriesListLayout.d.ts

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

package/presentation/contentEntries/views/ContentEntryFormView.d.ts

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

package/presentation/contentEntries/views/OlderRevisionAlert.d.ts

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

package/presentation/contentEntries/views/RevisionDrawer.d.ts

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

package/presentation/contentEntries/views/RevisionsList.d.ts

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

package/presentation/contentEntries/views/SingleEntryLayout.d.ts

@@ -4,7 +4,7 @@ interface SingleEntryLayoutProps {
     presenter: ISingleEntryPresenter;
     modelName: string;
 }
-export declare const SingleEntryLayout: (({ presenter, modelName }: SingleEntryLayoutProps) => React.JSX.Element | null) & {
-    displayName: string;
+export declare const SingleEntryLayout: (({ presenter, modelName }: SingleEntryLayoutProps) => React.JSX.Element | null) & React.NamedExoticComponent<SingleEntryLayoutProps> & {
+    readonly type: ({ presenter, modelName }: SingleEntryLayoutProps) => React.JSX.Element | null;
 };
 export {};

package/presentation/contentEntries/views/Table/Table.d.ts

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

package/presentation/contentEntries/views/actions/CreateNewRevisionButton.d.ts

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

package/presentation/contentEntries/views/actions/DeleteEntryMenuItem.d.ts

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

package/presentation/contentEntries/views/actions/PublishOnlyButton.d.ts

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

package/presentation/contentEntries/views/actions/RevisionSelector.d.ts

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

package/presentation/contentEntries/views/actions/SaveAndPublishButton.d.ts

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

package/presentation/contentEntries/views/actions/SaveContentButton.d.ts

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

package/presentation/contentEntries/views/actions/ShowRevisionListMenuItem.d.ts

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

package/presentation/contentEntries/views/layout/ContentEntryForm.d.ts

@@ -1,18 +1,18 @@
 import React from "react";
-export declare const ContentEntryForm: (() => React.JSX.Element | null) & {
-    displayName: string;
+export declare const ContentEntryForm: (() => React.JSX.Element | null) & React.NamedExoticComponent<unknown> & {
+    readonly type: () => React.JSX.Element | null;
 } & {
-    original: (() => React.JSX.Element | null) & {
-        displayName: string;
+    original: (() => React.JSX.Element | null) & React.NamedExoticComponent<unknown> & {
+        readonly type: () => React.JSX.Element | null;
     };
     originalName: string;
     displayName: string;
 } & {
-    original: (() => React.JSX.Element | null) & {
-        displayName: string;
+    original: (() => React.JSX.Element | null) & React.NamedExoticComponent<unknown> & {
+        readonly type: () => React.JSX.Element | null;
     } & {
-        original: (() => React.JSX.Element | null) & {
-            displayName: string;
+        original: (() => React.JSX.Element | null) & React.NamedExoticComponent<unknown> & {
+            readonly type: () => React.JSX.Element | null;
         };
         originalName: string;
         displayName: string;
@@ -20,11 +20,11 @@ export declare const ContentEntryForm: (() => React.JSX.Element | null) & {
     originalName: string;
     displayName: string;
 } & {
-    createDecorator: (decorator: import("@webiny/react-composition").ComponentDecorator<(() => React.JSX.Element | null) & {
-        displayName: string;
+    createDecorator: (decorator: import("@webiny/react-composition").ComponentDecorator<(() => React.JSX.Element | null) & React.NamedExoticComponent<unknown> & {
+        readonly type: () => React.JSX.Element | null;
     } & {
-        original: (() => React.JSX.Element | null) & {
-            displayName: string;
+        original: (() => React.JSX.Element | null) & React.NamedExoticComponent<unknown> & {
+            readonly type: () => React.JSX.Element | null;
         };
         originalName: string;
         displayName: string;

package/presentation/contentModels/ContentModelsPresenter.d.ts

@@ -5,8 +5,8 @@ import { DeleteModelUseCase } from "../../features/model/deleteModel/abstraction
 import { CancelDeleteModelUseCase } from "../../features/model/cancelDeleteModel/abstractions.js";
 import { ExportModelsUseCase } from "../../features/model/exportModels/abstractions.js";
 import { ModelsCache } from "../../features/model/abstractions.js";
-import { type IContentModelsPresenter, type IContentModelsPresenterViewModel } from "./abstractions.js";
-declare class ContentModelsPresenterImpl implements IContentModelsPresenter {
+import { ContentModelsPresenter as Abstraction } from "./abstractions.js";
+declare class ContentModelsPresenterImpl implements Abstraction.Interface {
     private listPresenter;
     private listModelsUseCase;
     private deleteModelUseCase;
@@ -15,14 +15,14 @@ declare class ContentModelsPresenterImpl implements IContentModelsPresenter {
     private cache;
     private loading;
     constructor(listPresenter: ListPresenter.Interface<CmsModel>, listModelsUseCase: ListModelsUseCase.Interface, deleteModelUseCase: DeleteModelUseCase.Interface, cancelDeleteModelUseCase: CancelDeleteModelUseCase.Interface, exportModelsUseCase: ExportModelsUseCase.Interface, cache: ModelsCache.Interface);
-    get vm(): IContentModelsPresenterViewModel;
+    get vm(): Abstraction.ViewModel;
     get list(): ListPresenter.Interface<CmsModel>;
     init(): void;
     deleteModel(modelId: string, confirmation: string): Promise<import("~/features/model/deleteModel/abstractions.js").DeleteModelResult>;
     cancelDelete(modelId: string): Promise<void>;
-    exportModels(modelIds?: string[]): Promise<any>;
+    exportModels(modelIds?: string[]): Promise<Abstraction.ExportModelResponse | null>;
 }
 export declare const ContentModelsPresenter: typeof ContentModelsPresenterImpl & {
-    __abstraction: import("@webiny/di").Abstraction<IContentModelsPresenter>;
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IContentModelsPresenter>;
 };
 export {};

package/presentation/contentModels/ContentModelsPresenter.js

@@ -59,7 +59,7 @@ class ContentModelsPresenterImpl {
         return this.cancelDeleteModelUseCase.execute(modelId);
     }
     async exportModels(modelIds) {
-        return this.exportModelsUseCase.execute(modelIds);
+        return await this.exportModelsUseCase.execute(modelIds);
     }
 }
 const ContentModelsPresenter_ContentModelsPresenter = ContentModelsPresenter.createImplementation({

package/presentation/contentModels/ContentModelsPresenter.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/contentModels/ContentModelsPresenter.js","sources":["../../../src/presentation/contentModels/ContentModelsPresenter.ts"],"sourcesContent":["import { makeAutoObservable, runInAction, computed } from \"mobx\";\nimport { ListPresenter } from \"@webiny/app-admin/presentation/listPresenter/abstractions.js\";\nimport type { CmsModel } from \"~/types.js\";\nimport { ListModelsUseCase } from \"~/features/model/listModels/abstractions.js\";\nimport { DeleteModelUseCase } from \"~/features/model/deleteModel/abstractions.js\";\nimport { CancelDeleteModelUseCase } from \"~/features/model/cancelDeleteModel/abstractions.js\";\nimport { ExportModelsUseCase } from \"~/features/model/exportModels/abstractions.js\";\nimport { ModelsCache } from \"~/features/model/abstractions.js\";\nimport {\n    ContentModelsPresenter as Abstraction,\n    type IContentModelsPresenter,\n    type IContentModelsPresenterViewModel\n} from \"./abstractions.js\";\nimport { ContentModelsDataSource } from \"./ContentModelsDataSource.js\";\n\nclass ContentModelsPresenterImpl implements IContentModelsPresenter {\n    private loading = true;\n\n    constructor(\n        private listPresenter: ListPresenter.Interface<CmsModel>,\n        private listModelsUseCase: ListModelsUseCase.Interface,\n        private deleteModelUseCase: DeleteModelUseCase.Interface,\n        private cancelDeleteModelUseCase: CancelDeleteModelUseCase.Interface,\n        private exportModelsUseCase: ExportModelsUseCase.Interface,\n        private cache: ModelsCache.Interface\n    ) {\n        makeAutoObservable<\n            ContentModelsPresenterImpl,\n            | \"listModelsUseCase\"\n            | \"deleteModelUseCase\"\n            | \"cancelDeleteModelUseCase\"\n            | \"exportModelsUseCase\"\n            | \"cache\"\n        >(this, {\n            listModelsUseCase: false,\n            deleteModelUseCase: false,\n            cancelDeleteModelUseCase: false,\n            exportModelsUseCase: false,\n            cache: false,\n            vm: computed\n        });\n    }\n\n    get vm(): IContentModelsPresenterViewModel {\n        const models = this.cache.getItems().filter(model => {\n            if (!model.tags || model.tags.length === 0) {\n                return true;\n            }\n            return !model.tags.includes(\"$hidden:true\");\n        });\n\n        return {\n            loading: this.loading,\n            models\n        };\n    }\n\n    get list(): ListPresenter.Interface<CmsModel> {\n        return this.listPresenter;\n    }\n\n    init(): void {\n        const dataSource = new ContentModelsDataSource(this.listModelsUseCase, this.cache);\n\n        this.listPresenter.init({\n            dataSource,\n            initialSort: { field: \"savedOn\", direction: \"DESC\" },\n            limit: 1000\n        });\n\n        runInAction(() => {\n            this.loading = false;\n        });\n    }\n\n    async deleteModel(modelId: string, confirmation: string) {\n        return this.deleteModelUseCase.execute(modelId, confirmation);\n    }\n\n    async cancelDelete(modelId: string) {\n        return this.cancelDeleteModelUseCase.execute(modelId);\n    }\n\n    async exportModels(modelIds?: string[]) {\n        return this.exportModelsUseCase.execute(modelIds);\n    }\n}\n\nexport const ContentModelsPresenter = Abstraction.createImplementation({\n    implementation: ContentModelsPresenterImpl,\n    dependencies: [\n        ListPresenter,\n        ListModelsUseCase,\n        DeleteModelUseCase,\n        CancelDeleteModelUseCase,\n        ExportModelsUseCase,\n        ModelsCache\n    ]\n});\n"],"names":["ContentModelsPresenterImpl","listPresenter","listModelsUseCase","deleteModelUseCase","cancelDeleteModelUseCase","exportModelsUseCase","cache","makeAutoObservable","computed","models","model","dataSource","ContentModelsDataSource","runInAction","modelId","confirmation","modelIds","ContentModelsPresenter","Abstraction","ListPresenter","ListModelsUseCase","DeleteModelUseCase","CancelDeleteModelUseCase","ExportModelsUseCase","ModelsCache"],"mappings":";;;;;;;;;AAeA,MAAMA;IAGF,YACYC,aAAgD,EAChDC,iBAA8C,EAC9CC,kBAAgD,EAChDC,wBAA4D,EAC5DC,mBAAkD,EAClDC,KAA4B,CACtC;aANUL,aAAa,GAAbA;aACAC,iBAAiB,GAAjBA;aACAC,kBAAkB,GAAlBA;aACAC,wBAAwB,GAAxBA;aACAC,mBAAmB,GAAnBA;aACAC,KAAK,GAALA;aARJ,OAAO,GAAG;QAUdC,mBAOE,IAAI,EAAE;YACJ,mBAAmB;YACnB,oBAAoB;YACpB,0BAA0B;YAC1B,qBAAqB;YACrB,OAAO;YACP,IAAIC;QACR;IACJ;IAEA,IAAI,KAAuC;QACvC,MAAMC,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAACC,CAAAA;YACxC,IAAI,CAACA,MAAM,IAAI,IAAIA,AAAsB,MAAtBA,MAAM,IAAI,CAAC,MAAM,EAChC,OAAO;YAEX,OAAO,CAACA,MAAM,IAAI,CAAC,QAAQ,CAAC;QAChC;QAEA,OAAO;YACH,SAAS,IAAI,CAAC,OAAO;YACrBD;QACJ;IACJ;IAEA,IAAI,OAA0C;QAC1C,OAAO,IAAI,CAAC,aAAa;IAC7B;IAEA,OAAa;QACT,MAAME,aAAa,IAAIC,wBAAwB,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,KAAK;QAEjF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACpBD;YACA,aAAa;gBAAE,OAAO;gBAAW,WAAW;YAAO;YACnD,OAAO;QACX;QAEAE,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;IACJ;IAEA,MAAM,YAAYC,OAAe,EAAEC,YAAoB,EAAE;QACrD,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAACD,SAASC;IACpD;IAEA,MAAM,aAAaD,OAAe,EAAE;QAChC,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACA;IACjD;IAEA,MAAM,aAAaE,QAAmB,EAAE;QACpC,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAACA;IAC5C;AACJ;AAEO,MAAMC,gDAAyBC,uBAAAA,oBAAgC,CAAC;IACnE,gBAAgBlB;IAChB,cAAc;QACVmB;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}
+{"version":3,"file":"presentation/contentModels/ContentModelsPresenter.js","sources":["../../../src/presentation/contentModels/ContentModelsPresenter.ts"],"sourcesContent":["import { makeAutoObservable, runInAction, computed } from \"mobx\";\nimport { ListPresenter } from \"@webiny/app-admin/presentation/listPresenter/abstractions.js\";\nimport type { CmsModel } from \"~/types.js\";\nimport { ListModelsUseCase } from \"~/features/model/listModels/abstractions.js\";\nimport { DeleteModelUseCase } from \"~/features/model/deleteModel/abstractions.js\";\nimport { CancelDeleteModelUseCase } from \"~/features/model/cancelDeleteModel/abstractions.js\";\nimport { ExportModelsUseCase } from \"~/features/model/exportModels/abstractions.js\";\nimport { ModelsCache } from \"~/features/model/abstractions.js\";\nimport { ContentModelsPresenter as Abstraction } from \"./abstractions.js\";\nimport { ContentModelsDataSource } from \"./ContentModelsDataSource.js\";\n\nclass ContentModelsPresenterImpl implements Abstraction.Interface {\n    private loading = true;\n\n    constructor(\n        private listPresenter: ListPresenter.Interface<CmsModel>,\n        private listModelsUseCase: ListModelsUseCase.Interface,\n        private deleteModelUseCase: DeleteModelUseCase.Interface,\n        private cancelDeleteModelUseCase: CancelDeleteModelUseCase.Interface,\n        private exportModelsUseCase: ExportModelsUseCase.Interface,\n        private cache: ModelsCache.Interface\n    ) {\n        makeAutoObservable<\n            ContentModelsPresenterImpl,\n            | \"listModelsUseCase\"\n            | \"deleteModelUseCase\"\n            | \"cancelDeleteModelUseCase\"\n            | \"exportModelsUseCase\"\n            | \"cache\"\n        >(this, {\n            listModelsUseCase: false,\n            deleteModelUseCase: false,\n            cancelDeleteModelUseCase: false,\n            exportModelsUseCase: false,\n            cache: false,\n            vm: computed\n        });\n    }\n\n    get vm(): Abstraction.ViewModel {\n        const models = this.cache.getItems().filter(model => {\n            if (!model.tags || model.tags.length === 0) {\n                return true;\n            }\n            return !model.tags.includes(\"$hidden:true\");\n        });\n\n        return {\n            loading: this.loading,\n            models\n        };\n    }\n\n    get list(): ListPresenter.Interface<CmsModel> {\n        return this.listPresenter;\n    }\n\n    init(): void {\n        const dataSource = new ContentModelsDataSource(this.listModelsUseCase, this.cache);\n\n        this.listPresenter.init({\n            dataSource,\n            initialSort: { field: \"savedOn\", direction: \"DESC\" },\n            limit: 1000\n        });\n\n        runInAction(() => {\n            this.loading = false;\n        });\n    }\n\n    async deleteModel(modelId: string, confirmation: string) {\n        return this.deleteModelUseCase.execute(modelId, confirmation);\n    }\n\n    async cancelDelete(modelId: string) {\n        return this.cancelDeleteModelUseCase.execute(modelId);\n    }\n\n    async exportModels(modelIds?: string[]): Promise<Abstraction.ExportModelResponse | null> {\n        return await this.exportModelsUseCase.execute(modelIds);\n    }\n}\n\nexport const ContentModelsPresenter = Abstraction.createImplementation({\n    implementation: ContentModelsPresenterImpl,\n    dependencies: [\n        ListPresenter,\n        ListModelsUseCase,\n        DeleteModelUseCase,\n        CancelDeleteModelUseCase,\n        ExportModelsUseCase,\n        ModelsCache\n    ]\n});\n"],"names":["ContentModelsPresenterImpl","listPresenter","listModelsUseCase","deleteModelUseCase","cancelDeleteModelUseCase","exportModelsUseCase","cache","makeAutoObservable","computed","models","model","dataSource","ContentModelsDataSource","runInAction","modelId","confirmation","modelIds","ContentModelsPresenter","Abstraction","ListPresenter","ListModelsUseCase","DeleteModelUseCase","CancelDeleteModelUseCase","ExportModelsUseCase","ModelsCache"],"mappings":";;;;;;;;;AAWA,MAAMA;IAGF,YACYC,aAAgD,EAChDC,iBAA8C,EAC9CC,kBAAgD,EAChDC,wBAA4D,EAC5DC,mBAAkD,EAClDC,KAA4B,CACtC;aANUL,aAAa,GAAbA;aACAC,iBAAiB,GAAjBA;aACAC,kBAAkB,GAAlBA;aACAC,wBAAwB,GAAxBA;aACAC,mBAAmB,GAAnBA;aACAC,KAAK,GAALA;aARJ,OAAO,GAAG;QAUdC,mBAOE,IAAI,EAAE;YACJ,mBAAmB;YACnB,oBAAoB;YACpB,0BAA0B;YAC1B,qBAAqB;YACrB,OAAO;YACP,IAAIC;QACR;IACJ;IAEA,IAAI,KAA4B;QAC5B,MAAMC,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAACC,CAAAA;YACxC,IAAI,CAACA,MAAM,IAAI,IAAIA,AAAsB,MAAtBA,MAAM,IAAI,CAAC,MAAM,EAChC,OAAO;YAEX,OAAO,CAACA,MAAM,IAAI,CAAC,QAAQ,CAAC;QAChC;QAEA,OAAO;YACH,SAAS,IAAI,CAAC,OAAO;YACrBD;QACJ;IACJ;IAEA,IAAI,OAA0C;QAC1C,OAAO,IAAI,CAAC,aAAa;IAC7B;IAEA,OAAa;QACT,MAAME,aAAa,IAAIC,wBAAwB,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,KAAK;QAEjF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACpBD;YACA,aAAa;gBAAE,OAAO;gBAAW,WAAW;YAAO;YACnD,OAAO;QACX;QAEAE,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;IACJ;IAEA,MAAM,YAAYC,OAAe,EAAEC,YAAoB,EAAE;QACrD,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAACD,SAASC;IACpD;IAEA,MAAM,aAAaD,OAAe,EAAE;QAChC,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAACA;IACjD;IAEA,MAAM,aAAaE,QAAmB,EAAmD;QACrF,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAACA;IAClD;AACJ;AAEO,MAAMC,gDAAyBC,uBAAAA,oBAAgC,CAAC;IACnE,gBAAgBlB;IAChB,cAAc;QACVmB;QACAC;QACAC;QACAC;QACAC;QACAC;KACH;AACL"}