@webiny/app-headless-cms 6.0.0-alpha.5 → 6.0.0-rc.0

package/admin/components/ContentEntryForm/ContentEntryForm.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import type { FormOnSubmit, FormValidation } from "@webiny/form";
-import type { CmsContentEntry } from "../../../types";
-import type { ContentEntryFormContext, PersistEntry } from "./ContentEntryFormProvider";
+import type { CmsContentEntry } from "../../../types.js";
+import type { ContentEntryFormContext, PersistEntry } from "./ContentEntryFormProvider.js";
 export interface ContentEntryFormProps extends Omit<React.HTMLAttributes<HTMLDivElement>, "onChange"> {
     entry: Partial<CmsContentEntry>;
     /**

package/admin/components/ContentEntryForm/ContentEntryForm.js

@@ -1,11 +1,11 @@
 import React, { useEffect, useRef } from "react";
 import { makeDecoratable } from "@webiny/app-admin";
-import { ModelProvider, useModel } from "../ModelProvider";
-import { useFormRenderer } from "./useFormRenderer";
-import { ContentEntryFormProvider } from "./ContentEntryFormProvider";
-import { CustomLayout } from "./CustomLayout";
-import { DefaultLayout } from "./DefaultLayout";
-import { useGoToRevision } from "./useGoToRevision";
+import { ModelProvider, useModel } from "../ModelProvider/index.js";
+import { useFormRenderer } from "./useFormRenderer.js";
+import { ContentEntryFormProvider } from "./ContentEntryFormProvider.js";
+import { CustomLayout } from "./CustomLayout.js";
+import { DefaultLayout } from "./DefaultLayout.js";
+import { useGoToRevision } from "./useGoToRevision.js";
 export const ContentEntryForm = makeDecoratable("ContentEntryForm", ({
   entry,
   persistEntry,

package/admin/components/ContentEntryForm/ContentEntryForm.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useRef","makeDecoratable","ModelProvider","useModel","useFormRenderer","ContentEntryFormProvider","CustomLayout","DefaultLayout","useGoToRevision","ContentEntryForm","entry","persistEntry","onChange","onInvalidFields","onAfterCreate","setSaveEntry","header","props","formElementRef","model","goToRevision","formRenderer","defaultOnAfterCreate","id","current","setTimeout","scrollTo","isBeingDeleted","createElement","Fragment","confirmNavigationIfDirty","Object","assign","ref"],"sources":["ContentEntryForm.tsx"],"sourcesContent":["import React, { useEffect, useRef } from \"react\";\nimport type { FormOnSubmit, FormValidation } from \"@webiny/form\";\nimport { makeDecoratable } from \"@webiny/app-admin\";\nimport type { CmsContentEntry } from \"~/types\";\nimport { ModelProvider, useModel } from \"~/admin/components/ModelProvider\";\nimport { useFormRenderer } from \"~/admin/components/ContentEntryForm/useFormRenderer\";\nimport type { ContentEntryFormContext, PersistEntry } from \"./ContentEntryFormProvider\";\nimport { ContentEntryFormProvider } from \"./ContentEntryFormProvider\";\nimport { CustomLayout } from \"./CustomLayout\";\nimport { DefaultLayout } from \"./DefaultLayout\";\nimport { useGoToRevision } from \"~/admin/components/ContentEntryForm/useGoToRevision\";\n\nexport interface ContentEntryFormProps\n    extends Omit<React.HTMLAttributes<HTMLDivElement>, \"onChange\"> {\n    entry: Partial<CmsContentEntry>;\n    /**\n     * This callback is executed when an entry, or a revision, are created.\n     * @param entry\n     */\n    onAfterCreate?: (entry: CmsContentEntry) => void;\n    /**\n     * This callback is executed when the form is valid, and it needs to persist the content entry.\n     */\n    persistEntry: PersistEntry;\n    onChange?: FormOnSubmit<Partial<CmsContentEntry>>;\n    onInvalidFields?: (invalidFields: FormValidation) => void;\n    header?: React.ReactNode;\n    /**\n     * This prop is used to get a reference to `saveEntry` callback, so it can be triggered by components\n     * outside the ContentEntryForm context.\n     * TODO: introduce a `layout` prop to be able to mount arbitrary components around the entry form, within the context.\n     */\n    setSaveEntry?: (cb: ContentEntryFormContext[\"saveEntry\"]) => void;\n}\n\nexport const ContentEntryForm = makeDecoratable(\n    \"ContentEntryForm\",\n    ({\n        entry,\n        persistEntry,\n        onChange,\n        onInvalidFields,\n        onAfterCreate,\n        setSaveEntry,\n        header = true,\n        ...props\n    }: ContentEntryFormProps) => {\n        const formElementRef = useRef<HTMLDivElement>(null);\n        const { model } = useModel();\n        const { goToRevision } = useGoToRevision();\n        const formRenderer = useFormRenderer(model);\n\n        const defaultOnAfterCreate = (entry: CmsContentEntry) => {\n            goToRevision(entry.id);\n        };\n\n        // When entry changes, scroll to the top of the form.\n        useEffect(() => {\n            if (!formElementRef.current) {\n                return;\n            }\n\n            setTimeout(() => {\n                formElementRef.current?.scrollTo(0, 0);\n            }, 20);\n        }, [entry.id, formElementRef.current]);\n\n        if (model.isBeingDeleted) {\n            return <>Model is being deleted.</>;\n        }\n\n        return (\n            <ContentEntryFormProvider\n                model={model}\n                entry={entry}\n                onChange={onChange}\n                onInvalidFields={onInvalidFields}\n                onAfterCreate={onAfterCreate || defaultOnAfterCreate}\n                setSaveEntry={setSaveEntry}\n                confirmNavigationIfDirty={true}\n                persistEntry={persistEntry}\n            >\n                <ModelProvider model={model}>\n                    {header ? header : null}\n                    <div\n                        {...props}\n                        id={\"cms-content-form\"}\n                        data-element={\"cms-content-form\"}\n                        data-testid={\"cms-content-form\"}\n                        ref={formElementRef}\n                    >\n                        {formRenderer ? (\n                            <CustomLayout model={model} formRenderer={formRenderer} />\n                        ) : (\n                            <DefaultLayout model={model} />\n                        )}\n                    </div>\n                </ModelProvider>\n            </ContentEntryFormProvider>\n        );\n    }\n);\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAEhD,SAASC,eAAe,QAAQ,mBAAmB;AAEnD,SAASC,aAAa,EAAEC,QAAQ;AAChC,SAASC,eAAe;AAExB,SAASC,wBAAwB;AACjC,SAASC,YAAY;AACrB,SAASC,aAAa;AACtB,SAASC,eAAe;AAyBxB,OAAO,MAAMC,gBAAgB,GAAGR,eAAe,CAC3C,kBAAkB,EAClB,CAAC;EACGS,KAAK;EACLC,YAAY;EACZC,QAAQ;EACRC,eAAe;EACfC,aAAa;EACbC,YAAY;EACZC,MAAM,GAAG,IAAI;EACb,GAAGC;AACgB,CAAC,KAAK;EACzB,MAAMC,cAAc,GAAGlB,MAAM,CAAiB,IAAI,CAAC;EACnD,MAAM;IAAEmB;EAAM,CAAC,GAAGhB,QAAQ,CAAC,CAAC;EAC5B,MAAM;IAAEiB;EAAa,CAAC,GAAGZ,eAAe,CAAC,CAAC;EAC1C,MAAMa,YAAY,GAAGjB,eAAe,CAACe,KAAK,CAAC;EAE3C,MAAMG,oBAAoB,GAAIZ,KAAsB,IAAK;IACrDU,YAAY,CAACV,KAAK,CAACa,EAAE,CAAC;EAC1B,CAAC;;EAED;EACAxB,SAAS,CAAC,MAAM;IACZ,IAAI,CAACmB,cAAc,CAACM,OAAO,EAAE;MACzB;IACJ;IAEAC,UAAU,CAAC,MAAM;MACbP,cAAc,CAACM,OAAO,EAAEE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC;EACV,CAAC,EAAE,CAAChB,KAAK,CAACa,EAAE,EAAEL,cAAc,CAACM,OAAO,CAAC,CAAC;EAEtC,IAAIL,KAAK,CAACQ,cAAc,EAAE;IACtB,oBAAO7B,KAAA,CAAA8B,aAAA,CAAA9B,KAAA,CAAA+B,QAAA,QAAE,yBAAyB,CAAC;EACvC;EAEA,oBACI/B,KAAA,CAAA8B,aAAA,CAACvB,wBAAwB;IACrBc,KAAK,EAAEA,KAAM;IACbT,KAAK,EAAEA,KAAM;IACbE,QAAQ,EAAEA,QAAS;IACnBC,eAAe,EAAEA,eAAgB;IACjCC,aAAa,EAAEA,aAAa,IAAIQ,oBAAqB;IACrDP,YAAY,EAAEA,YAAa;IAC3Be,wBAAwB,EAAE,IAAK;IAC/BnB,YAAY,EAAEA;EAAa,gBAE3Bb,KAAA,CAAA8B,aAAA,CAAC1B,aAAa;IAACiB,KAAK,EAAEA;EAAM,GACvBH,MAAM,GAAGA,MAAM,GAAG,IAAI,eACvBlB,KAAA,CAAA8B,aAAA,QAAAG,MAAA,CAAAC,MAAA,KACQf,KAAK;IACTM,EAAE,EAAE,kBAAmB;IACvB,gBAAc,kBAAmB;IACjC,eAAa,kBAAmB;IAChCU,GAAG,EAAEf;EAAe,IAEnBG,YAAY,gBACTvB,KAAA,CAAA8B,aAAA,CAACtB,YAAY;IAACa,KAAK,EAAEA,KAAM;IAACE,YAAY,EAAEA;EAAa,CAAE,CAAC,gBAE1DvB,KAAA,CAAA8B,aAAA,CAACrB,aAAa;IAACY,KAAK,EAAEA;EAAM,CAAE,CAEjC,CACM,CACO,CAAC;AAEnC,CACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useRef","makeDecoratable","ModelProvider","useModel","useFormRenderer","ContentEntryFormProvider","CustomLayout","DefaultLayout","useGoToRevision","ContentEntryForm","entry","persistEntry","onChange","onInvalidFields","onAfterCreate","setSaveEntry","header","props","formElementRef","model","goToRevision","formRenderer","defaultOnAfterCreate","id","current","setTimeout","scrollTo","isBeingDeleted","createElement","Fragment","confirmNavigationIfDirty","Object","assign","ref"],"sources":["ContentEntryForm.tsx"],"sourcesContent":["import React, { useEffect, useRef } from \"react\";\nimport type { FormOnSubmit, FormValidation } from \"@webiny/form\";\nimport { makeDecoratable } from \"@webiny/app-admin\";\nimport type { CmsContentEntry } from \"~/types.js\";\nimport { ModelProvider, useModel } from \"~/admin/components/ModelProvider/index.js\";\nimport { useFormRenderer } from \"~/admin/components/ContentEntryForm/useFormRenderer.js\";\nimport type { ContentEntryFormContext, PersistEntry } from \"./ContentEntryFormProvider.js\";\nimport { ContentEntryFormProvider } from \"./ContentEntryFormProvider.js\";\nimport { CustomLayout } from \"./CustomLayout.js\";\nimport { DefaultLayout } from \"./DefaultLayout.js\";\nimport { useGoToRevision } from \"~/admin/components/ContentEntryForm/useGoToRevision.js\";\n\nexport interface ContentEntryFormProps\n    extends Omit<React.HTMLAttributes<HTMLDivElement>, \"onChange\"> {\n    entry: Partial<CmsContentEntry>;\n    /**\n     * This callback is executed when an entry, or a revision, are created.\n     * @param entry\n     */\n    onAfterCreate?: (entry: CmsContentEntry) => void;\n    /**\n     * This callback is executed when the form is valid, and it needs to persist the content entry.\n     */\n    persistEntry: PersistEntry;\n    onChange?: FormOnSubmit<Partial<CmsContentEntry>>;\n    onInvalidFields?: (invalidFields: FormValidation) => void;\n    header?: React.ReactNode;\n    /**\n     * This prop is used to get a reference to `saveEntry` callback, so it can be triggered by components\n     * outside the ContentEntryForm context.\n     * TODO: introduce a `layout` prop to be able to mount arbitrary components around the entry form, within the context.\n     */\n    setSaveEntry?: (cb: ContentEntryFormContext[\"saveEntry\"]) => void;\n}\n\nexport const ContentEntryForm = makeDecoratable(\n    \"ContentEntryForm\",\n    ({\n        entry,\n        persistEntry,\n        onChange,\n        onInvalidFields,\n        onAfterCreate,\n        setSaveEntry,\n        header = true,\n        ...props\n    }: ContentEntryFormProps) => {\n        const formElementRef = useRef<HTMLDivElement>(null);\n        const { model } = useModel();\n        const { goToRevision } = useGoToRevision();\n        const formRenderer = useFormRenderer(model);\n\n        const defaultOnAfterCreate = (entry: CmsContentEntry) => {\n            goToRevision(entry.id);\n        };\n\n        // When entry changes, scroll to the top of the form.\n        useEffect(() => {\n            if (!formElementRef.current) {\n                return;\n            }\n\n            setTimeout(() => {\n                formElementRef.current?.scrollTo(0, 0);\n            }, 20);\n        }, [entry.id, formElementRef.current]);\n\n        if (model.isBeingDeleted) {\n            return <>Model is being deleted.</>;\n        }\n\n        return (\n            <ContentEntryFormProvider\n                model={model}\n                entry={entry}\n                onChange={onChange}\n                onInvalidFields={onInvalidFields}\n                onAfterCreate={onAfterCreate || defaultOnAfterCreate}\n                setSaveEntry={setSaveEntry}\n                confirmNavigationIfDirty={true}\n                persistEntry={persistEntry}\n            >\n                <ModelProvider model={model}>\n                    {header ? header : null}\n                    <div\n                        {...props}\n                        id={\"cms-content-form\"}\n                        data-element={\"cms-content-form\"}\n                        data-testid={\"cms-content-form\"}\n                        ref={formElementRef}\n                    >\n                        {formRenderer ? (\n                            <CustomLayout model={model} formRenderer={formRenderer} />\n                        ) : (\n                            <DefaultLayout model={model} />\n                        )}\n                    </div>\n                </ModelProvider>\n            </ContentEntryFormProvider>\n        );\n    }\n);\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAEhD,SAASC,eAAe,QAAQ,mBAAmB;AAEnD,SAASC,aAAa,EAAEC,QAAQ;AAChC,SAASC,eAAe;AAExB,SAASC,wBAAwB;AACjC,SAASC,YAAY;AACrB,SAASC,aAAa;AACtB,SAASC,eAAe;AAyBxB,OAAO,MAAMC,gBAAgB,GAAGR,eAAe,CAC3C,kBAAkB,EAClB,CAAC;EACGS,KAAK;EACLC,YAAY;EACZC,QAAQ;EACRC,eAAe;EACfC,aAAa;EACbC,YAAY;EACZC,MAAM,GAAG,IAAI;EACb,GAAGC;AACgB,CAAC,KAAK;EACzB,MAAMC,cAAc,GAAGlB,MAAM,CAAiB,IAAI,CAAC;EACnD,MAAM;IAAEmB;EAAM,CAAC,GAAGhB,QAAQ,CAAC,CAAC;EAC5B,MAAM;IAAEiB;EAAa,CAAC,GAAGZ,eAAe,CAAC,CAAC;EAC1C,MAAMa,YAAY,GAAGjB,eAAe,CAACe,KAAK,CAAC;EAE3C,MAAMG,oBAAoB,GAAIZ,KAAsB,IAAK;IACrDU,YAAY,CAACV,KAAK,CAACa,EAAE,CAAC;EAC1B,CAAC;;EAED;EACAxB,SAAS,CAAC,MAAM;IACZ,IAAI,CAACmB,cAAc,CAACM,OAAO,EAAE;MACzB;IACJ;IAEAC,UAAU,CAAC,MAAM;MACbP,cAAc,CAACM,OAAO,EAAEE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC;EACV,CAAC,EAAE,CAAChB,KAAK,CAACa,EAAE,EAAEL,cAAc,CAACM,OAAO,CAAC,CAAC;EAEtC,IAAIL,KAAK,CAACQ,cAAc,EAAE;IACtB,oBAAO7B,KAAA,CAAA8B,aAAA,CAAA9B,KAAA,CAAA+B,QAAA,QAAE,yBAAyB,CAAC;EACvC;EAEA,oBACI/B,KAAA,CAAA8B,aAAA,CAACvB,wBAAwB;IACrBc,KAAK,EAAEA,KAAM;IACbT,KAAK,EAAEA,KAAM;IACbE,QAAQ,EAAEA,QAAS;IACnBC,eAAe,EAAEA,eAAgB;IACjCC,aAAa,EAAEA,aAAa,IAAIQ,oBAAqB;IACrDP,YAAY,EAAEA,YAAa;IAC3Be,wBAAwB,EAAE,IAAK;IAC/BnB,YAAY,EAAEA;EAAa,gBAE3Bb,KAAA,CAAA8B,aAAA,CAAC1B,aAAa;IAACiB,KAAK,EAAEA;EAAM,GACvBH,MAAM,GAAGA,MAAM,GAAG,IAAI,eACvBlB,KAAA,CAAA8B,aAAA,QAAAG,MAAA,CAAAC,MAAA,KACQf,KAAK;IACTM,EAAE,EAAE,kBAAmB;IACvB,gBAAc,kBAAmB;IACjC,eAAa,kBAAmB;IAChCU,GAAG,EAAEf;EAAe,IAEnBG,YAAY,gBACTvB,KAAA,CAAA8B,aAAA,CAACtB,YAAY;IAACa,KAAK,EAAEA,KAAM;IAACE,YAAY,EAAEA;EAAa,CAAE,CAAC,gBAE1DvB,KAAA,CAAA8B,aAAA,CAACrB,aAAa;IAACY,KAAK,EAAEA;EAAM,CAAE,CAEjC,CACM,CACO,CAAC;AAEnC,CACJ,CAAC","ignoreList":[]}

package/admin/components/ContentEntryForm/ContentEntryFormPreview.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { CmsEditorContentModel } from "../../../types";
+import type { CmsEditorContentModel } from "../../../types.js";
 export interface ContentEntryFormPreviewProps {
     contentModel: CmsEditorContentModel;
 }

package/admin/components/ContentEntryForm/ContentEntryFormPreview.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { makeDecoratable } from "@webiny/app-admin";
-import { ModelProvider } from "../ModelProvider";
-import { useFormRenderer } from "./useFormRenderer";
-import { CustomLayout } from "./CustomLayout";
-import { DefaultLayout } from "./DefaultLayout";
-import { ContentEntryFormProvider } from "./ContentEntryFormProvider";
+import { ModelProvider } from "../ModelProvider/index.js";
+import { useFormRenderer } from "./useFormRenderer.js";
+import { CustomLayout } from "./CustomLayout.js";
+import { DefaultLayout } from "./DefaultLayout.js";
+import { ContentEntryFormProvider } from "./ContentEntryFormProvider.js";
 export const ContentEntryFormPreview = makeDecoratable("ContentEntryFormPreview", props => {
   const {
     contentModel
@@ -13,14 +13,16 @@ export const ContentEntryFormPreview = makeDecoratable("ContentEntryFormPreview"
   return /*#__PURE__*/React.createElement(ContentEntryFormProvider, {
     entry: {},
     model: contentModel,
-    persistEntry: entry => Promise.resolve({
-      entry
-    }),
+    persistEntry: async entry => {
+      return {
+        entry: entry
+      };
+    },
     confirmNavigationIfDirty: false
   }, /*#__PURE__*/React.createElement(ModelProvider, {
     model: contentModel
   }, /*#__PURE__*/React.createElement("div", {
-    className: "wby-h-calc(100vh-260px) wby-overflow-auto",
+    className: "h-calc(100vh-260px) overflow-auto",
     "data-testid": "cms-content-form"
   }, formRenderer ? /*#__PURE__*/React.createElement(CustomLayout, {
     model: contentModel,

package/admin/components/ContentEntryForm/ContentEntryFormPreview.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","makeDecoratable","ModelProvider","useFormRenderer","CustomLayout","DefaultLayout","ContentEntryFormProvider","ContentEntryFormPreview","props","contentModel","formRenderer","createElement","entry","model","persistEntry","Promise","resolve","confirmNavigationIfDirty","className"],"sources":["ContentEntryFormPreview.tsx"],"sourcesContent":["import React from \"react\";\nimport { makeDecoratable } from \"@webiny/app-admin\";\nimport type { CmsContentEntry, CmsEditorContentModel } from \"~/types\";\nimport { ModelProvider } from \"~/admin/components/ModelProvider\";\nimport { useFormRenderer } from \"~/admin/components/ContentEntryForm/useFormRenderer\";\nimport { CustomLayout } from \"~/admin/components/ContentEntryForm/CustomLayout\";\nimport { DefaultLayout } from \"~/admin/components/ContentEntryForm/DefaultLayout\";\nimport { ContentEntryFormProvider } from \"./ContentEntryFormProvider\";\n\nexport interface ContentEntryFormPreviewProps {\n    contentModel: CmsEditorContentModel;\n}\n\nexport const ContentEntryFormPreview = makeDecoratable(\n    \"ContentEntryFormPreview\",\n    (props: ContentEntryFormPreviewProps) => {\n        const { contentModel } = props;\n\n        const formRenderer = useFormRenderer(contentModel);\n\n        return (\n            <ContentEntryFormProvider\n                entry={{}}\n                model={contentModel}\n                persistEntry={entry => Promise.resolve({ entry } as { entry: CmsContentEntry })}\n                confirmNavigationIfDirty={false}\n            >\n                <ModelProvider model={contentModel}>\n                    <div\n                        className={\"wby-h-calc(100vh-260px) wby-overflow-auto\"}\n                        data-testid={\"cms-content-form\"}\n                    >\n                        {formRenderer ? (\n                            <CustomLayout model={contentModel} formRenderer={formRenderer} />\n                        ) : (\n                            <DefaultLayout model={contentModel} />\n                        )}\n                    </div>\n                </ModelProvider>\n            </ContentEntryFormProvider>\n        );\n    }\n);\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,eAAe,QAAQ,mBAAmB;AAEnD,SAASC,aAAa;AACtB,SAASC,eAAe;AACxB,SAASC,YAAY;AACrB,SAASC,aAAa;AACtB,SAASC,wBAAwB;AAMjC,OAAO,MAAMC,uBAAuB,GAAGN,eAAe,CAClD,yBAAyB,EACxBO,KAAmC,IAAK;EACrC,MAAM;IAAEC;EAAa,CAAC,GAAGD,KAAK;EAE9B,MAAME,YAAY,GAAGP,eAAe,CAACM,YAAY,CAAC;EAElD,oBACIT,KAAA,CAAAW,aAAA,CAACL,wBAAwB;IACrBM,KAAK,EAAE,CAAC,CAAE;IACVC,KAAK,EAAEJ,YAAa;IACpBK,YAAY,EAAEF,KAAK,IAAIG,OAAO,CAACC,OAAO,CAAC;MAAEJ;IAAM,CAA+B,CAAE;IAChFK,wBAAwB,EAAE;EAAM,gBAEhCjB,KAAA,CAAAW,aAAA,CAACT,aAAa;IAACW,KAAK,EAAEJ;EAAa,gBAC/BT,KAAA,CAAAW,aAAA;IACIO,SAAS,EAAE,2CAA4C;IACvD,eAAa;EAAmB,GAE/BR,YAAY,gBACTV,KAAA,CAAAW,aAAA,CAACP,YAAY;IAACS,KAAK,EAAEJ,YAAa;IAACC,YAAY,EAAEA;EAAa,CAAE,CAAC,gBAEjEV,KAAA,CAAAW,aAAA,CAACN,aAAa;IAACQ,KAAK,EAAEJ;EAAa,CAAE,CAExC,CACM,CACO,CAAC;AAEnC,CACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["React","makeDecoratable","ModelProvider","useFormRenderer","CustomLayout","DefaultLayout","ContentEntryFormProvider","ContentEntryFormPreview","props","contentModel","formRenderer","createElement","entry","model","persistEntry","confirmNavigationIfDirty","className"],"sources":["ContentEntryFormPreview.tsx"],"sourcesContent":["import React from \"react\";\nimport { makeDecoratable } from \"@webiny/app-admin\";\nimport type { CmsContentEntry, CmsEditorContentModel } from \"~/types.js\";\nimport { ModelProvider } from \"~/admin/components/ModelProvider/index.js\";\nimport { useFormRenderer } from \"~/admin/components/ContentEntryForm/useFormRenderer.js\";\nimport { CustomLayout } from \"~/admin/components/ContentEntryForm/CustomLayout.js\";\nimport { DefaultLayout } from \"~/admin/components/ContentEntryForm/DefaultLayout.js\";\nimport { ContentEntryFormProvider } from \"./ContentEntryFormProvider.js\";\n\nexport interface ContentEntryFormPreviewProps {\n    contentModel: CmsEditorContentModel;\n}\n\nexport const ContentEntryFormPreview = makeDecoratable(\n    \"ContentEntryFormPreview\",\n    (props: ContentEntryFormPreviewProps) => {\n        const { contentModel } = props;\n\n        const formRenderer = useFormRenderer(contentModel);\n\n        return (\n            <ContentEntryFormProvider\n                entry={{}}\n                model={contentModel}\n                persistEntry={async entry => {\n                    return {\n                        entry: entry as CmsContentEntry\n                    };\n                }}\n                confirmNavigationIfDirty={false}\n            >\n                <ModelProvider model={contentModel}>\n                    <div\n                        className={\"h-calc(100vh-260px) overflow-auto\"}\n                        data-testid={\"cms-content-form\"}\n                    >\n                        {formRenderer ? (\n                            <CustomLayout model={contentModel} formRenderer={formRenderer} />\n                        ) : (\n                            <DefaultLayout model={contentModel} />\n                        )}\n                    </div>\n                </ModelProvider>\n            </ContentEntryFormProvider>\n        );\n    }\n);\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,eAAe,QAAQ,mBAAmB;AAEnD,SAASC,aAAa;AACtB,SAASC,eAAe;AACxB,SAASC,YAAY;AACrB,SAASC,aAAa;AACtB,SAASC,wBAAwB;AAMjC,OAAO,MAAMC,uBAAuB,GAAGN,eAAe,CAClD,yBAAyB,EACxBO,KAAmC,IAAK;EACrC,MAAM;IAAEC;EAAa,CAAC,GAAGD,KAAK;EAE9B,MAAME,YAAY,GAAGP,eAAe,CAACM,YAAY,CAAC;EAElD,oBACIT,KAAA,CAAAW,aAAA,CAACL,wBAAwB;IACrBM,KAAK,EAAE,CAAC,CAAE;IACVC,KAAK,EAAEJ,YAAa;IACpBK,YAAY,EAAE,MAAMF,KAAK,IAAI;MACzB,OAAO;QACHA,KAAK,EAAEA;MACX,CAAC;IACL,CAAE;IACFG,wBAAwB,EAAE;EAAM,gBAEhCf,KAAA,CAAAW,aAAA,CAACT,aAAa;IAACW,KAAK,EAAEJ;EAAa,gBAC/BT,KAAA,CAAAW,aAAA;IACIK,SAAS,EAAE,mCAAoC;IAC/C,eAAa;EAAmB,GAE/BN,YAAY,gBACTV,KAAA,CAAAW,aAAA,CAACP,YAAY;IAACS,KAAK,EAAEJ,YAAa;IAACC,YAAY,EAAEA;EAAa,CAAE,CAAC,gBAEjEV,KAAA,CAAAW,aAAA,CAACN,aAAa;IAACQ,KAAK,EAAEJ;EAAa,CAAE,CAExC,CACM,CACO,CAAC;AAEnC,CACJ,CAAC","ignoreList":[]}

package/admin/components/ContentEntryForm/ContentEntryFormProvider.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
-import type { FormOnSubmit, FormValidation, FormInvalidFields } from "@webiny/form";
-import type { CmsContentEntry, CmsModel } from "@webiny/app-headless-cms-common/types";
-import type { CreateEntryResponse, UpdateEntryRevisionResponse } from "../../contexts/Cms";
+import type { FormInvalidFields, FormOnSubmit, FormValidation } from "@webiny/form";
+import type { CmsContentEntry, CmsModel } from "@webiny/app-headless-cms-common/types/index.js";
+import type { CreateEntryResponse, UpdateEntryRevisionResponse } from "../../../admin/contexts/Cms/index.js";
 interface SaveEntryOptions {
     skipValidators?: string[];
     createNewRevision?: boolean;
@@ -29,5 +29,5 @@ interface ContentEntryFormProviderProps {
     setSaveEntry?: SetSaveEntry;
     children: React.ReactNode;
 }
-export declare const ContentEntryFormProvider: ({ model, entry, children, persistEntry, onChange, onInvalidFields, onAfterCreate, setSaveEntry, confirmNavigationIfDirty }: ContentEntryFormProviderProps) => React.JSX.Element;
+export declare const ContentEntryFormProvider: ({ model, entry: initialEntry, children, persistEntry, onChange, onInvalidFields, onAfterCreate, setSaveEntry, confirmNavigationIfDirty }: ContentEntryFormProviderProps) => React.JSX.Element;
 export {};

package/admin/components/ContentEntryForm/ContentEntryFormProvider.js

@@ -1,9 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from "react";
-import pick from "lodash/pick";
-import { Prompt } from "@webiny/react-router";
+import { CompositionScope, NavigationPrompt, useSnackbar } from "@webiny/app-admin";
 import { Form } from "@webiny/form";
 import { prepareFormData } from "@webiny/app-headless-cms-common";
-import { CompositionScope, useSnackbar } from "@webiny/app-admin";
 const promptMessage = "There are some unsaved changes! Are you sure you want to navigate away and discard all changes?";
 export const ContentEntryFormContext = /*#__PURE__*/React.createContext(undefined);
 const formValidationToMap = invalidFields => {
@@ -14,7 +12,7 @@ const formValidationToMap = invalidFields => {
 };
 export const ContentEntryFormProvider = ({
   model,
-  entry,
+  entry: initialEntry,
   children,
   persistEntry,
   onChange,
@@ -24,6 +22,7 @@ export const ContentEntryFormProvider = ({
   confirmNavigationIfDirty
 }) => {
   const ref = useRef(null);
+  const onAfterSubmitRef = useRef(() => void 0);
   const [invalidFields, setInvalidFields] = useState({});
   const {
     showSnackbar
@@ -33,24 +32,22 @@ export const ContentEntryFormProvider = ({
   });
   const saveEntry = useCallback(async (options = {}) => {
     saveOptionsRef.current.skipValidators = options.skipValidators;
-    return ref.current.submit(undefined, {
+    return await ref.current.submit(undefined, {
       skipValidators: options.skipValidators
     });
   }, []);
   const onFormSubmit = async data => {
-    const fieldsIds = model.fields.map(item => item.fieldId);
-    const formData = pick(data, [...fieldsIds]);
-    const gqlData = prepareFormData(formData, model.fields);
-    const isNewEntry = data.id === undefined;
+    const values = prepareFormData(data, model.fields);
+    const isNewEntry = initialEntry.id === undefined;
     const {
       entry,
       error
     } = await persistEntry({
-      id: data.id,
-      ...gqlData
+      id: initialEntry.id,
+      values
     }, {
       skipValidators: saveOptionsRef.current.skipValidators,
-      createNewRevision: data.meta?.locked
+      createNewRevision: initialEntry.meta?.locked
     });
     if (error) {
       if (error.code === "VALIDATION_FAILED") {
@@ -65,15 +62,9 @@ export const ContentEntryFormProvider = ({
     }
     showSnackbar("Entry saved successfully!");
     setInvalidFields({});
-    const isNewRevision = !isNewEntry && data.id !== entry.id;
+    const isNewRevision = !isNewEntry && entry.id !== initialEntry.id;
     if ((isNewEntry || isNewRevision) && onAfterCreate) {
-      // We need a timeout to let the Prompt component update.
-      await new Promise(resolve => {
-        setTimeout(() => {
-          onAfterCreate(entry);
-          resolve();
-        }, 50);
-      });
+      onAfterSubmitRef.current = onAfterCreate;
     }
     return entry;
   };
@@ -84,8 +75,11 @@ export const ContentEntryFormProvider = ({
   }, [setSaveEntry]);
   return /*#__PURE__*/React.createElement(Form, {
     onSubmit: onFormSubmit,
+    onAfterSubmit: data => {
+      onAfterSubmitRef.current(data);
+    },
     onChange: onChange,
-    data: entry,
+    data: initialEntry.values,
     ref: ref,
     validateOnFirstSubmit: true,
     invalidFields: invalidFields,
@@ -96,7 +90,10 @@ export const ContentEntryFormProvider = ({
     }
   }, formProps => {
     const context = {
-      entry: formProps.data,
+      entry: {
+        ...initialEntry,
+        values: formProps.data
+      },
       saveEntry,
       invalidFields
     };
@@ -104,8 +101,8 @@ export const ContentEntryFormProvider = ({
       value: context
     }, confirmNavigationIfDirty ? /*#__PURE__*/React.createElement(CompositionScope, {
       name: "cms.contentEntryForm"
-    }, /*#__PURE__*/React.createElement(Prompt, {
-      when: !formProps.form.isPristine,
+    }, /*#__PURE__*/React.createElement(NavigationPrompt, {
+      when: () => !formProps.form.isPristine,
       message: promptMessage
     })) : null, children);
   });

package/admin/components/ContentEntryForm/ContentEntryFormProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useEffect","useRef","useState","pick","Prompt","Form","prepareFormData","CompositionScope","useSnackbar","promptMessage","ContentEntryFormContext","createContext","undefined","formValidationToMap","invalidFields","Object","keys","reduce","acc","key","message","ContentEntryFormProvider","model","entry","children","persistEntry","onChange","onInvalidFields","onAfterCreate","setSaveEntry","confirmNavigationIfDirty","ref","setInvalidFields","showSnackbar","saveOptionsRef","skipValidators","saveEntry","options","current","submit","onFormSubmit","data","fieldsIds","fields","map","item","fieldId","formData","gqlData","isNewEntry","id","error","createNewRevision","meta","locked","code","errors","isNewRevision","Promise","resolve","setTimeout","createElement","onSubmit","validateOnFirstSubmit","onInvalid","formProps","context","Provider","value","name","when","form","isPristine"],"sources":["ContentEntryFormProvider.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useRef, useState } from \"react\";\nimport pick from \"lodash/pick\";\nimport { Prompt } from \"@webiny/react-router\";\nimport { Form } from \"@webiny/form\";\nimport { prepareFormData } from \"@webiny/app-headless-cms-common\";\nimport type { FormAPI, FormOnSubmit, FormValidation, FormInvalidFields } from \"@webiny/form\";\nimport type { CmsContentEntry, CmsModel } from \"@webiny/app-headless-cms-common/types\";\nimport { CompositionScope, useSnackbar } from \"@webiny/app-admin\";\nimport type { CreateEntryResponse, UpdateEntryRevisionResponse } from \"~/admin/contexts/Cms\";\n\nconst promptMessage =\n    \"There are some unsaved changes! Are you sure you want to navigate away and discard all changes?\";\n\ninterface SaveEntryOptions {\n    skipValidators?: string[];\n    createNewRevision?: boolean;\n}\n\nexport interface ContentEntryFormContext {\n    entry: Partial<CmsContentEntry>;\n    saveEntry: (options?: SaveEntryOptions) => Promise<CmsContentEntry | null>;\n    invalidFields: FormInvalidFields;\n}\n\nexport const ContentEntryFormContext = React.createContext<ContentEntryFormContext | undefined>(\n    undefined\n);\n\nexport interface SetSaveEntry {\n    (cb: ContentEntryFormContext[\"saveEntry\"]): void;\n}\n\nexport interface PersistEntry {\n    (entry: Partial<CmsContentEntry>, options?: SaveEntryOptions): Promise<\n        CreateEntryResponse | UpdateEntryRevisionResponse\n    >;\n}\n\ninterface ContentEntryFormProviderProps {\n    entry: Partial<CmsContentEntry>;\n    model: CmsModel;\n    persistEntry: PersistEntry;\n    confirmNavigationIfDirty: boolean;\n    onChange?: FormOnSubmit<Partial<CmsContentEntry>>;\n    onInvalidFields?: (invalidFields: FormValidation) => void;\n    onAfterCreate?: (entry: CmsContentEntry) => void;\n    setSaveEntry?: SetSaveEntry;\n    children: React.ReactNode;\n}\n\ninterface InvalidFieldError {\n    fieldId: string;\n    error: string;\n}\n\nconst formValidationToMap = (invalidFields: FormValidation): FormInvalidFields => {\n    return Object.keys(invalidFields).reduce(\n        (acc, key) => ({ ...acc, [key]: invalidFields[key].message || \"Value is invalid.\" }),\n        {} as FormInvalidFields\n    );\n};\n\nexport const ContentEntryFormProvider = ({\n    model,\n    entry,\n    children,\n    persistEntry,\n    onChange,\n    onInvalidFields,\n    onAfterCreate,\n    setSaveEntry,\n    confirmNavigationIfDirty\n}: ContentEntryFormProviderProps) => {\n    const ref = useRef<FormAPI<CmsContentEntry> | null>(null);\n    const [invalidFields, setInvalidFields] = useState<FormInvalidFields>({});\n    const { showSnackbar } = useSnackbar();\n    const saveOptionsRef = useRef<SaveEntryOptions>({ skipValidators: undefined });\n\n    const saveEntry = useCallback(async (options: SaveEntryOptions = {}) => {\n        saveOptionsRef.current.skipValidators = options.skipValidators;\n\n        return ref.current!.submit(undefined, {\n            skipValidators: options.skipValidators\n        }) as unknown as Promise<CmsContentEntry | null>;\n    }, []);\n\n    const onFormSubmit: FormOnSubmit<CmsContentEntry> = async data => {\n        const fieldsIds = model.fields.map(item => item.fieldId);\n        const formData = pick(data, [...fieldsIds]);\n\n        const gqlData = prepareFormData(formData, model.fields) as Partial<CmsContentEntry>;\n        const isNewEntry = data.id === undefined;\n\n        const { entry, error } = await persistEntry(\n            { id: data.id, ...gqlData },\n            {\n                skipValidators: saveOptionsRef.current.skipValidators,\n                createNewRevision: data.meta?.locked\n            }\n        );\n\n        if (error) {\n            if (error.code === \"VALIDATION_FAILED\") {\n                const errors: InvalidFieldError[] = error.data || [];\n\n                setInvalidFields(\n                    errors.reduce((acc, item) => ({ ...acc, [item.fieldId]: item.error }), {})\n                );\n            }\n            showSnackbar(error.message);\n\n            return;\n        }\n\n        showSnackbar(\"Entry saved successfully!\");\n        setInvalidFields({});\n\n        const isNewRevision = !isNewEntry && data.id !== entry.id;\n\n        if ((isNewEntry || isNewRevision) && onAfterCreate) {\n            // We need a timeout to let the Prompt component update.\n            await new Promise<void>(resolve => {\n                setTimeout(() => {\n                    onAfterCreate(entry);\n                    resolve();\n                }, 50);\n            });\n        }\n\n        return entry;\n    };\n\n    useEffect(() => {\n        if (typeof setSaveEntry === \"function\") {\n            setSaveEntry(saveEntry);\n        }\n    }, [setSaveEntry]);\n\n    return (\n        <Form<CmsContentEntry>\n            onSubmit={onFormSubmit}\n            onChange={onChange}\n            data={entry}\n            ref={ref}\n            validateOnFirstSubmit\n            invalidFields={invalidFields}\n            onInvalid={invalidFields => {\n                setInvalidFields(formValidationToMap(invalidFields));\n                onInvalidFields && onInvalidFields(invalidFields);\n                showSnackbar(\"Some fields did not pass the validation. Please check the form.\");\n            }}\n        >\n            {formProps => {\n                const context: ContentEntryFormContext = {\n                    entry: formProps.data,\n                    saveEntry,\n                    invalidFields\n                };\n                return (\n                    <ContentEntryFormContext.Provider value={context}>\n                        {confirmNavigationIfDirty ? (\n                            <CompositionScope name={\"cms.contentEntryForm\"}>\n                                <Prompt when={!formProps.form.isPristine} message={promptMessage} />\n                            </CompositionScope>\n                        ) : null}\n                        {children}\n                    </ContentEntryFormContext.Provider>\n                );\n            }}\n        </Form>\n    );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useEffect","useRef","useState","CompositionScope","NavigationPrompt","useSnackbar","Form","prepareFormData","promptMessage","ContentEntryFormContext","createContext","undefined","formValidationToMap","invalidFields","Object","keys","reduce","acc","key","message","ContentEntryFormProvider","model","entry","initialEntry","children","persistEntry","onChange","onInvalidFields","onAfterCreate","setSaveEntry","confirmNavigationIfDirty","ref","onAfterSubmitRef","setInvalidFields","showSnackbar","saveOptionsRef","skipValidators","saveEntry","options","current","submit","onFormSubmit","data","values","fields","isNewEntry","id","error","createNewRevision","meta","locked","code","errors","item","fieldId","isNewRevision","createElement","onSubmit","onAfterSubmit","validateOnFirstSubmit","onInvalid","formProps","context","Provider","value","name","when","form","isPristine"],"sources":["ContentEntryFormProvider.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useRef, useState } from \"react\";\nimport { CompositionScope, NavigationPrompt, useSnackbar } from \"@webiny/app-admin\";\nimport type { FormAPI, FormInvalidFields, FormOnSubmit, FormValidation } from \"@webiny/form\";\nimport { Form } from \"@webiny/form\";\nimport { prepareFormData } from \"@webiny/app-headless-cms-common\";\nimport type { CmsContentEntry, CmsModel } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport type {\n    CreateEntryResponse,\n    UpdateEntryRevisionResponse\n} from \"~/admin/contexts/Cms/index.js\";\nimport type { GenericRecord } from \"@webiny/app/types.js\";\n\nconst promptMessage =\n    \"There are some unsaved changes! Are you sure you want to navigate away and discard all changes?\";\n\ninterface SaveEntryOptions {\n    skipValidators?: string[];\n    createNewRevision?: boolean;\n}\n\nexport interface ContentEntryFormContext {\n    entry: Partial<CmsContentEntry>;\n    saveEntry: (options?: SaveEntryOptions) => Promise<CmsContentEntry | null>;\n    invalidFields: FormInvalidFields;\n}\n\nexport const ContentEntryFormContext = React.createContext<ContentEntryFormContext | undefined>(\n    undefined\n);\n\nexport interface SetSaveEntry {\n    (cb: ContentEntryFormContext[\"saveEntry\"]): void;\n}\n\nexport interface PersistEntry {\n    (\n        entry: Partial<CmsContentEntry>,\n        options?: SaveEntryOptions\n    ): Promise<CreateEntryResponse | UpdateEntryRevisionResponse>;\n}\n\ninterface ContentEntryFormProviderProps {\n    entry: Partial<CmsContentEntry>;\n    model: CmsModel;\n    persistEntry: PersistEntry;\n    confirmNavigationIfDirty: boolean;\n    onChange?: FormOnSubmit<Partial<CmsContentEntry>>;\n    onInvalidFields?: (invalidFields: FormValidation) => void;\n    onAfterCreate?: (entry: CmsContentEntry) => void;\n    setSaveEntry?: SetSaveEntry;\n    children: React.ReactNode;\n}\n\ninterface InvalidFieldError {\n    fieldId: string;\n    error: string;\n}\n\nconst formValidationToMap = (invalidFields: FormValidation): FormInvalidFields => {\n    return Object.keys(invalidFields).reduce(\n        (acc, key) => ({ ...acc, [key]: invalidFields[key].message || \"Value is invalid.\" }),\n        {} as FormInvalidFields\n    );\n};\n\nexport const ContentEntryFormProvider = ({\n    model,\n    entry: initialEntry,\n    children,\n    persistEntry,\n    onChange,\n    onInvalidFields,\n    onAfterCreate,\n    setSaveEntry,\n    confirmNavigationIfDirty\n}: ContentEntryFormProviderProps) => {\n    const ref = useRef<FormAPI<CmsContentEntry> | null>(null);\n    const onAfterSubmitRef = useRef<(entry: CmsContentEntry) => void>(() => void 0);\n    const [invalidFields, setInvalidFields] = useState<FormInvalidFields>({});\n    const { showSnackbar } = useSnackbar();\n    const saveOptionsRef = useRef<SaveEntryOptions>({ skipValidators: undefined });\n\n    const saveEntry = useCallback(async (options: SaveEntryOptions = {}) => {\n        saveOptionsRef.current.skipValidators = options.skipValidators;\n\n        return (await ref.current!.submit(undefined, {\n            skipValidators: options.skipValidators\n        })) as Promise<CmsContentEntry | null>;\n    }, []);\n\n    const onFormSubmit: FormOnSubmit<CmsContentEntry> = async data => {\n        const values = prepareFormData<GenericRecord>(data, model.fields);\n        const isNewEntry = initialEntry.id === undefined;\n\n        const { entry, error } = await persistEntry(\n            {\n                id: initialEntry.id,\n                values\n            },\n            {\n                skipValidators: saveOptionsRef.current.skipValidators,\n                createNewRevision: initialEntry.meta?.locked\n            }\n        );\n\n        if (error) {\n            if (error.code === \"VALIDATION_FAILED\") {\n                const errors: InvalidFieldError[] = error.data || [];\n\n                setInvalidFields(\n                    errors.reduce((acc, item) => ({ ...acc, [item.fieldId]: item.error }), {})\n                );\n            }\n            showSnackbar(error.message);\n\n            return;\n        }\n\n        showSnackbar(\"Entry saved successfully!\");\n        setInvalidFields({});\n\n        const isNewRevision = !isNewEntry && entry.id !== initialEntry.id;\n\n        if ((isNewEntry || isNewRevision) && onAfterCreate) {\n            onAfterSubmitRef.current = onAfterCreate;\n        }\n\n        return entry;\n    };\n\n    useEffect(() => {\n        if (typeof setSaveEntry === \"function\") {\n            setSaveEntry(saveEntry);\n        }\n    }, [setSaveEntry]);\n\n    return (\n        <Form<CmsContentEntry>\n            onSubmit={onFormSubmit}\n            onAfterSubmit={data => {\n                onAfterSubmitRef.current(data);\n            }}\n            onChange={onChange}\n            data={initialEntry.values}\n            ref={ref}\n            validateOnFirstSubmit\n            invalidFields={invalidFields}\n            onInvalid={invalidFields => {\n                setInvalidFields(formValidationToMap(invalidFields));\n                onInvalidFields && onInvalidFields(invalidFields);\n                showSnackbar(\"Some fields did not pass the validation. Please check the form.\");\n            }}\n        >\n            {formProps => {\n                const context: ContentEntryFormContext = {\n                    entry: { ...initialEntry, values: formProps.data },\n                    saveEntry,\n                    invalidFields\n                };\n                return (\n                    <ContentEntryFormContext.Provider value={context}>\n                        {confirmNavigationIfDirty ? (\n                            <CompositionScope name={\"cms.contentEntryForm\"}>\n                                <NavigationPrompt\n                                    when={() => !formProps.form.isPristine}\n                                    message={promptMessage}\n                                />\n                            </CompositionScope>\n                        ) : null}\n                        {children}\n                    </ContentEntryFormContext.Provider>\n                );\n            }}\n        </Form>\n    );\n};\n"],"mappings":"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","ignoreList":[]}

package/admin/components/ContentEntryForm/CustomLayout.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { CmsContentFormRendererPlugin, CmsModel } from "@webiny/app-headless-cms-common/types";
+import type { CmsContentFormRendererPlugin, CmsModel } from "@webiny/app-headless-cms-common/types/index.js";
 interface CustomLayoutProps {
     model: CmsModel;
     formRenderer: CmsContentFormRendererPlugin;

package/admin/components/ContentEntryForm/CustomLayout.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { Bind, useForm } from "@webiny/form";
-import { FieldElement } from "./FieldElement";
+import { FieldElement } from "./FieldElement.js";
 export const CustomLayout = ({
   model,
   formRenderer

package/admin/components/ContentEntryForm/CustomLayout.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Bind","useForm","FieldElement","CustomLayout","model","formRenderer","data","fields","reduce","acc","field","fieldId","createElement","contentModel","Fragment","render"],"sources":["CustomLayout.tsx"],"sourcesContent":["import React from \"react\";\nimport { Bind, useForm } from \"@webiny/form\";\nimport type { CmsContentFormRendererPlugin, CmsModel } from \"@webiny/app-headless-cms-common/types\";\nimport { FieldElement } from \"~/admin/components/ContentEntryForm/FieldElement\";\n\ninterface CustomLayoutProps {\n    model: CmsModel;\n    formRenderer: CmsContentFormRendererPlugin;\n}\n\nexport const CustomLayout = ({ model, formRenderer }: CustomLayoutProps) => {\n    const { data } = useForm();\n\n    const fields = model.fields.reduce((acc, field) => {\n        acc[field.fieldId] = (\n            <FieldElement\n                field={field}\n                /**\n                 * TODO @ts-refactor\n                 * Figure out type for Bind.\n                 */\n                // @ts-expect-error\n                Bind={Bind}\n                contentModel={model}\n            />\n        );\n\n        return acc;\n    }, {} as Record<string, React.ReactElement>);\n\n    return (\n        <>\n            {formRenderer.render({\n                data,\n                contentModel: model,\n                fields,\n                /**\n                 * TODO @ts-refactor\n                 * Figure out type for Bind.\n                 */\n                // @ts-expect-error\n                Bind\n            })}\n        </>\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,OAAO,QAAQ,cAAc;AAE5C,SAASC,YAAY;AAOrB,OAAO,MAAMC,YAAY,GAAGA,CAAC;EAAEC,KAAK;EAAEC;AAAgC,CAAC,KAAK;EACxE,MAAM;IAAEC;EAAK,CAAC,GAAGL,OAAO,CAAC,CAAC;EAE1B,MAAMM,MAAM,GAAGH,KAAK,CAACG,MAAM,CAACC,MAAM,CAAC,CAACC,GAAG,EAAEC,KAAK,KAAK;IAC/CD,GAAG,CAACC,KAAK,CAACC,OAAO,CAAC,gBACdZ,KAAA,CAAAa,aAAA,CAACV,YAAY;MACTQ,KAAK,EAAEA;MACP;AAChB;AACA;AACA;MACgB;MAAA;MACAV,IAAI,EAAEA,IAAK;MACXa,YAAY,EAAET;IAAM,CACvB,CACJ;IAED,OAAOK,GAAG;EACd,CAAC,EAAE,CAAC,CAAuC,CAAC;EAE5C,oBACIV,KAAA,CAAAa,aAAA,CAAAb,KAAA,CAAAe,QAAA,QACKT,YAAY,CAACU,MAAM,CAAC;IACjBT,IAAI;IACJO,YAAY,EAAET,KAAK;IACnBG,MAAM;IACN;AAChB;AACA;AACA;IACgB;IACAP;EACJ,CAAC,CACH,CAAC;AAEX,CAAC","ignoreList":[]}
+{"version":3,"names":["React","Bind","useForm","FieldElement","CustomLayout","model","formRenderer","data","fields","reduce","acc","field","fieldId","createElement","contentModel","Fragment","render"],"sources":["CustomLayout.tsx"],"sourcesContent":["import React from \"react\";\nimport { Bind, useForm } from \"@webiny/form\";\nimport type {\n    CmsContentFormRendererPlugin,\n    CmsModel\n} from \"@webiny/app-headless-cms-common/types/index.js\";\nimport { FieldElement } from \"~/admin/components/ContentEntryForm/FieldElement.js\";\n\ninterface CustomLayoutProps {\n    model: CmsModel;\n    formRenderer: CmsContentFormRendererPlugin;\n}\n\nexport const CustomLayout = ({ model, formRenderer }: CustomLayoutProps) => {\n    const { data } = useForm();\n\n    const fields = model.fields.reduce(\n        (acc, field) => {\n            acc[field.fieldId] = (\n                <FieldElement\n                    field={field}\n                    /**\n                     * TODO @ts-refactor\n                     * Figure out type for Bind.\n                     */\n                    // @ts-expect-error\n                    Bind={Bind}\n                    contentModel={model}\n                />\n            );\n\n            return acc;\n        },\n        {} as Record<string, React.ReactElement>\n    );\n\n    return (\n        <>\n            {formRenderer.render({\n                data,\n                contentModel: model,\n                fields,\n                /**\n                 * TODO @ts-refactor\n                 * Figure out type for Bind.\n                 */\n                // @ts-expect-error\n                Bind\n            })}\n        </>\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,EAAEC,OAAO,QAAQ,cAAc;AAK5C,SAASC,YAAY;AAOrB,OAAO,MAAMC,YAAY,GAAGA,CAAC;EAAEC,KAAK;EAAEC;AAAgC,CAAC,KAAK;EACxE,MAAM;IAAEC;EAAK,CAAC,GAAGL,OAAO,CAAC,CAAC;EAE1B,MAAMM,MAAM,GAAGH,KAAK,CAACG,MAAM,CAACC,MAAM,CAC9B,CAACC,GAAG,EAAEC,KAAK,KAAK;IACZD,GAAG,CAACC,KAAK,CAACC,OAAO,CAAC,gBACdZ,KAAA,CAAAa,aAAA,CAACV,YAAY;MACTQ,KAAK,EAAEA;MACP;AACpB;AACA;AACA;MACoB;MAAA;MACAV,IAAI,EAAEA,IAAK;MACXa,YAAY,EAAET;IAAM,CACvB,CACJ;IAED,OAAOK,GAAG;EACd,CAAC,EACD,CAAC,CACL,CAAC;EAED,oBACIV,KAAA,CAAAa,aAAA,CAAAb,KAAA,CAAAe,QAAA,QACKT,YAAY,CAACU,MAAM,CAAC;IACjBT,IAAI;IACJO,YAAY,EAAET,KAAK;IACnBG,MAAM;IACN;AAChB;AACA;AACA;IACgB;IACAP;EACJ,CAAC,CACH,CAAC;AAEX,CAAC","ignoreList":[]}

package/admin/components/ContentEntryForm/DefaultLayout.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { CmsModel } from "@webiny/app-headless-cms-common/types";
+import type { CmsModel } from "@webiny/app-headless-cms-common/types/index.js";
 export interface DefaultLayoutProps extends React.HTMLAttributes<HTMLDivElement> {
     model: CmsModel;
 }

package/admin/components/ContentEntryForm/DefaultLayout.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { makeDecoratable } from "@webiny/app-admin";
 import { Bind } from "@webiny/form";
-import { Fields } from "./Fields";
+import { Fields } from "./Fields.js";
 export const DefaultLayout = makeDecoratable("DefaultLayout", ({
   model,
   ...props

package/admin/components/ContentEntryForm/DefaultLayout.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","makeDecoratable","Bind","Fields","DefaultLayout","model","props","createElement","contentModel","fields","layout"],"sources":["DefaultLayout.tsx"],"sourcesContent":["import React from \"react\";\nimport { makeDecoratable } from \"@webiny/app-admin\";\nimport { Bind } from \"@webiny/form\";\nimport type { CmsModel } from \"@webiny/app-headless-cms-common/types\";\nimport { Fields } from \"~/admin/components/ContentEntryForm/Fields\";\n\nexport interface DefaultLayoutProps extends React.HTMLAttributes<HTMLDivElement> {\n    model: CmsModel;\n}\n\nexport const DefaultLayout = makeDecoratable(\n    \"DefaultLayout\",\n    ({ model, ...props }: DefaultLayoutProps) => {\n        return (\n            <div {...props}>\n                <Fields\n                    contentModel={model}\n                    fields={model.fields || []}\n                    layout={model.layout || []}\n                    /**\n                     * TODO @ts-refactor\n                     * Figure out type for Bind.\n                     */\n                    // @ts-expect-error\n                    Bind={Bind}\n                />\n            </div>\n        );\n    }\n);\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,eAAe,QAAQ,mBAAmB;AACnD,SAASC,IAAI,QAAQ,cAAc;AAEnC,SAASC,MAAM;AAMf,OAAO,MAAMC,aAAa,GAAGH,eAAe,CACxC,eAAe,EACf,CAAC;EAAEI,KAAK;EAAE,GAAGC;AAA0B,CAAC,KAAK;EACzC,oBACIN,KAAA,CAAAO,aAAA,QAASD,KAAK,eACVN,KAAA,CAAAO,aAAA,CAACJ,MAAM;IACHK,YAAY,EAAEH,KAAM;IACpBI,MAAM,EAAEJ,KAAK,CAACI,MAAM,IAAI,EAAG;IAC3BC,MAAM,EAAEL,KAAK,CAACK,MAAM,IAAI;IACxB;AACpB;AACA;AACA;IACoB;IAAA;IACAR,IAAI,EAAEA;EAAK,CACd,CACA,CAAC;AAEd,CACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["React","makeDecoratable","Bind","Fields","DefaultLayout","model","props","createElement","contentModel","fields","layout"],"sources":["DefaultLayout.tsx"],"sourcesContent":["import React from \"react\";\nimport { makeDecoratable } from \"@webiny/app-admin\";\nimport { Bind } from \"@webiny/form\";\nimport type { CmsModel } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport { Fields } from \"~/admin/components/ContentEntryForm/Fields.js\";\n\nexport interface DefaultLayoutProps extends React.HTMLAttributes<HTMLDivElement> {\n    model: CmsModel;\n}\n\nexport const DefaultLayout = makeDecoratable(\n    \"DefaultLayout\",\n    ({ model, ...props }: DefaultLayoutProps) => {\n        return (\n            <div {...props}>\n                <Fields\n                    contentModel={model}\n                    fields={model.fields || []}\n                    layout={model.layout || []}\n                    /**\n                     * TODO @ts-refactor\n                     * Figure out type for Bind.\n                     */\n                    // @ts-expect-error\n                    Bind={Bind}\n                />\n            </div>\n        );\n    }\n);\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,eAAe,QAAQ,mBAAmB;AACnD,SAASC,IAAI,QAAQ,cAAc;AAEnC,SAASC,MAAM;AAMf,OAAO,MAAMC,aAAa,GAAGH,eAAe,CACxC,eAAe,EACf,CAAC;EAAEI,KAAK;EAAE,GAAGC;AAA0B,CAAC,KAAK;EACzC,oBACIN,KAAA,CAAAO,aAAA,QAASD,KAAK,eACVN,KAAA,CAAAO,aAAA,CAACJ,MAAM;IACHK,YAAY,EAAEH,KAAM;IACpBI,MAAM,EAAEJ,KAAK,CAACI,MAAM,IAAI,EAAG;IAC3BC,MAAM,EAAEL,KAAK,CAACK,MAAM,IAAI;IACxB;AACpB;AACA;AACA;IACoB;IAAA;IACAR,IAAI,EAAEA;EAAK,CACd,CACA,CAAC;AAEd,CACJ,CAAC","ignoreList":[]}

package/admin/components/ContentEntryForm/FieldElement.d.ts

@@ -1 +1 @@
-export * from "@webiny/app-headless-cms-common/Fields/FieldElement";
+export * from "@webiny/app-headless-cms-common/Fields/FieldElement.js";

package/admin/components/ContentEntryForm/FieldElement.js

@@ -1,3 +1,3 @@
-export * from "@webiny/app-headless-cms-common/Fields/FieldElement";
+export * from "@webiny/app-headless-cms-common/Fields/FieldElement.js";
 
 //# sourceMappingURL=FieldElement.js.map

package/admin/components/ContentEntryForm/FieldElement.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["FieldElement.tsx"],"sourcesContent":["export * from \"@webiny/app-headless-cms-common/Fields/FieldElement\";\n"],"mappings":"AAAA,cAAc,qDAAqD","ignoreList":[]}
+{"version":3,"names":[],"sources":["FieldElement.tsx"],"sourcesContent":["export * from \"@webiny/app-headless-cms-common/Fields/FieldElement.js\";\n"],"mappings":"AAAA,cAAc,wDAAwD","ignoreList":[]}

package/admin/components/ContentEntryForm/Fields.d.ts

@@ -1 +1 @@
-export * from "@webiny/app-headless-cms-common/Fields/Fields";
+export * from "@webiny/app-headless-cms-common/Fields/Fields.js";

package/admin/components/ContentEntryForm/Fields.js

@@ -1,3 +1,3 @@
-export * from "@webiny/app-headless-cms-common/Fields/Fields";
+export * from "@webiny/app-headless-cms-common/Fields/Fields.js";
 
 //# sourceMappingURL=Fields.js.map

package/admin/components/ContentEntryForm/Fields.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["Fields.tsx"],"sourcesContent":["export * from \"@webiny/app-headless-cms-common/Fields/Fields\";\n"],"mappings":"AAAA,cAAc,+CAA+C","ignoreList":[]}
+{"version":3,"names":[],"sources":["Fields.tsx"],"sourcesContent":["export * from \"@webiny/app-headless-cms-common/Fields/Fields.js\";\n"],"mappings":"AAAA,cAAc,kDAAkD","ignoreList":[]}

package/admin/components/ContentEntryForm/Header/ContentFormOptionsMenu/ContentFormOptionsMenu.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { OptionsMenu } from "@webiny/app-admin";
-import { useContentEntryEditorConfig } from "../../../../config/contentEntries";
+import { useContentEntryEditorConfig } from "../../../../config/contentEntries/index.js";
 export const ContentFormOptionsMenu = () => {
   const {
     menuItemActions

package/admin/components/ContentEntryForm/Header/ContentFormOptionsMenu/ContentFormOptionsMenu.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","OptionsMenu","useContentEntryEditorConfig","ContentFormOptionsMenu","menuItemActions","createElement","actions"],"sources":["ContentFormOptionsMenu.tsx"],"sourcesContent":["import React from \"react\";\nimport { OptionsMenu } from \"@webiny/app-admin\";\nimport { useContentEntryEditorConfig } from \"~/admin/config/contentEntries\";\n\nexport const ContentFormOptionsMenu = () => {\n    const { menuItemActions } = useContentEntryEditorConfig();\n\n    return (\n        <OptionsMenu\n            actions={menuItemActions}\n            data-testid={\"cms.content-form.header.more-options\"}\n        />\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,WAAW,QAAQ,mBAAmB;AAC/C,SAASC,2BAA2B;AAEpC,OAAO,MAAMC,sBAAsB,GAAGA,CAAA,KAAM;EACxC,MAAM;IAAEC;EAAgB,CAAC,GAAGF,2BAA2B,CAAC,CAAC;EAEzD,oBACIF,KAAA,CAAAK,aAAA,CAACJ,WAAW;IACRK,OAAO,EAAEF,eAAgB;IACzB,eAAa;EAAuC,CACvD,CAAC;AAEV,CAAC","ignoreList":[]}
+{"version":3,"names":["React","OptionsMenu","useContentEntryEditorConfig","ContentFormOptionsMenu","menuItemActions","createElement","actions"],"sources":["ContentFormOptionsMenu.tsx"],"sourcesContent":["import React from \"react\";\nimport { OptionsMenu } from \"@webiny/app-admin\";\nimport { useContentEntryEditorConfig } from \"~/admin/config/contentEntries/index.js\";\n\nexport const ContentFormOptionsMenu = () => {\n    const { menuItemActions } = useContentEntryEditorConfig();\n\n    return (\n        <OptionsMenu\n            actions={menuItemActions}\n            data-testid={\"cms.content-form.header.more-options\"}\n        />\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,WAAW,QAAQ,mBAAmB;AAC/C,SAASC,2BAA2B;AAEpC,OAAO,MAAMC,sBAAsB,GAAGA,CAAA,KAAM;EACxC,MAAM;IAAEC;EAAgB,CAAC,GAAGF,2BAA2B,CAAC,CAAC;EAEzD,oBACIF,KAAA,CAAAK,aAAA,CAACJ,WAAW;IACRK,OAAO,EAAEF,eAAgB;IACzB,eAAa;EAAuC,CACvD,CAAC;AAEV,CAAC","ignoreList":[]}

package/admin/components/ContentEntryForm/Header/ContentFormOptionsMenu/index.d.ts

@@ -1 +1 @@
-export * from "./ContentFormOptionsMenu";
+export * from "./ContentFormOptionsMenu.js";

package/admin/components/ContentEntryForm/Header/ContentFormOptionsMenu/index.js

@@ -1,3 +1,3 @@
-export * from "./ContentFormOptionsMenu";
+export * from "./ContentFormOptionsMenu.js";
 
 //# sourceMappingURL=index.js.map

package/admin/components/ContentEntryForm/Header/ContentFormOptionsMenu/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.tsx"],"sourcesContent":["export * from \"./ContentFormOptionsMenu\";\n"],"mappings":"AAAA","ignoreList":[]}
+{"version":3,"names":[],"sources":["index.tsx"],"sourcesContent":["export * from \"./ContentFormOptionsMenu.js\";\n"],"mappings":"AAAA","ignoreList":[]}

package/admin/components/ContentEntryForm/Header/DeleteEntry/DeleteEntry.js

@@ -1,9 +1,9 @@
 import React from "react";
 import { ReactComponent as DeleteIcon } from "@webiny/icons/delete.svg";
 import { useNavigateFolder } from "@webiny/app-aco";
-import { usePermission } from "../../../../hooks";
-import { ContentEntryEditorConfig } from "../../../../config/contentEntries";
-import { useContentEntry } from "../../../../views/contentEntries/hooks/useContentEntry";
+import { usePermission } from "../../../../hooks/index.js";
+import { ContentEntryEditorConfig } from "../../../../config/contentEntries/index.js";
+import { useContentEntry } from "../../../../views/contentEntries/hooks/useContentEntry.js";
 export const DeleteEntry = () => {
   const {
     navigateToFolder

package/admin/components/ContentEntryForm/Header/DeleteEntry/DeleteEntry.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","ReactComponent","DeleteIcon","useNavigateFolder","usePermission","ContentEntryEditorConfig","useContentEntry","DeleteEntry","navigateToFolder","entry","loading","contentEntry","canDelete","OptionsMenuItem","Actions","MenuItemAction","useOptionsMenuItem","deleteEntry","response","id","entryId","wbyAco_location","folderId","createElement","icon","label","onAction","disabled"],"sources":["DeleteEntry.tsx"],"sourcesContent":["import React from \"react\";\nimport { ReactComponent as DeleteIcon } from \"@webiny/icons/delete.svg\";\nimport { useNavigateFolder } from \"@webiny/app-aco\";\nimport { usePermission } from \"~/admin/hooks\";\nimport { ContentEntryEditorConfig } from \"~/admin/config/contentEntries\";\nimport { useContentEntry } from \"~/admin/views/contentEntries/hooks/useContentEntry\";\n\nexport const DeleteEntry = () => {\n    const { navigateToFolder } = useNavigateFolder();\n    const { entry, loading, ...contentEntry } = useContentEntry();\n    const { canDelete } = usePermission();\n\n    const { OptionsMenuItem } =\n        ContentEntryEditorConfig.Actions.MenuItemAction.useOptionsMenuItem();\n\n    const deleteEntry = async () => {\n        const response = await contentEntry.deleteEntry({ id: entry.entryId });\n        if (typeof response === \"boolean\") {\n            navigateToFolder(entry.wbyAco_location.folderId);\n        }\n    };\n\n    if (!canDelete(entry, \"cms.contentEntry\")) {\n        return null;\n    }\n\n    return (\n        <OptionsMenuItem\n            icon={<DeleteIcon />}\n            label={\"Trash entry\"}\n            onAction={deleteEntry}\n            disabled={!entry.id || loading}\n            data-testid={\"cms.content-form.header.delete\"}\n        />\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,cAAc,IAAIC,UAAU,QAAQ,0BAA0B;AACvE,SAASC,iBAAiB,QAAQ,iBAAiB;AACnD,SAASC,aAAa;AACtB,SAASC,wBAAwB;AACjC,SAASC,eAAe;AAExB,OAAO,MAAMC,WAAW,GAAGA,CAAA,KAAM;EAC7B,MAAM;IAAEC;EAAiB,CAAC,GAAGL,iBAAiB,CAAC,CAAC;EAChD,MAAM;IAAEM,KAAK;IAAEC,OAAO;IAAE,GAAGC;EAAa,CAAC,GAAGL,eAAe,CAAC,CAAC;EAC7D,MAAM;IAAEM;EAAU,CAAC,GAAGR,aAAa,CAAC,CAAC;EAErC,MAAM;IAAES;EAAgB,CAAC,GACrBR,wBAAwB,CAACS,OAAO,CAACC,cAAc,CAACC,kBAAkB,CAAC,CAAC;EAExE,MAAMC,WAAW,GAAG,MAAAA,CAAA,KAAY;IAC5B,MAAMC,QAAQ,GAAG,MAAMP,YAAY,CAACM,WAAW,CAAC;MAAEE,EAAE,EAAEV,KAAK,CAACW;IAAQ,CAAC,CAAC;IACtE,IAAI,OAAOF,QAAQ,KAAK,SAAS,EAAE;MAC/BV,gBAAgB,CAACC,KAAK,CAACY,eAAe,CAACC,QAAQ,CAAC;IACpD;EACJ,CAAC;EAED,IAAI,CAACV,SAAS,CAACH,KAAK,EAAE,kBAAkB,CAAC,EAAE;IACvC,OAAO,IAAI;EACf;EAEA,oBACIT,KAAA,CAAAuB,aAAA,CAACV,eAAe;IACZW,IAAI,eAAExB,KAAA,CAAAuB,aAAA,CAACrB,UAAU,MAAE,CAAE;IACrBuB,KAAK,EAAE,aAAc;IACrBC,QAAQ,EAAET,WAAY;IACtBU,QAAQ,EAAE,CAAClB,KAAK,CAACU,EAAE,IAAIT,OAAQ;IAC/B,eAAa;EAAiC,CACjD,CAAC;AAEV,CAAC","ignoreList":[]}
+{"version":3,"names":["React","ReactComponent","DeleteIcon","useNavigateFolder","usePermission","ContentEntryEditorConfig","useContentEntry","DeleteEntry","navigateToFolder","entry","loading","contentEntry","canDelete","OptionsMenuItem","Actions","MenuItemAction","useOptionsMenuItem","deleteEntry","response","id","entryId","wbyAco_location","folderId","createElement","icon","label","onAction","disabled"],"sources":["DeleteEntry.tsx"],"sourcesContent":["import React from \"react\";\nimport { ReactComponent as DeleteIcon } from \"@webiny/icons/delete.svg\";\nimport { useNavigateFolder } from \"@webiny/app-aco\";\nimport { usePermission } from \"~/admin/hooks/index.js\";\nimport { ContentEntryEditorConfig } from \"~/admin/config/contentEntries/index.js\";\nimport { useContentEntry } from \"~/admin/views/contentEntries/hooks/useContentEntry.js\";\n\nexport const DeleteEntry = () => {\n    const { navigateToFolder } = useNavigateFolder();\n    const { entry, loading, ...contentEntry } = useContentEntry();\n    const { canDelete } = usePermission();\n\n    const { OptionsMenuItem } =\n        ContentEntryEditorConfig.Actions.MenuItemAction.useOptionsMenuItem();\n\n    const deleteEntry = async () => {\n        const response = await contentEntry.deleteEntry({ id: entry.entryId });\n        if (typeof response === \"boolean\") {\n            navigateToFolder(entry.wbyAco_location.folderId);\n        }\n    };\n\n    if (!canDelete(entry, \"cms.contentEntry\")) {\n        return null;\n    }\n\n    return (\n        <OptionsMenuItem\n            icon={<DeleteIcon />}\n            label={\"Trash entry\"}\n            onAction={deleteEntry}\n            disabled={!entry.id || loading}\n            data-testid={\"cms.content-form.header.delete\"}\n        />\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,cAAc,IAAIC,UAAU,QAAQ,0BAA0B;AACvE,SAASC,iBAAiB,QAAQ,iBAAiB;AACnD,SAASC,aAAa;AACtB,SAASC,wBAAwB;AACjC,SAASC,eAAe;AAExB,OAAO,MAAMC,WAAW,GAAGA,CAAA,KAAM;EAC7B,MAAM;IAAEC;EAAiB,CAAC,GAAGL,iBAAiB,CAAC,CAAC;EAChD,MAAM;IAAEM,KAAK;IAAEC,OAAO;IAAE,GAAGC;EAAa,CAAC,GAAGL,eAAe,CAAC,CAAC;EAC7D,MAAM;IAAEM;EAAU,CAAC,GAAGR,aAAa,CAAC,CAAC;EAErC,MAAM;IAAES;EAAgB,CAAC,GACrBR,wBAAwB,CAACS,OAAO,CAACC,cAAc,CAACC,kBAAkB,CAAC,CAAC;EAExE,MAAMC,WAAW,GAAG,MAAAA,CAAA,KAAY;IAC5B,MAAMC,QAAQ,GAAG,MAAMP,YAAY,CAACM,WAAW,CAAC;MAAEE,EAAE,EAAEV,KAAK,CAACW;IAAQ,CAAC,CAAC;IACtE,IAAI,OAAOF,QAAQ,KAAK,SAAS,EAAE;MAC/BV,gBAAgB,CAACC,KAAK,CAACY,eAAe,CAACC,QAAQ,CAAC;IACpD;EACJ,CAAC;EAED,IAAI,CAACV,SAAS,CAACH,KAAK,EAAE,kBAAkB,CAAC,EAAE;IACvC,OAAO,IAAI;EACf;EAEA,oBACIT,KAAA,CAAAuB,aAAA,CAACV,eAAe;IACZW,IAAI,eAAExB,KAAA,CAAAuB,aAAA,CAACrB,UAAU,MAAE,CAAE;IACrBuB,KAAK,EAAE,aAAc;IACrBC,QAAQ,EAAET,WAAY;IACtBU,QAAQ,EAAE,CAAClB,KAAK,CAACU,EAAE,IAAIT,OAAQ;IAC/B,eAAa;EAAiC,CACjD,CAAC;AAEV,CAAC","ignoreList":[]}

package/admin/components/ContentEntryForm/Header/DeleteEntry/index.d.ts

@@ -1 +1 @@
-export * from "./DeleteEntry";
+export * from "./DeleteEntry.js";

package/admin/components/ContentEntryForm/Header/DeleteEntry/index.js

@@ -1,3 +1,3 @@
-export * from "./DeleteEntry";
+export * from "./DeleteEntry.js";
 
 //# sourceMappingURL=index.js.map

package/admin/components/ContentEntryForm/Header/DeleteEntry/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.tsx"],"sourcesContent":["export * from \"./DeleteEntry\";\n"],"mappings":"AAAA","ignoreList":[]}
+{"version":3,"names":[],"sources":["index.tsx"],"sourcesContent":["export * from \"./DeleteEntry.js\";\n"],"mappings":"AAAA","ignoreList":[]}

package/admin/components/ContentEntryForm/Header/Header.js

@@ -1,10 +1,11 @@
 import React from "react";
 import { Buttons, makeDecoratable } from "@webiny/app-admin";
-import { useContentEntryEditorConfig } from "../../../config/contentEntries";
-import { ContentFormOptionsMenu } from "./ContentFormOptionsMenu";
-import { RevisionSelector } from "./RevisionSelector";
+import { useContentEntryEditorConfig } from "../../../config/contentEntries/index.js";
+import { ContentFormOptionsMenu } from "./ContentFormOptionsMenu/index.js";
+import { RevisionSelector } from "./RevisionSelector/index.js";
 import { Helmet } from "react-helmet";
-import { useContentEntry } from "../../../views/contentEntries/hooks";
+import { useContentEntry } from "../../../views/contentEntries/hooks/index.js";
+import { IsModelPublishable } from "../../../../exports/admin/cms.js";
 export const Header = makeDecoratable("ContentEntryFormHeader", () => {
   const {
     buttonActions
@@ -13,12 +14,12 @@ export const Header = makeDecoratable("ContentEntryFormHeader", () => {
     entry
   } = useContentEntry();
   return /*#__PURE__*/React.createElement("div", {
-    className: "wby-flex wby-items-center wby-justify-between wby-gap-sm wby-border-b-sm wby-border-neutral-dimmed wby-pb-md wby-mb-md",
+    className: "flex items-center justify-between gap-sm border-b-sm border-neutral-dimmed pb-md mb-md",
     id: "headerToolbarGrid"
   }, entry.meta?.title ? /*#__PURE__*/React.createElement(Helmet, {
     title: entry.meta.title
-  }) : null, /*#__PURE__*/React.createElement(RevisionSelector, null), /*#__PURE__*/React.createElement("div", {
-    className: "wby-flex wby-items-center wby-gap-sm"
+  }) : null, /*#__PURE__*/React.createElement(IsModelPublishable, null, /*#__PURE__*/React.createElement(RevisionSelector, null)), /*#__PURE__*/React.createElement("div", {
+    className: "flex items-center gap-sm"
   }, /*#__PURE__*/React.createElement(Buttons, {
     actions: buttonActions
   }), /*#__PURE__*/React.createElement(ContentFormOptionsMenu, null)));

package/admin/components/ContentEntryForm/Header/Header.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Buttons","makeDecoratable","useContentEntryEditorConfig","ContentFormOptionsMenu","RevisionSelector","Helmet","useContentEntry","Header","buttonActions","entry","createElement","className","id","meta","title","actions"],"sources":["Header.tsx"],"sourcesContent":["import React from \"react\";\nimport { Buttons, makeDecoratable } from \"@webiny/app-admin\";\n\nimport { useContentEntryEditorConfig } from \"~/admin/config/contentEntries\";\n\nimport { ContentFormOptionsMenu } from \"./ContentFormOptionsMenu\";\nimport { RevisionSelector } from \"~/admin/components/ContentEntryForm/Header/RevisionSelector\";\nimport { Helmet } from \"react-helmet\";\nimport { useContentEntry } from \"~/admin/views/contentEntries/hooks\";\n\nexport const Header = makeDecoratable(\"ContentEntryFormHeader\", () => {\n    const { buttonActions } = useContentEntryEditorConfig();\n    const { entry } = useContentEntry();\n\n    return (\n        <div\n            className={\n                \"wby-flex wby-items-center wby-justify-between wby-gap-sm wby-border-b-sm wby-border-neutral-dimmed wby-pb-md wby-mb-md\"\n            }\n            id=\"headerToolbarGrid\"\n        >\n            {entry.meta?.title ? <Helmet title={entry.meta.title} /> : null}\n            <RevisionSelector />\n            <div className={\"wby-flex wby-items-center wby-gap-sm\"}>\n                <Buttons actions={buttonActions} />\n                <ContentFormOptionsMenu />\n            </div>\n        </div>\n    );\n});\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,OAAO,EAAEC,eAAe,QAAQ,mBAAmB;AAE5D,SAASC,2BAA2B;AAEpC,SAASC,sBAAsB;AAC/B,SAASC,gBAAgB;AACzB,SAASC,MAAM,QAAQ,cAAc;AACrC,SAASC,eAAe;AAExB,OAAO,MAAMC,MAAM,GAAGN,eAAe,CAAC,wBAAwB,EAAE,MAAM;EAClE,MAAM;IAAEO;EAAc,CAAC,GAAGN,2BAA2B,CAAC,CAAC;EACvD,MAAM;IAAEO;EAAM,CAAC,GAAGH,eAAe,CAAC,CAAC;EAEnC,oBACIP,KAAA,CAAAW,aAAA;IACIC,SAAS,EACL,wHACH;IACDC,EAAE,EAAC;EAAmB,GAErBH,KAAK,CAACI,IAAI,EAAEC,KAAK,gBAAGf,KAAA,CAAAW,aAAA,CAACL,MAAM;IAACS,KAAK,EAAEL,KAAK,CAACI,IAAI,CAACC;EAAM,CAAE,CAAC,GAAG,IAAI,eAC/Df,KAAA,CAAAW,aAAA,CAACN,gBAAgB,MAAE,CAAC,eACpBL,KAAA,CAAAW,aAAA;IAAKC,SAAS,EAAE;EAAuC,gBACnDZ,KAAA,CAAAW,aAAA,CAACV,OAAO;IAACe,OAAO,EAAEP;EAAc,CAAE,CAAC,eACnCT,KAAA,CAAAW,aAAA,CAACP,sBAAsB,MAAE,CACxB,CACJ,CAAC;AAEd,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","Buttons","makeDecoratable","useContentEntryEditorConfig","ContentFormOptionsMenu","RevisionSelector","Helmet","useContentEntry","IsModelPublishable","Header","buttonActions","entry","createElement","className","id","meta","title","actions"],"sources":["Header.tsx"],"sourcesContent":["import React from \"react\";\nimport { Buttons, makeDecoratable } from \"@webiny/app-admin\";\n\nimport { useContentEntryEditorConfig } from \"~/admin/config/contentEntries/index.js\";\n\nimport { ContentFormOptionsMenu } from \"./ContentFormOptionsMenu/index.js\";\nimport { RevisionSelector } from \"~/admin/components/ContentEntryForm/Header/RevisionSelector/index.js\";\nimport { Helmet } from \"react-helmet\";\nimport { useContentEntry } from \"~/admin/views/contentEntries/hooks/index.js\";\nimport { IsModelPublishable } from \"~/exports/admin/cms.js\";\n\nexport const Header = makeDecoratable(\"ContentEntryFormHeader\", () => {\n    const { buttonActions } = useContentEntryEditorConfig();\n    const { entry } = useContentEntry();\n\n    return (\n        <div\n            className={\n                \"flex items-center justify-between gap-sm border-b-sm border-neutral-dimmed pb-md mb-md\"\n            }\n            id=\"headerToolbarGrid\"\n        >\n            {entry.meta?.title ? <Helmet title={entry.meta.title} /> : null}\n            <IsModelPublishable>\n                <RevisionSelector />\n            </IsModelPublishable>\n            <div className={\"flex items-center gap-sm\"}>\n                <Buttons actions={buttonActions} />\n                <ContentFormOptionsMenu />\n            </div>\n        </div>\n    );\n});\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,OAAO,EAAEC,eAAe,QAAQ,mBAAmB;AAE5D,SAASC,2BAA2B;AAEpC,SAASC,sBAAsB;AAC/B,SAASC,gBAAgB;AACzB,SAASC,MAAM,QAAQ,cAAc;AACrC,SAASC,eAAe;AACxB,SAASC,kBAAkB;AAE3B,OAAO,MAAMC,MAAM,GAAGP,eAAe,CAAC,wBAAwB,EAAE,MAAM;EAClE,MAAM;IAAEQ;EAAc,CAAC,GAAGP,2BAA2B,CAAC,CAAC;EACvD,MAAM;IAAEQ;EAAM,CAAC,GAAGJ,eAAe,CAAC,CAAC;EAEnC,oBACIP,KAAA,CAAAY,aAAA;IACIC,SAAS,EACL,wFACH;IACDC,EAAE,EAAC;EAAmB,GAErBH,KAAK,CAACI,IAAI,EAAEC,KAAK,gBAAGhB,KAAA,CAAAY,aAAA,CAACN,MAAM;IAACU,KAAK,EAAEL,KAAK,CAACI,IAAI,CAACC;EAAM,CAAE,CAAC,GAAG,IAAI,eAC/DhB,KAAA,CAAAY,aAAA,CAACJ,kBAAkB,qBACfR,KAAA,CAAAY,aAAA,CAACP,gBAAgB,MAAE,CACH,CAAC,eACrBL,KAAA,CAAAY,aAAA;IAAKC,SAAS,EAAE;EAA2B,gBACvCb,KAAA,CAAAY,aAAA,CAACX,OAAO;IAACgB,OAAO,EAAEP;EAAc,CAAE,CAAC,eACnCV,KAAA,CAAAY,aAAA,CAACR,sBAAsB,MAAE,CACxB,CACJ,CAAC;AAEd,CAAC,CAAC","ignoreList":[]}

package/admin/components/ContentEntryForm/Header/RevisionSelector/RevisionSelector.js

@@ -1,10 +1,11 @@
 import React from "react";
-import get from "lodash/get";
-import { useRouter } from "@webiny/react-router";
+import get from "lodash/get.js";
+import { useRoute, useRouter } from "@webiny/app-admin";
 import { Button, DropdownMenu, Text } from "@webiny/admin-ui";
 import { ReactComponent as DownButton } from "@webiny/icons/keyboard_arrow_down.svg";
-import { useContentEntry } from "../../../../views/contentEntries/hooks/useContentEntry";
-import { statuses as statusLabels } from "../../../../constants";
+import { useContentEntry } from "../../../../views/contentEntries/hooks/useContentEntry.js";
+import { statuses as statusLabels } from "../../../../constants.js";
+import { Routes } from "../../../../../routes.js";
 const defaultRevisions = [{
   id: "new",
   meta: {
@@ -13,16 +14,17 @@ const defaultRevisions = [{
   }
 }];
 export const RevisionSelector = () => {
+  const {
+    goToRoute
+  } = useRouter();
+  const {
+    route
+  } = useRoute(Routes.ContentEntries.List);
   const {
     entry,
     revisions,
     loading
   } = useContentEntry();
-  const {
-    location,
-    history
-  } = useRouter();
-  const query = new URLSearchParams(location.search);
   const currentRevision = {
     version: get(entry, "meta.version", 1),
     status: get(entry, "meta.status", "draft")
@@ -39,9 +41,9 @@ export const RevisionSelector = () => {
   }, allRevisions.map(revision => /*#__PURE__*/React.createElement(DropdownMenu.Item, {
     key: revision.id,
     onClick: () => {
-      query.set("id", encodeURIComponent(revision.id));
-      history.push({
-        search: query.toString()
+      goToRoute(Routes.ContentEntries.List, {
+        ...route.params,
+        id: revision.id
       });
     },
     text: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {