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

package/features/formModel/CmsLayoutMapper.js

@@ -19,6 +19,28 @@ function mapCmsLayout(cmsLayout, layoutBuilder, idToFieldId) {
     }
     return nodes;
 }
+function collectFieldIds(layout, idToFieldId) {
+    const fieldIds = new Set();
+    for (const row of layout)for (const cell of row)if ("string" == typeof cell) {
+        const fieldId = idToFieldId.get(cell);
+        if (fieldId) fieldIds.add(fieldId);
+    } else if (isLayoutField(cell) && "tabs" === cell.type) {
+        const tabsField = cell;
+        for (const tab of tabsField.tabs)for (const id of collectFieldIds(tab.layout, idToFieldId))fieldIds.add(id);
+    }
+    return fieldIds;
+}
+function mapCmsNestedLayout(cmsLayout, fields) {
+    if (!cmsLayout || 0 === cmsLayout.length) return;
+    const idToFieldId = new Map();
+    for (const field of fields)idToFieldId.set(field.id, field.fieldId);
+    const fieldIdsInLayout = collectFieldIds(cmsLayout, idToFieldId);
+    return (layoutBuilder)=>{
+        const nodes = mapCmsLayout(cmsLayout, layoutBuilder, idToFieldId);
+        for (const field of fields)if (!fieldIdsInLayout.has(field.fieldId)) nodes.push(layoutBuilder.row(field.fieldId));
+        return nodes;
+    };
+}
 function mapLayoutField(field, layoutBuilder, idToFieldId) {
     switch(field.type){
         case "separator":
@@ -83,6 +105,6 @@ function mapAlert(field, layoutBuilder) {
         })));
     return builder;
 }
-export { mapCmsLayout };
+export { collectFieldIds, mapCmsLayout, mapCmsNestedLayout };
 
 //# sourceMappingURL=CmsLayoutMapper.js.map

package/features/formModel/CmsLayoutMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/formModel/CmsLayoutMapper.js","sources":["../../../src/features/formModel/CmsLayoutMapper.ts"],"sourcesContent":["import {\n    isLayoutField,\n    type CmsEditorFieldsLayout,\n    type CmsLayoutField,\n    type CmsSeparatorLayoutField,\n    type CmsTabLayoutField,\n    type CmsAlertLayoutField\n} from \"~/types.js\";\nimport type {\n    ILayoutBuilder,\n    ILayoutNodeBuilder\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\n\nexport function mapCmsLayout(\n    cmsLayout: CmsEditorFieldsLayout,\n    layoutBuilder: ILayoutBuilder,\n    idToFieldId: Map<string, string>\n): ILayoutNodeBuilder[] {\n    const nodes: ILayoutNodeBuilder[] = [];\n\n    for (const row of cmsLayout) {\n        if (row.length === 0) {\n            continue;\n        }\n\n        const firstCell = row[0];\n\n        if (row.length === 1 && isLayoutField(firstCell)) {\n            const layoutField = firstCell as CmsLayoutField;\n            const node = mapLayoutField(layoutField, layoutBuilder, idToFieldId);\n            if (node) {\n                nodes.push(node);\n            }\n            continue;\n        }\n\n        const fieldIds: string[] = [];\n        for (const cell of row) {\n            if (typeof cell === \"string\") {\n                const fieldId = idToFieldId.get(cell);\n                if (fieldId) {\n                    fieldIds.push(fieldId);\n                }\n            }\n        }\n\n        if (fieldIds.length > 0) {\n            nodes.push(layoutBuilder.row(...fieldIds));\n        }\n    }\n\n    return nodes;\n}\n\nfunction mapLayoutField(\n    field: CmsLayoutField,\n    layoutBuilder: ILayoutBuilder,\n    idToFieldId: Map<string, string>\n): ILayoutNodeBuilder | null {\n    switch (field.type) {\n        case \"separator\":\n            return mapSeparator(field as CmsSeparatorLayoutField, layoutBuilder);\n\n        case \"tabs\":\n            return mapTabs(field as CmsTabLayoutField, layoutBuilder, idToFieldId);\n\n        case \"alert\":\n            return mapAlert(field as CmsAlertLayoutField, layoutBuilder);\n\n        default:\n            return null;\n    }\n}\n\nfunction mapSeparator(\n    field: CmsSeparatorLayoutField,\n    layoutBuilder: ILayoutBuilder\n): ILayoutNodeBuilder {\n    const builder = layoutBuilder.separator();\n    if (field.label) {\n        builder.title(field.label);\n    }\n    if (field.description) {\n        builder.description(field.description);\n    }\n    if (field.rules) {\n        builder.rules(\n            field.rules.map(r => ({\n                type: r.type,\n                target: r.target,\n                operator: r.operator,\n                value: r.value ?? null,\n                action: r.action as \"hide\" | \"disable\"\n            }))\n        );\n    }\n    return builder;\n}\n\nfunction mapTabs(\n    field: CmsTabLayoutField,\n    layoutBuilder: ILayoutBuilder,\n    idToFieldId: Map<string, string>\n): ILayoutNodeBuilder {\n    const tabsBuilder = layoutBuilder.tabs(field.id);\n\n    for (const tab of field.tabs) {\n        tabsBuilder.tab(tab.id, t => {\n            t.label(tab.label);\n            if (tab.icon) {\n                t.icon({ type: \"icon\", name: tab.icon });\n            }\n            t.layout(l => mapCmsLayout(tab.layout, l, idToFieldId));\n            if (tab.rules) {\n                t.rules(\n                    tab.rules.map(r => ({\n                        type: r.type,\n                        target: r.target,\n                        operator: r.operator,\n                        value: r.value ?? null,\n                        action: r.action as \"hide\" | \"disable\"\n                    }))\n                );\n            }\n        });\n    }\n\n    if (field.rules) {\n        tabsBuilder.rules(\n            field.rules.map(r => ({\n                type: r.type,\n                target: r.target,\n                operator: r.operator,\n                value: r.value ?? null,\n                action: r.action as \"hide\" | \"disable\"\n            }))\n        );\n    }\n\n    return tabsBuilder;\n}\n\nfunction mapAlert(field: CmsAlertLayoutField, layoutBuilder: ILayoutBuilder): ILayoutNodeBuilder {\n    const builder = layoutBuilder.alert();\n    if (field.label) {\n        builder.message(field.label);\n    }\n    if (field.alertType) {\n        builder.alertType(field.alertType);\n    }\n    if (field.rules) {\n        builder.rules(\n            field.rules.map(r => ({\n                type: r.type,\n                target: r.target,\n                operator: r.operator,\n                value: r.value ?? null,\n                action: r.action as \"hide\" | \"disable\"\n            }))\n        );\n    }\n    return builder;\n}\n"],"names":["mapCmsLayout","cmsLayout","layoutBuilder","idToFieldId","nodes","row","firstCell","isLayoutField","layoutField","node","mapLayoutField","fieldIds","cell","fieldId","field","mapSeparator","mapTabs","mapAlert","builder","r","tabsBuilder","tab","t","l"],"mappings":";AAaO,SAASA,aACZC,SAAgC,EAChCC,aAA6B,EAC7BC,WAAgC;IAEhC,MAAMC,QAA8B,EAAE;IAEtC,KAAK,MAAMC,OAAOJ,UAAW;QACzB,IAAII,AAAe,MAAfA,IAAI,MAAM,EACV;QAGJ,MAAMC,YAAYD,GAAG,CAAC,EAAE;QAExB,IAAIA,AAAe,MAAfA,IAAI,MAAM,IAAUE,cAAcD,YAAY;YAC9C,MAAME,cAAcF;YACpB,MAAMG,OAAOC,eAAeF,aAAaN,eAAeC;YACxD,IAAIM,MACAL,MAAM,IAAI,CAACK;YAEf;QACJ;QAEA,MAAME,WAAqB,EAAE;QAC7B,KAAK,MAAMC,QAAQP,IACf,IAAI,AAAgB,YAAhB,OAAOO,MAAmB;YAC1B,MAAMC,UAAUV,YAAY,GAAG,CAACS;YAChC,IAAIC,SACAF,SAAS,IAAI,CAACE;QAEtB;QAGJ,IAAIF,SAAS,MAAM,GAAG,GAClBP,MAAM,IAAI,CAACF,cAAc,GAAG,IAAIS;IAExC;IAEA,OAAOP;AACX;AAEA,SAASM,eACLI,KAAqB,EACrBZ,aAA6B,EAC7BC,WAAgC;IAEhC,OAAQW,MAAM,IAAI;QACd,KAAK;YACD,OAAOC,aAAaD,OAAkCZ;QAE1D,KAAK;YACD,OAAOc,QAAQF,OAA4BZ,eAAeC;QAE9D,KAAK;YACD,OAAOc,SAASH,OAA8BZ;QAElD;YACI,OAAO;IACf;AACJ;AAEA,SAASa,aACLD,KAA8B,EAC9BZ,aAA6B;IAE7B,MAAMgB,UAAUhB,cAAc,SAAS;IACvC,IAAIY,MAAM,KAAK,EACXI,QAAQ,KAAK,CAACJ,MAAM,KAAK;IAE7B,IAAIA,MAAM,WAAW,EACjBI,QAAQ,WAAW,CAACJ,MAAM,WAAW;IAEzC,IAAIA,MAAM,KAAK,EACXI,QAAQ,KAAK,CACTJ,MAAM,KAAK,CAAC,GAAG,CAACK,CAAAA,IAAM;YAClB,MAAMA,EAAE,IAAI;YACZ,QAAQA,EAAE,MAAM;YAChB,UAAUA,EAAE,QAAQ;YACpB,OAAOA,EAAE,KAAK,IAAI;YAClB,QAAQA,EAAE,MAAM;QACpB;IAGR,OAAOD;AACX;AAEA,SAASF,QACLF,KAAwB,EACxBZ,aAA6B,EAC7BC,WAAgC;IAEhC,MAAMiB,cAAclB,cAAc,IAAI,CAACY,MAAM,EAAE;IAE/C,KAAK,MAAMO,OAAOP,MAAM,IAAI,CACxBM,YAAY,GAAG,CAACC,IAAI,EAAE,EAAEC,CAAAA;QACpBA,EAAE,KAAK,CAACD,IAAI,KAAK;QACjB,IAAIA,IAAI,IAAI,EACRC,EAAE,IAAI,CAAC;YAAE,MAAM;YAAQ,MAAMD,IAAI,IAAI;QAAC;QAE1CC,EAAE,MAAM,CAACC,CAAAA,IAAKvB,aAAaqB,IAAI,MAAM,EAAEE,GAAGpB;QAC1C,IAAIkB,IAAI,KAAK,EACTC,EAAE,KAAK,CACHD,IAAI,KAAK,CAAC,GAAG,CAACF,CAAAA,IAAM;gBAChB,MAAMA,EAAE,IAAI;gBACZ,QAAQA,EAAE,MAAM;gBAChB,UAAUA,EAAE,QAAQ;gBACpB,OAAOA,EAAE,KAAK,IAAI;gBAClB,QAAQA,EAAE,MAAM;YACpB;IAGZ;IAGJ,IAAIL,MAAM,KAAK,EACXM,YAAY,KAAK,CACbN,MAAM,KAAK,CAAC,GAAG,CAACK,CAAAA,IAAM;YAClB,MAAMA,EAAE,IAAI;YACZ,QAAQA,EAAE,MAAM;YAChB,UAAUA,EAAE,QAAQ;YACpB,OAAOA,EAAE,KAAK,IAAI;YAClB,QAAQA,EAAE,MAAM;QACpB;IAIR,OAAOC;AACX;AAEA,SAASH,SAASH,KAA0B,EAAEZ,aAA6B;IACvE,MAAMgB,UAAUhB,cAAc,KAAK;IACnC,IAAIY,MAAM,KAAK,EACXI,QAAQ,OAAO,CAACJ,MAAM,KAAK;IAE/B,IAAIA,MAAM,SAAS,EACfI,QAAQ,SAAS,CAACJ,MAAM,SAAS;IAErC,IAAIA,MAAM,KAAK,EACXI,QAAQ,KAAK,CACTJ,MAAM,KAAK,CAAC,GAAG,CAACK,CAAAA,IAAM;YAClB,MAAMA,EAAE,IAAI;YACZ,QAAQA,EAAE,MAAM;YAChB,UAAUA,EAAE,QAAQ;YACpB,OAAOA,EAAE,KAAK,IAAI;YAClB,QAAQA,EAAE,MAAM;QACpB;IAGR,OAAOD;AACX"}
+{"version":3,"file":"features/formModel/CmsLayoutMapper.js","sources":["../../../src/features/formModel/CmsLayoutMapper.ts"],"sourcesContent":["import {\n    isLayoutField,\n    type CmsEditorFieldsLayout,\n    type CmsLayoutField,\n    type CmsModelField,\n    type CmsSeparatorLayoutField,\n    type CmsTabLayoutField,\n    type CmsAlertLayoutField\n} from \"~/types.js\";\nimport type {\n    ILayoutBuilder,\n    ILayoutNodeBuilder\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\n\nexport function mapCmsLayout(\n    cmsLayout: CmsEditorFieldsLayout,\n    layoutBuilder: ILayoutBuilder,\n    idToFieldId: Map<string, string>\n): ILayoutNodeBuilder[] {\n    const nodes: ILayoutNodeBuilder[] = [];\n\n    for (const row of cmsLayout) {\n        if (row.length === 0) {\n            continue;\n        }\n\n        const firstCell = row[0];\n\n        if (row.length === 1 && isLayoutField(firstCell)) {\n            const layoutField = firstCell as CmsLayoutField;\n            const node = mapLayoutField(layoutField, layoutBuilder, idToFieldId);\n            if (node) {\n                nodes.push(node);\n            }\n            continue;\n        }\n\n        const fieldIds: string[] = [];\n        for (const cell of row) {\n            if (typeof cell === \"string\") {\n                const fieldId = idToFieldId.get(cell);\n                if (fieldId) {\n                    fieldIds.push(fieldId);\n                }\n            }\n        }\n\n        if (fieldIds.length > 0) {\n            nodes.push(layoutBuilder.row(...fieldIds));\n        }\n    }\n\n    return nodes;\n}\n\nexport function collectFieldIds(\n    layout: CmsEditorFieldsLayout,\n    idToFieldId: Map<string, string>\n): Set<string> {\n    const fieldIds = new Set<string>();\n\n    for (const row of layout) {\n        for (const cell of row) {\n            if (typeof cell === \"string\") {\n                const fieldId = idToFieldId.get(cell);\n                if (fieldId) {\n                    fieldIds.add(fieldId);\n                }\n            } else if (isLayoutField(cell) && cell.type === \"tabs\") {\n                const tabsField = cell as { tabs: Array<{ layout: CmsEditorFieldsLayout }> };\n                for (const tab of tabsField.tabs) {\n                    for (const id of collectFieldIds(tab.layout, idToFieldId)) {\n                        fieldIds.add(id);\n                    }\n                }\n            }\n        }\n    }\n\n    return fieldIds;\n}\n\n/**\n * Maps the layout stored on an object field or a dynamic zone template. Returns `undefined`\n * when there is no layout, so the form falls back to one row per child. Children missing\n * from the layout get a row of their own at the end, so a stale layout can't hide them.\n */\nexport function mapCmsNestedLayout(\n    cmsLayout: CmsEditorFieldsLayout | undefined,\n    fields: CmsModelField[]\n): ((layoutBuilder: ILayoutBuilder) => ILayoutNodeBuilder[]) | undefined {\n    if (!cmsLayout || cmsLayout.length === 0) {\n        return undefined;\n    }\n\n    const idToFieldId = new Map<string, string>();\n    for (const field of fields) {\n        idToFieldId.set(field.id, field.fieldId);\n    }\n\n    const fieldIdsInLayout = collectFieldIds(cmsLayout, idToFieldId);\n\n    return layoutBuilder => {\n        const nodes = mapCmsLayout(cmsLayout, layoutBuilder, idToFieldId);\n        for (const field of fields) {\n            if (!fieldIdsInLayout.has(field.fieldId)) {\n                nodes.push(layoutBuilder.row(field.fieldId));\n            }\n        }\n        return nodes;\n    };\n}\n\nfunction mapLayoutField(\n    field: CmsLayoutField,\n    layoutBuilder: ILayoutBuilder,\n    idToFieldId: Map<string, string>\n): ILayoutNodeBuilder | null {\n    switch (field.type) {\n        case \"separator\":\n            return mapSeparator(field as CmsSeparatorLayoutField, layoutBuilder);\n\n        case \"tabs\":\n            return mapTabs(field as CmsTabLayoutField, layoutBuilder, idToFieldId);\n\n        case \"alert\":\n            return mapAlert(field as CmsAlertLayoutField, layoutBuilder);\n\n        default:\n            return null;\n    }\n}\n\nfunction mapSeparator(\n    field: CmsSeparatorLayoutField,\n    layoutBuilder: ILayoutBuilder\n): ILayoutNodeBuilder {\n    const builder = layoutBuilder.separator();\n    if (field.label) {\n        builder.title(field.label);\n    }\n    if (field.description) {\n        builder.description(field.description);\n    }\n    if (field.rules) {\n        builder.rules(\n            field.rules.map(r => ({\n                type: r.type,\n                target: r.target,\n                operator: r.operator,\n                value: r.value ?? null,\n                action: r.action as \"hide\" | \"disable\"\n            }))\n        );\n    }\n    return builder;\n}\n\nfunction mapTabs(\n    field: CmsTabLayoutField,\n    layoutBuilder: ILayoutBuilder,\n    idToFieldId: Map<string, string>\n): ILayoutNodeBuilder {\n    const tabsBuilder = layoutBuilder.tabs(field.id);\n\n    for (const tab of field.tabs) {\n        tabsBuilder.tab(tab.id, t => {\n            t.label(tab.label);\n            if (tab.icon) {\n                t.icon({ type: \"icon\", name: tab.icon });\n            }\n            t.layout(l => mapCmsLayout(tab.layout, l, idToFieldId));\n            if (tab.rules) {\n                t.rules(\n                    tab.rules.map(r => ({\n                        type: r.type,\n                        target: r.target,\n                        operator: r.operator,\n                        value: r.value ?? null,\n                        action: r.action as \"hide\" | \"disable\"\n                    }))\n                );\n            }\n        });\n    }\n\n    if (field.rules) {\n        tabsBuilder.rules(\n            field.rules.map(r => ({\n                type: r.type,\n                target: r.target,\n                operator: r.operator,\n                value: r.value ?? null,\n                action: r.action as \"hide\" | \"disable\"\n            }))\n        );\n    }\n\n    return tabsBuilder;\n}\n\nfunction mapAlert(field: CmsAlertLayoutField, layoutBuilder: ILayoutBuilder): ILayoutNodeBuilder {\n    const builder = layoutBuilder.alert();\n    if (field.label) {\n        builder.message(field.label);\n    }\n    if (field.alertType) {\n        builder.alertType(field.alertType);\n    }\n    if (field.rules) {\n        builder.rules(\n            field.rules.map(r => ({\n                type: r.type,\n                target: r.target,\n                operator: r.operator,\n                value: r.value ?? null,\n                action: r.action as \"hide\" | \"disable\"\n            }))\n        );\n    }\n    return builder;\n}\n"],"names":["mapCmsLayout","cmsLayout","layoutBuilder","idToFieldId","nodes","row","firstCell","isLayoutField","layoutField","node","mapLayoutField","fieldIds","cell","fieldId","collectFieldIds","layout","Set","tabsField","tab","id","mapCmsNestedLayout","fields","Map","field","fieldIdsInLayout","mapSeparator","mapTabs","mapAlert","builder","r","tabsBuilder","t","l"],"mappings":"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"}

package/features/formModel/mappers/DynamicZoneFieldMapper.js

@@ -1,4 +1,5 @@
 import { applyFieldProps } from "./applyFieldProps.js";
+import { mapCmsNestedLayout } from "../CmsLayoutMapper.js";
 import { generateAlphaNumericLowerCaseId } from "@webiny/utils/generateId";
 class DynamicZoneFieldMapper {
     map(field, registry, context) {
@@ -6,6 +7,7 @@ class DynamicZoneFieldMapper {
         const templates = field.settings?.templates;
         if (templates) for (const template of templates)builder.template(template.id, (t)=>{
             t.label(template.name);
+            if (template.description) t.description(template.description);
             if (template.icon) {
                 const icon = template.icon;
                 if ("object" == typeof icon && "name" in icon) t.icon(icon);
@@ -20,6 +22,8 @@ class DynamicZoneFieldMapper {
                 if (template.fields && template.fields.length > 0) for (const child of template.fields)result[child.fieldId] = context.mapField(child, childRegistry);
                 return result;
             });
+            const layout = mapCmsNestedLayout(template.layout, template.fields ?? []);
+            if (layout) t.layout(layout);
         });
         return applyFieldProps(builder, field, context.rendererMap);
     }

package/features/formModel/mappers/DynamicZoneFieldMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/formModel/mappers/DynamicZoneFieldMapper.js","sources":["../../../../src/features/formModel/mappers/DynamicZoneFieldMapper.ts"],"sourcesContent":["import type { ICmsFieldTypeMapper, ICmsFieldMapperContext } from \"../abstractions.js\";\nimport type {\n    IFieldBuilder,\n    IFieldBuilderRegistry,\n    IObjectFieldBuilder\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport type { CmsModelField, CmsDynamicZoneTemplate } from \"~/types.js\";\nimport { applyFieldProps } from \"./applyFieldProps.js\";\nimport type { ITemplateIcon } from \"@webiny/app-admin/features/formModel/index.js\";\nimport { generateAlphaNumericLowerCaseId } from \"@webiny/utils/generateId\";\n\nexport class DynamicZoneFieldMapper implements ICmsFieldTypeMapper {\n    readonly type = \"dynamicZone\";\n\n    map(\n        field: CmsModelField,\n        registry: IFieldBuilderRegistry,\n        context: ICmsFieldMapperContext\n    ): IFieldBuilder {\n        const builder = registry.object() as IObjectFieldBuilder;\n\n        const templates = field.settings?.templates as CmsDynamicZoneTemplate[] | undefined;\n        if (templates) {\n            for (const template of templates) {\n                builder.template(template.id, t => {\n                    t.label(template.name);\n                    if (template.icon) {\n                        const icon = template.icon;\n                        if (typeof icon === \"object\" && \"name\" in icon) {\n                            t.icon(icon as ITemplateIcon);\n                        } else if (typeof icon === \"string\") {\n                            t.icon({ type: \"icon\", name: icon });\n                        }\n                    }\n                    t.fields(childRegistry => {\n                        const result: Record<string, IFieldBuilder> = {};\n                        result[\"_id\"] = childRegistry\n                            .text()\n                            .hidden()\n                            .defaultValue(() => generateAlphaNumericLowerCaseId(12))\n                            .cloneValue(() => generateAlphaNumericLowerCaseId(12));\n                        if (template.fields && template.fields.length > 0) {\n                            for (const child of template.fields) {\n                                result[child.fieldId] = context.mapField(child, childRegistry);\n                            }\n                        }\n                        return result;\n                    });\n                });\n            }\n        }\n\n        return applyFieldProps(builder, field, context.rendererMap);\n    }\n}\n"],"names":["DynamicZoneFieldMapper","field","registry","context","builder","templates","template","t","icon","childRegistry","result","generateAlphaNumericLowerCaseId","child","applyFieldProps"],"mappings":";;AAWO,MAAMA;IAGT,IACIC,KAAoB,EACpBC,QAA+B,EAC/BC,OAA+B,EAClB;QACb,MAAMC,UAAUF,SAAS,MAAM;QAE/B,MAAMG,YAAYJ,MAAM,QAAQ,EAAE;QAClC,IAAII,WACA,KAAK,MAAMC,YAAYD,UACnBD,QAAQ,QAAQ,CAACE,SAAS,EAAE,EAAEC,CAAAA;YAC1BA,EAAE,KAAK,CAACD,SAAS,IAAI;YACrB,IAAIA,SAAS,IAAI,EAAE;gBACf,MAAME,OAAOF,SAAS,IAAI;gBAC1B,IAAI,AAAgB,YAAhB,OAAOE,QAAqB,UAAUA,MACtCD,EAAE,IAAI,CAACC;qBACJ,IAAI,AAAgB,YAAhB,OAAOA,MACdD,EAAE,IAAI,CAAC;oBAAE,MAAM;oBAAQ,MAAMC;gBAAK;YAE1C;YACAD,EAAE,MAAM,CAACE,CAAAA;gBACL,MAAMC,SAAwC,CAAC;gBAC/CA,MAAM,CAAC,MAAM,GAAGD,cACX,IAAI,GACJ,MAAM,GACN,YAAY,CAAC,IAAME,gCAAgC,KACnD,UAAU,CAAC,IAAMA,gCAAgC;gBACtD,IAAIL,SAAS,MAAM,IAAIA,SAAS,MAAM,CAAC,MAAM,GAAG,GAC5C,KAAK,MAAMM,SAASN,SAAS,MAAM,CAC/BI,MAAM,CAACE,MAAM,OAAO,CAAC,GAAGT,QAAQ,QAAQ,CAACS,OAAOH;gBAGxD,OAAOC;YACX;QACJ;QAIR,OAAOG,gBAAgBT,SAASH,OAAOE,QAAQ,WAAW;IAC9D;;aAzCS,IAAI,GAAG;;AA0CpB"}
+{"version":3,"file":"features/formModel/mappers/DynamicZoneFieldMapper.js","sources":["../../../../src/features/formModel/mappers/DynamicZoneFieldMapper.ts"],"sourcesContent":["import type { ICmsFieldTypeMapper, ICmsFieldMapperContext } from \"../abstractions.js\";\nimport type {\n    IFieldBuilder,\n    IFieldBuilderRegistry,\n    IObjectFieldBuilder\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport type { CmsModelField, CmsDynamicZoneTemplate } from \"~/types.js\";\nimport { applyFieldProps } from \"./applyFieldProps.js\";\nimport { mapCmsNestedLayout } from \"../CmsLayoutMapper.js\";\nimport type { ITemplateIcon } from \"@webiny/app-admin/features/formModel/index.js\";\nimport { generateAlphaNumericLowerCaseId } from \"@webiny/utils/generateId\";\n\nexport class DynamicZoneFieldMapper implements ICmsFieldTypeMapper {\n    readonly type = \"dynamicZone\";\n\n    map(\n        field: CmsModelField,\n        registry: IFieldBuilderRegistry,\n        context: ICmsFieldMapperContext\n    ): IFieldBuilder {\n        const builder = registry.object() as IObjectFieldBuilder;\n\n        const templates = field.settings?.templates as CmsDynamicZoneTemplate[] | undefined;\n        if (templates) {\n            for (const template of templates) {\n                builder.template(template.id, t => {\n                    t.label(template.name);\n                    if (template.description) {\n                        t.description(template.description);\n                    }\n                    if (template.icon) {\n                        const icon = template.icon;\n                        if (typeof icon === \"object\" && \"name\" in icon) {\n                            t.icon(icon as ITemplateIcon);\n                        } else if (typeof icon === \"string\") {\n                            t.icon({ type: \"icon\", name: icon });\n                        }\n                    }\n                    t.fields(childRegistry => {\n                        const result: Record<string, IFieldBuilder> = {};\n                        result[\"_id\"] = childRegistry\n                            .text()\n                            .hidden()\n                            .defaultValue(() => generateAlphaNumericLowerCaseId(12))\n                            .cloneValue(() => generateAlphaNumericLowerCaseId(12));\n                        if (template.fields && template.fields.length > 0) {\n                            for (const child of template.fields) {\n                                result[child.fieldId] = context.mapField(child, childRegistry);\n                            }\n                        }\n                        return result;\n                    });\n                    const layout = mapCmsNestedLayout(template.layout, template.fields ?? []);\n                    if (layout) {\n                        t.layout(layout);\n                    }\n                });\n            }\n        }\n\n        return applyFieldProps(builder, field, context.rendererMap);\n    }\n}\n"],"names":["DynamicZoneFieldMapper","field","registry","context","builder","templates","template","t","icon","childRegistry","result","generateAlphaNumericLowerCaseId","child","layout","mapCmsNestedLayout","applyFieldProps"],"mappings":";;;AAYO,MAAMA;IAGT,IACIC,KAAoB,EACpBC,QAA+B,EAC/BC,OAA+B,EAClB;QACb,MAAMC,UAAUF,SAAS,MAAM;QAE/B,MAAMG,YAAYJ,MAAM,QAAQ,EAAE;QAClC,IAAII,WACA,KAAK,MAAMC,YAAYD,UACnBD,QAAQ,QAAQ,CAACE,SAAS,EAAE,EAAEC,CAAAA;YAC1BA,EAAE,KAAK,CAACD,SAAS,IAAI;YACrB,IAAIA,SAAS,WAAW,EACpBC,EAAE,WAAW,CAACD,SAAS,WAAW;YAEtC,IAAIA,SAAS,IAAI,EAAE;gBACf,MAAME,OAAOF,SAAS,IAAI;gBAC1B,IAAI,AAAgB,YAAhB,OAAOE,QAAqB,UAAUA,MACtCD,EAAE,IAAI,CAACC;qBACJ,IAAI,AAAgB,YAAhB,OAAOA,MACdD,EAAE,IAAI,CAAC;oBAAE,MAAM;oBAAQ,MAAMC;gBAAK;YAE1C;YACAD,EAAE,MAAM,CAACE,CAAAA;gBACL,MAAMC,SAAwC,CAAC;gBAC/CA,MAAM,CAAC,MAAM,GAAGD,cACX,IAAI,GACJ,MAAM,GACN,YAAY,CAAC,IAAME,gCAAgC,KACnD,UAAU,CAAC,IAAMA,gCAAgC;gBACtD,IAAIL,SAAS,MAAM,IAAIA,SAAS,MAAM,CAAC,MAAM,GAAG,GAC5C,KAAK,MAAMM,SAASN,SAAS,MAAM,CAC/BI,MAAM,CAACE,MAAM,OAAO,CAAC,GAAGT,QAAQ,QAAQ,CAACS,OAAOH;gBAGxD,OAAOC;YACX;YACA,MAAMG,SAASC,mBAAmBR,SAAS,MAAM,EAAEA,SAAS,MAAM,IAAI,EAAE;YACxE,IAAIO,QACAN,EAAE,MAAM,CAACM;QAEjB;QAIR,OAAOE,gBAAgBX,SAASH,OAAOE,QAAQ,WAAW;IAC9D;;aAhDS,IAAI,GAAG;;AAiDpB"}

package/features/formModel/mappers/ObjectFieldMapper.js

@@ -1,15 +1,20 @@
 import { applyFieldProps } from "./applyFieldProps.js";
+import { mapCmsNestedLayout } from "../CmsLayoutMapper.js";
 import { generateAlphaNumericLowerCaseId } from "@webiny/utils/generateId";
 class ObjectFieldMapper {
     map(field, registry, context) {
         const builder = registry.object();
         const childFields = field.settings?.fields;
-        if (childFields && childFields.length > 0) builder.fields((childRegistry)=>{
-            const result = {};
-            result["_id"] = childRegistry.text().hidden().defaultValue(()=>generateAlphaNumericLowerCaseId(12)).cloneValue(()=>generateAlphaNumericLowerCaseId(12));
-            for (const child of childFields)result[child.fieldId] = context.mapField(child, childRegistry);
-            return result;
-        });
+        if (childFields && childFields.length > 0) {
+            builder.fields((childRegistry)=>{
+                const result = {};
+                result["_id"] = childRegistry.text().hidden().defaultValue(()=>generateAlphaNumericLowerCaseId(12)).cloneValue(()=>generateAlphaNumericLowerCaseId(12));
+                for (const child of childFields)result[child.fieldId] = context.mapField(child, childRegistry);
+                return result;
+            });
+            const layout = mapCmsNestedLayout(field.settings?.layout, childFields);
+            if (layout) builder.layout(layout);
+        }
         return applyFieldProps(builder, field, context.rendererMap);
     }
     constructor(){

package/features/formModel/mappers/ObjectFieldMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/formModel/mappers/ObjectFieldMapper.js","sources":["../../../../src/features/formModel/mappers/ObjectFieldMapper.ts"],"sourcesContent":["import type { ICmsFieldTypeMapper, ICmsFieldMapperContext } from \"../abstractions.js\";\nimport type {\n    IFieldBuilder,\n    IFieldBuilderRegistry,\n    IObjectFieldBuilder\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport type { CmsModelField } from \"~/types.js\";\nimport { applyFieldProps } from \"./applyFieldProps.js\";\nimport { generateAlphaNumericLowerCaseId } from \"@webiny/utils/generateId\";\n\nexport class ObjectFieldMapper implements ICmsFieldTypeMapper {\n    readonly type = \"object\";\n\n    map(\n        field: CmsModelField,\n        registry: IFieldBuilderRegistry,\n        context: ICmsFieldMapperContext\n    ): IFieldBuilder {\n        const builder = registry.object() as IObjectFieldBuilder;\n\n        const childFields = field.settings?.fields;\n        if (childFields && childFields.length > 0) {\n            builder.fields(childRegistry => {\n                const result: Record<string, IFieldBuilder> = {};\n                result[\"_id\"] = childRegistry\n                    .text()\n                    .hidden()\n                    .defaultValue(() => generateAlphaNumericLowerCaseId(12))\n                    .cloneValue(() => generateAlphaNumericLowerCaseId(12));\n                for (const child of childFields) {\n                    result[child.fieldId] = context.mapField(child, childRegistry);\n                }\n                return result;\n            });\n        }\n\n        return applyFieldProps(builder, field, context.rendererMap);\n    }\n}\n"],"names":["ObjectFieldMapper","field","registry","context","builder","childFields","childRegistry","result","generateAlphaNumericLowerCaseId","child","applyFieldProps"],"mappings":";;AAUO,MAAMA;IAGT,IACIC,KAAoB,EACpBC,QAA+B,EAC/BC,OAA+B,EAClB;QACb,MAAMC,UAAUF,SAAS,MAAM;QAE/B,MAAMG,cAAcJ,MAAM,QAAQ,EAAE;QACpC,IAAII,eAAeA,YAAY,MAAM,GAAG,GACpCD,QAAQ,MAAM,CAACE,CAAAA;YACX,MAAMC,SAAwC,CAAC;YAC/CA,MAAM,CAAC,MAAM,GAAGD,cACX,IAAI,GACJ,MAAM,GACN,YAAY,CAAC,IAAME,gCAAgC,KACnD,UAAU,CAAC,IAAMA,gCAAgC;YACtD,KAAK,MAAMC,SAASJ,YAChBE,MAAM,CAACE,MAAM,OAAO,CAAC,GAAGN,QAAQ,QAAQ,CAACM,OAAOH;YAEpD,OAAOC;QACX;QAGJ,OAAOG,gBAAgBN,SAASH,OAAOE,QAAQ,WAAW;IAC9D;;aA1BS,IAAI,GAAG;;AA2BpB"}
+{"version":3,"file":"features/formModel/mappers/ObjectFieldMapper.js","sources":["../../../../src/features/formModel/mappers/ObjectFieldMapper.ts"],"sourcesContent":["import type { ICmsFieldTypeMapper, ICmsFieldMapperContext } from \"../abstractions.js\";\nimport type {\n    IFieldBuilder,\n    IFieldBuilderRegistry,\n    IObjectFieldBuilder\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport type { CmsModelField } from \"~/types.js\";\nimport { applyFieldProps } from \"./applyFieldProps.js\";\nimport { mapCmsNestedLayout } from \"../CmsLayoutMapper.js\";\nimport { generateAlphaNumericLowerCaseId } from \"@webiny/utils/generateId\";\n\nexport class ObjectFieldMapper implements ICmsFieldTypeMapper {\n    readonly type = \"object\";\n\n    map(\n        field: CmsModelField,\n        registry: IFieldBuilderRegistry,\n        context: ICmsFieldMapperContext\n    ): IFieldBuilder {\n        const builder = registry.object() as IObjectFieldBuilder;\n\n        const childFields = field.settings?.fields;\n        if (childFields && childFields.length > 0) {\n            builder.fields(childRegistry => {\n                const result: Record<string, IFieldBuilder> = {};\n                result[\"_id\"] = childRegistry\n                    .text()\n                    .hidden()\n                    .defaultValue(() => generateAlphaNumericLowerCaseId(12))\n                    .cloneValue(() => generateAlphaNumericLowerCaseId(12));\n                for (const child of childFields) {\n                    result[child.fieldId] = context.mapField(child, childRegistry);\n                }\n                return result;\n            });\n\n            const layout = mapCmsNestedLayout(field.settings?.layout, childFields);\n            if (layout) {\n                builder.layout(layout);\n            }\n        }\n\n        return applyFieldProps(builder, field, context.rendererMap);\n    }\n}\n"],"names":["ObjectFieldMapper","field","registry","context","builder","childFields","childRegistry","result","generateAlphaNumericLowerCaseId","child","layout","mapCmsNestedLayout","applyFieldProps"],"mappings":";;;AAWO,MAAMA;IAGT,IACIC,KAAoB,EACpBC,QAA+B,EAC/BC,OAA+B,EAClB;QACb,MAAMC,UAAUF,SAAS,MAAM;QAE/B,MAAMG,cAAcJ,MAAM,QAAQ,EAAE;QACpC,IAAII,eAAeA,YAAY,MAAM,GAAG,GAAG;YACvCD,QAAQ,MAAM,CAACE,CAAAA;gBACX,MAAMC,SAAwC,CAAC;gBAC/CA,MAAM,CAAC,MAAM,GAAGD,cACX,IAAI,GACJ,MAAM,GACN,YAAY,CAAC,IAAME,gCAAgC,KACnD,UAAU,CAAC,IAAMA,gCAAgC;gBACtD,KAAK,MAAMC,SAASJ,YAChBE,MAAM,CAACE,MAAM,OAAO,CAAC,GAAGN,QAAQ,QAAQ,CAACM,OAAOH;gBAEpD,OAAOC;YACX;YAEA,MAAMG,SAASC,mBAAmBV,MAAM,QAAQ,EAAE,QAAQI;YAC1D,IAAIK,QACAN,QAAQ,MAAM,CAACM;QAEvB;QAEA,OAAOE,gBAAgBR,SAASH,OAAOE,QAAQ,WAAW;IAC9D;;aA/BS,IAAI,GAAG;;AAgCpB"}

package/features/model/exportModels/ExportModelsGateway.d.ts

@@ -3,7 +3,7 @@ import { ExportModelsGateway as GatewayAbstraction } from "./abstractions.js";
 declare class ExportModelsGatewayImpl implements GatewayAbstraction.Interface {
     private client;
     constructor(client: CmsGraphQLClient.Interface);
-    execute(models?: string[]): Promise<any>;
+    execute(models?: string[]): Promise<string>;
 }
 export declare const ExportModelsGateway: typeof ExportModelsGatewayImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IExportModelsGateway>;

package/features/model/exportModels/ExportModelsGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/model/exportModels/ExportModelsGateway.js","sources":["../../../../src/features/model/exportModels/ExportModelsGateway.ts"],"sourcesContent":["import { CmsGraphQLClient } from \"~/features/graphQLClient/abstractions.js\";\nimport type { CmsErrorResponse } from \"~/types.js\";\nimport { ExportModelsGateway as GatewayAbstraction } from \"./abstractions.js\";\n\ninterface ExportModelsResponse {\n    exportStructure: {\n        data: any;\n        error: CmsErrorResponse | null;\n    };\n}\n\ninterface ExportModelsVariables {\n    models?: string[];\n}\n\nconst CMS_EXPORT_STRUCTURE_QUERY = /* GraphQL */ `\n    query CmsExportStructure($models: [String!]) {\n        exportStructure(models: $models) {\n            data\n            error {\n                message\n                code\n                data\n            }\n        }\n    }\n`;\n\nclass ExportModelsGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(private client: CmsGraphQLClient.Interface) {}\n\n    async execute(models?: string[]) {\n        const response = await this.client.execute<ExportModelsResponse, ExportModelsVariables>({\n            query: CMS_EXPORT_STRUCTURE_QUERY,\n            variables: { models }\n        });\n\n        const { data, error } = response.exportStructure;\n\n        if (error) {\n            throw new Error(error.message);\n        }\n\n        return data;\n    }\n}\n\nexport const ExportModelsGateway = GatewayAbstraction.createImplementation({\n    implementation: ExportModelsGatewayImpl,\n    dependencies: [CmsGraphQLClient]\n});\n"],"names":["CMS_EXPORT_STRUCTURE_QUERY","ExportModelsGatewayImpl","client","models","response","data","error","Error","ExportModelsGateway","GatewayAbstraction","CmsGraphQLClient"],"mappings":";;AAeA,MAAMA,6BAA2C,CAAC;;;;;;;;;;;AAWlD,CAAC;AAED,MAAMC;IACF,YAAoBC,MAAkC,CAAE;aAApCA,MAAM,GAANA;IAAqC;IAEzD,MAAM,QAAQC,MAAiB,EAAE;QAC7B,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAA8C;YACpF,OAAOJ;YACP,WAAW;gBAAEG;YAAO;QACxB;QAEA,MAAM,EAAEE,IAAI,EAAEC,KAAK,EAAE,GAAGF,SAAS,eAAe;QAEhD,IAAIE,OACA,MAAM,IAAIC,MAAMD,MAAM,OAAO;QAGjC,OAAOD;IACX;AACJ;AAEO,MAAMG,0CAAsBC,oBAAAA,oBAAuC,CAAC;IACvE,gBAAgBR;IAChB,cAAc;QAACS;KAAiB;AACpC"}
+{"version":3,"file":"features/model/exportModels/ExportModelsGateway.js","sources":["../../../../src/features/model/exportModels/ExportModelsGateway.ts"],"sourcesContent":["import { CmsGraphQLClient } from \"~/features/graphQLClient/abstractions.js\";\nimport type { CmsErrorResponse } from \"~/types.js\";\nimport { ExportModelsGateway as GatewayAbstraction } from \"./abstractions.js\";\n\ninterface ExportModelsResponse {\n    exportStructure: {\n        data: string;\n        error: CmsErrorResponse | null;\n    };\n}\n\ninterface ExportModelsVariables {\n    models?: string[];\n}\n\nconst CMS_EXPORT_STRUCTURE_QUERY = /* GraphQL */ `\n    query CmsExportStructure($models: [String!]) {\n        exportStructure(models: $models) {\n            data\n            error {\n                message\n                code\n                data\n            }\n        }\n    }\n`;\n\nclass ExportModelsGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(private client: CmsGraphQLClient.Interface) {}\n\n    async execute(models?: string[]) {\n        const response = await this.client.execute<ExportModelsResponse, ExportModelsVariables>({\n            query: CMS_EXPORT_STRUCTURE_QUERY,\n            variables: { models }\n        });\n\n        const { data, error } = response.exportStructure;\n\n        if (error) {\n            throw new Error(error.message);\n        }\n\n        return data;\n    }\n}\n\nexport const ExportModelsGateway = GatewayAbstraction.createImplementation({\n    implementation: ExportModelsGatewayImpl,\n    dependencies: [CmsGraphQLClient]\n});\n"],"names":["CMS_EXPORT_STRUCTURE_QUERY","ExportModelsGatewayImpl","client","models","response","data","error","Error","ExportModelsGateway","GatewayAbstraction","CmsGraphQLClient"],"mappings":";;AAeA,MAAMA,6BAA2C,CAAC;;;;;;;;;;;AAWlD,CAAC;AAED,MAAMC;IACF,YAAoBC,MAAkC,CAAE;aAApCA,MAAM,GAANA;IAAqC;IAEzD,MAAM,QAAQC,MAAiB,EAAE;QAC7B,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAA8C;YACpF,OAAOJ;YACP,WAAW;gBAAEG;YAAO;QACxB;QAEA,MAAM,EAAEE,IAAI,EAAEC,KAAK,EAAE,GAAGF,SAAS,eAAe;QAEhD,IAAIE,OACA,MAAM,IAAIC,MAAMD,MAAM,OAAO;QAGjC,OAAOD;IACX;AACJ;AAEO,MAAMG,0CAAsBC,oBAAAA,oBAAuC,CAAC;IACvE,gBAAgBR;IAChB,cAAc;QAACS;KAAiB;AACpC"}

package/features/model/exportModels/ExportModelsUseCase.js

@@ -4,7 +4,13 @@ class ExportModelsUseCaseImpl {
         this.gateway = gateway;
     }
     async execute(models) {
-        return this.gateway.execute(models);
+        const result = await this.gateway.execute(models);
+        try {
+            return JSON.parse(result);
+        } catch (ex) {
+            console.error(ex);
+            return null;
+        }
     }
 }
 const ExportModelsUseCase_ExportModelsUseCase = ExportModelsUseCase.createImplementation({

package/features/model/exportModels/ExportModelsUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/model/exportModels/ExportModelsUseCase.js","sources":["../../../../src/features/model/exportModels/ExportModelsUseCase.ts"],"sourcesContent":["import { ExportModelsUseCase as UseCaseAbstraction, ExportModelsGateway } from \"./abstractions.js\";\n\nclass ExportModelsUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(private gateway: ExportModelsGateway.Interface) {}\n\n    async execute(models?: string[]) {\n        return this.gateway.execute(models);\n    }\n}\n\nexport const ExportModelsUseCase = UseCaseAbstraction.createImplementation({\n    implementation: ExportModelsUseCaseImpl,\n    dependencies: [ExportModelsGateway]\n});\n"],"names":["ExportModelsUseCaseImpl","gateway","models","ExportModelsUseCase","UseCaseAbstraction","ExportModelsGateway"],"mappings":";AAEA,MAAMA;IACF,YAAoBC,OAAsC,CAAE;aAAxCA,OAAO,GAAPA;IAAyC;IAE7D,MAAM,QAAQC,MAAiB,EAAE;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAACA;IAChC;AACJ;AAEO,MAAMC,0CAAsBC,oBAAAA,oBAAuC,CAAC;IACvE,gBAAgBJ;IAChB,cAAc;QAACK;KAAoB;AACvC"}
+{"version":3,"file":"features/model/exportModels/ExportModelsUseCase.js","sources":["../../../../src/features/model/exportModels/ExportModelsUseCase.ts"],"sourcesContent":["import { ExportModelsUseCase as UseCaseAbstraction, ExportModelsGateway } from \"./abstractions.js\";\n\nclass ExportModelsUseCaseImpl implements UseCaseAbstraction.Interface {\n    constructor(private gateway: ExportModelsGateway.Interface) {}\n\n    async execute(models?: string[]) {\n        const result = await this.gateway.execute(models);\n        try {\n            return JSON.parse(result);\n        } catch (ex) {\n            console.error(ex);\n            return null;\n        }\n    }\n}\n\nexport const ExportModelsUseCase = UseCaseAbstraction.createImplementation({\n    implementation: ExportModelsUseCaseImpl,\n    dependencies: [ExportModelsGateway]\n});\n"],"names":["ExportModelsUseCaseImpl","gateway","models","result","JSON","ex","console","ExportModelsUseCase","UseCaseAbstraction","ExportModelsGateway"],"mappings":";AAEA,MAAMA;IACF,YAAoBC,OAAsC,CAAE;aAAxCA,OAAO,GAAPA;IAAyC;IAE7D,MAAM,QAAQC,MAAiB,EAAE;QAC7B,MAAMC,SAAS,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACD;QAC1C,IAAI;YACA,OAAOE,KAAK,KAAK,CAACD;QACtB,EAAE,OAAOE,IAAI;YACTC,QAAQ,KAAK,CAACD;YACd,OAAO;QACX;IACJ;AACJ;AAEO,MAAME,0CAAsBC,oBAAAA,oBAAuC,CAAC;IACvE,gBAAgBR;IAChB,cAAc;QAACS;KAAoB;AACvC"}

package/features/model/exportModels/abstractions.d.ts

@@ -1,14 +1,20 @@
+import type { CmsModel, CmsGroup } from "../../../types.js";
 export interface IExportModelsGateway {
-    execute(models?: string[]): Promise<any>;
+    execute(models?: string[]): Promise<string>;
+}
+export interface IExportModelsUseCaseResponse {
+    models: CmsModel[];
+    groups: CmsGroup[];
 }
 export declare const ExportModelsGateway: import("@webiny/di").Abstraction<IExportModelsGateway>;
 export declare namespace ExportModelsGateway {
     type Interface = IExportModelsGateway;
 }
 export interface IExportModelsUseCase {
-    execute(models?: string[]): Promise<any>;
+    execute(models?: string[]): Promise<IExportModelsUseCaseResponse | null>;
 }
 export declare const ExportModelsUseCase: import("@webiny/di").Abstraction<IExportModelsUseCase>;
 export declare namespace ExportModelsUseCase {
     type Interface = IExportModelsUseCase;
+    type Response = IExportModelsUseCaseResponse;
 }

package/features/model/exportModels/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/model/exportModels/abstractions.js","sources":["../../../../src/features/model/exportModels/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\n\nexport interface IExportModelsGateway {\n    execute(models?: string[]): Promise<any>;\n}\n\nexport const ExportModelsGateway = createAbstraction<IExportModelsGateway>(\"ExportModelsGateway\");\n\nexport namespace ExportModelsGateway {\n    export type Interface = IExportModelsGateway;\n}\n\nexport interface IExportModelsUseCase {\n    execute(models?: string[]): Promise<any>;\n}\n\nexport const ExportModelsUseCase = createAbstraction<IExportModelsUseCase>(\"ExportModelsUseCase\");\n\nexport namespace ExportModelsUseCase {\n    export type Interface = IExportModelsUseCase;\n}\n"],"names":["ExportModelsGateway","createAbstraction","ExportModelsUseCase"],"mappings":";AAMO,MAAMA,sBAAsBC,kBAAwC;AAUpE,MAAMC,sBAAsBD,kBAAwC"}
+{"version":3,"file":"features/model/exportModels/abstractions.js","sources":["../../../../src/features/model/exportModels/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { CmsModel, CmsGroup } from \"~/types.js\";\n\nexport interface IExportModelsGateway {\n    execute(models?: string[]): Promise<string>;\n}\n\nexport interface IExportModelsUseCaseResponse {\n    models: CmsModel[];\n    groups: CmsGroup[];\n}\n\nexport const ExportModelsGateway = createAbstraction<IExportModelsGateway>(\"ExportModelsGateway\");\n\nexport namespace ExportModelsGateway {\n    export type Interface = IExportModelsGateway;\n}\n\nexport interface IExportModelsUseCase {\n    execute(models?: string[]): Promise<IExportModelsUseCaseResponse | null>;\n}\n\nexport const ExportModelsUseCase = createAbstraction<IExportModelsUseCase>(\"ExportModelsUseCase\");\n\nexport namespace ExportModelsUseCase {\n    export type Interface = IExportModelsUseCase;\n    export type Response = IExportModelsUseCaseResponse;\n}\n"],"names":["ExportModelsGateway","createAbstraction","ExportModelsUseCase"],"mappings":";AAYO,MAAMA,sBAAsBC,kBAAwC;AAUpE,MAAMC,sBAAsBD,kBAAwC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-headless-cms",
-	"version": "6.5.0-beta.1",
+	"version": "6.5.0-beta.11",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -26,33 +26,33 @@
 		"@fortawesome/free-regular-svg-icons": "7.3.1",
 		"@fortawesome/free-solid-svg-icons": "7.3.1",
 		"@fortawesome/react-fontawesome": "3.5.0",
-		"@lexical/utils": "0.48.0",
+		"@lexical/utils": "0.52.0",
 		"@types/react": "18.3.31",
-		"@webiny/admin-ui": "6.5.0-beta.1",
-		"@webiny/app": "6.5.0-beta.1",
-		"@webiny/app-aco": "6.5.0-beta.1",
-		"@webiny/app-admin": "6.5.0-beta.1",
-		"@webiny/app-graphql-playground": "6.5.0-beta.1",
-		"@webiny/app-headless-cms-common": "6.5.0-beta.1",
-		"@webiny/cms-sdk": "6.5.0-beta.1",
-		"@webiny/di": "1.0.2",
-		"@webiny/feature": "6.5.0-beta.1",
-		"@webiny/form": "6.5.0-beta.1",
-		"@webiny/frontend-settings": "6.5.0-beta.1",
-		"@webiny/icons": "6.5.0-beta.1",
-		"@webiny/lexical-editor": "6.5.0-beta.1",
-		"@webiny/lexical-nodes": "6.5.0-beta.1",
-		"@webiny/plugins": "6.5.0-beta.1",
-		"@webiny/react-composition": "6.5.0-beta.1",
-		"@webiny/react-properties": "6.5.0-beta.1",
-		"@webiny/utils": "6.5.0-beta.1",
-		"@webiny/validation": "6.5.0-beta.1",
+		"@webiny/admin-ui": "6.5.0-beta.11",
+		"@webiny/app": "6.5.0-beta.11",
+		"@webiny/app-aco": "6.5.0-beta.11",
+		"@webiny/app-admin": "6.5.0-beta.11",
+		"@webiny/app-graphql-playground": "6.5.0-beta.11",
+		"@webiny/app-headless-cms-common": "6.5.0-beta.11",
+		"@webiny/cms-sdk": "6.5.0-beta.11",
+		"@webiny/di": "1.1.0",
+		"@webiny/feature": "6.5.0-beta.11",
+		"@webiny/form": "6.5.0-beta.11",
+		"@webiny/frontend-settings": "6.5.0-beta.11",
+		"@webiny/icons": "6.5.0-beta.11",
+		"@webiny/lexical-editor": "6.5.0-beta.11",
+		"@webiny/lexical-nodes": "6.5.0-beta.11",
+		"@webiny/plugins": "6.5.0-beta.11",
+		"@webiny/react-composition": "6.5.0-beta.11",
+		"@webiny/react-properties": "6.5.0-beta.11",
+		"@webiny/utils": "6.5.0-beta.11",
+		"@webiny/validation": "6.5.0-beta.11",
 		"dot-prop-immutable": "2.1.1",
 		"graphql": "16.14.2",
 		"graphql-tag": "2.12.7",
 		"lodash": "4.18.1",
-		"mobx": "6.16.1",
-		"mobx-react-lite": "4.1.1",
+		"mobx": "7.0.6",
+		"mobx-react-lite": "5.1.0",
 		"react": "18.3.1",
 		"react-dnd": "16.0.1",
 		"react-dnd-html5-backend": "16.0.1",
@@ -60,13 +60,13 @@
 		"react-helmet": "6.1.0",
 		"slugify": "1.6.9",
 		"use-deep-compare-effect": "1.8.1",
-		"zod": "4.4.3"
+		"zod": "4.6.5"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.5.0-beta.1",
+		"@webiny/build-tools": "6.5.0-beta.11",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",
-		"vitest": "4.1.10"
+		"vitest": "5.0.3"
 	},
 	"publishConfig": {
 		"access": "public"

package/presentation/contentEntries/form/ContentEntryFormPresenter.js

@@ -13,7 +13,9 @@ import { CmsModelContext } from "../../../features/contentEntry/abstractions.js"
 import { ContentEntryFormModelModifier, ContentEntryFormPresenter } from "./abstractions.js";
 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;
@@ -78,52 +80,55 @@ class ContentEntryFormPresenterImpl {
     }
     async saveRevision(options) {
         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 this.form.submit({
+        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(()=>{
-                    this.entry = entry;
-                    this.form.setData(entry.values);
-                    this.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(()=>{
-                    this.entry = entry;
-                    this.form.setData(entry.values);
-                    this.form.reset();
-                });
             }
+            if (!isCurrent()) return false;
+            runInAction(()=>{
+                this.entry = savedEntry;
+                form.setData(savedEntry.values);
+                form.reset();
+            });
             return true;
-        } catch  {
+        } catch (error) {
+            if (isCurrent()) form.setErrors(toFormErrors(error, model));
             return false;
         } finally{
             runInAction(()=>{
-                this.loading = null;
+                if (this.loading === SAVING) this.loading = null;
             });
         }
     }
@@ -253,9 +258,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
@@ -265,7 +270,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\";\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        const skipValidation = options?.skipValidation ?? true;\n        const data = await this.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                    this.entry = entry;\n                    this.form!.setData(entry.values);\n                    this.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                    this.entry = entry;\n                    this.form!.setData(entry.values);\n                    this.form!.reset();\n                });\n            }\n\n            return true;\n        } catch {\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","skipValidation","data","runInAction","createData","result","model","TRASH_ENTRY_DIALOG","id","folderId","initialValues","formConfig","form","modifier","params","ContentEntryFormPresenter","Abstraction","FormModelFactory","CmsFormModelBuilder","Confirmation","CmsModelContext","GetEntryUseCase","CreateEntryUseCase","CreateRevisionFromUseCase","UpdateEntryUseCase","PublishEntryUseCase","UnpublishEntryUseCase","DeleteEntryUseCase","UpdateRevisionDescriptionUseCase","ContentEntryFormModelModifier"],"mappings":";;;;;;;;;;;;;;;AA8BO,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;QAGX,MAAMC,iBAAiBD,SAAS,kBAAkB;QAClD,MAAME,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAAED;QAAe;QAErD,IAAI,CAACC,MACD,OAAO;QAGXC,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;QAEA,IAAI;YACA,IAAI,IAAI,CAAC,KAAK,EAAE;gBAKZ,MAAMT,QAAQ,MAAM,IAAI,CAAC,SAAS,CAAC;oBAC/B,OAAO,IAAI,CAAC,KAAK;oBACjBQ;oBACAD;gBACJ;gBAEAE,YAAY;oBACR,IAAI,CAAC,KAAK,GAAGT;oBACb,IAAI,CAAC,IAAI,CAAE,OAAO,CAACA,MAAM,MAAM;oBAC/B,IAAI,CAAC,IAAI,CAAE,KAAK;gBACpB;YACJ,OAAO;gBACH,MAAMU,aAAsC;oBAAE,QAAQF;gBAAK;gBAC3D,IAAI,IAAI,CAAC,QAAQ,EACbE,WAAW,eAAe,GAAG;oBAAE,UAAU,IAAI,CAAC,QAAQ;gBAAC;gBAG3D,MAAMV,QAAQ,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;oBAChD,OAAO,IAAI,CAAC,KAAK;oBACjB,MAAMU;oBACN,SAAS;wBAAEH;oBAAe;gBAC9B;gBAEAE,YAAY;oBACR,IAAI,CAAC,KAAK,GAAGT;oBACb,IAAI,CAAC,IAAI,CAAE,OAAO,CAACA,MAAM,MAAM;oBAC/B,IAAI,CAAC,IAAI,CAAE,KAAK;gBACpB;YACJ;YAEA,OAAO;QACX,EAAE,OAAM;YACJ,OAAO;QACX,SAAU;YACNS,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,kBAAoC;QACtC,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,OAAO;QAGX,MAAME,SAAS,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAC1C5B,sBACA;YAAE,OAAO,IAAI,CAAC,KAAK;QAAC;QAGxB,IAAI4B,AAAW,UAAXA,QACA,OAAO;QAGXF,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;QAEA,IAAI;YACA,IAAIE,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,MAAMX,QAAQ,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBACjD,OAAO,IAAI,CAAC,KAAK;gBACjB,YAAY,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B;YAEAS,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGT;YACjB;YAEA,OAAO;QACX,EAAE,OAAM;YACJ,OAAO;QACX,SAAU;YACNS,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,MAAMT,QAAQ,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;gBACnD,OAAO,IAAI,CAAC,KAAK;gBACjB,YAAY,IAAI,CAAC,KAAK,CAAC,EAAE;YAC7B;YAEAS,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGT;YACjB;YAEA,OAAO;QACX,EAAE,OAAM;YACJ,OAAO;QACX,SAAU;YACNS,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,MAAM,cAAgC;QAClC,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,OAAO;QAGX,MAAMG,QAAQ,IAAI,CAAC,KAAK;QACxB,MAAMZ,QAAQ,IAAI,CAAC,KAAK;QAExB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAC5Ba,oBACA;YAAE,SAASb,MAAM,OAAO;QAAC,GACzB;YACI,IAAI;gBACA,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;oBAClCY;oBACA,IAAIZ,MAAM,OAAO;gBACrB;gBAEAS,YAAY;oBACR,IAAI,CAAC,KAAK,GAAG;oBACb,IAAI,CAAC,IAAI,GAAG;gBAChB;gBAEA,OAAO;YACX,EAAE,OAAM;gBACJ,OAAO;YACX;QACJ;IAER;IAEA,MAAM,aAAaK,EAAU,EAAiB;QAC1C,IAAI,CAAC,OAAO,GAAG;QAEf,IAAI;YACA,MAAMd,QAAQ,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC7C,OAAO,IAAI,CAAC,KAAK;gBACjBc;YACJ;YAEAL,YAAY;gBACR,IAAI,CAAC,KAAK,GAAGT;gBACb,IAAI,CAAC,oBAAoB,CAACA;YAC9B;QACJ,SAAU;YACNS,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,YAAYM,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,eAAef,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,MAAMgB,aAAa,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;QAC5D,MAAMC,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAACD;QAC1C,KAAK,MAAME,YAAY,IAAI,CAAC,kBAAkB,CAC1CA,SAAS,UAAU,CAACD,MAAM,IAAI,CAAC,KAAK;QAExC,OAAOA;IACX;IAEQ,qBAAqBlB,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,UAAUoB,MAAuB,EAAgB;QAC3D,MAAM,EAAEpB,KAAK,EAAEQ,IAAI,EAAED,cAAc,EAAE,GAAGa;QAExC,IAAIpB,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,QAAQQ;YACZ;YACA,SAAS;gBAAED;YAAe;QAC9B;QAEJ,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACzC,OAAO,IAAI,CAAC,KAAK;YACjB,YAAYP,MAAM,EAAE;YACpB,MAAM;gBACF,QAAQQ;YACZ;YACA,SAAS;gBAAED;YAAe;QAC9B;IACJ;AACJ;AAEO,MAAMc,sDAA4BC,0BAAAA,oBAAgC,CAAC;IACtE,gBAAgBtC;IAChB,cAAc;QACVuC;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    }\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":"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"}

package/presentation/contentEntries/form/ContentEntryFormPresenter.test.d.ts

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