@webiny/app-headless-cms 0.0.0-unstable.78f581c1d2 → 0.0.0-unstable.97a151f74d

package/HeadlessCMS.js

@@ -29,6 +29,8 @@ var _DefaultOnEntryDelete = require("./admin/plugins/entry/DefaultOnEntryDelete"
 
 var _DefaultOnEntryPublish = require("./admin/plugins/entry/DefaultOnEntryPublish");
 
+var _allPlugins = _interopRequireDefault(require("./allPlugins"));
+
 var createHeadlessCMSProvider = function createHeadlessCMSProvider(createApolloClient) {
   return function (Component) {
     return function HeadlessCMSProvider(_ref) {
@@ -45,6 +47,8 @@ var HeadlessCMSExtension = function HeadlessCMSExtension(_ref2) {
 
   _plugins.plugins.register(_apiInformation.default);
 
+  _plugins.plugins.register(_allPlugins.default);
+
   _plugins.plugins.register(new _app.ApolloCacheObjectIdPlugin(function (obj) {
     if (obj.__typename === "CmsContentModelField") {
       return null;

package/HeadlessCMS.js.map

@@ -1 +1 @@
-{"version":3,"names":["createHeadlessCMSProvider","createApolloClient","Component","HeadlessCMSProvider","children","HeadlessCMSExtension","plugins","register","apiInformation","ApolloCacheObjectIdPlugin","obj","__typename","undefined","HeadlessCMS","memo"],"sources":["HeadlessCMS.tsx"],"sourcesContent":["import React, { Fragment, memo } from \"react\";\nimport { plugins } from \"@webiny/plugins\";\nimport { Plugins, Provider } from \"@webiny/app-admin\";\nimport { ApolloCacheObjectIdPlugin } from \"@webiny/app\";\nimport { ApolloClient } from \"apollo-client\";\nimport { CmsProvider } from \"./admin/contexts/Cms\";\nimport { CmsMenuLoader } from \"~/admin/menus/CmsMenuLoader\";\nimport apiInformation from \"./admin/plugins/apiInformation\";\nimport { ContentEntriesModule } from \"./admin/views/contentEntries/experiment/ContentEntriesModule\";\nimport { DefaultOnEntryDelete } from \"./admin/plugins/entry/DefaultOnEntryDelete\";\nimport { DefaultOnEntryPublish } from \"~/admin/plugins/entry/DefaultOnEntryPublish\";\n\nconst createHeadlessCMSProvider =\n    (createApolloClient: CreateApolloClient) =>\n    (Component: React.FC): React.FC => {\n        return function HeadlessCMSProvider({ children }) {\n            return (\n                <CmsProvider createApolloClient={createApolloClient}>\n                    <Component>{children}</Component>\n                </CmsProvider>\n            );\n        };\n    };\n\ninterface CreateApolloClientParams {\n    uri: string;\n}\ninterface CreateApolloClient {\n    (params: CreateApolloClientParams): ApolloClient<any>;\n}\n\nexport interface HeadlessCMSProps {\n    createApolloClient: CreateApolloClient;\n}\n\nconst HeadlessCMSExtension = ({ createApolloClient }: HeadlessCMSProps) => {\n    plugins.register(apiInformation);\n\n    plugins.register(\n        new ApolloCacheObjectIdPlugin(obj => {\n            if (obj.__typename === \"CmsContentModelField\") {\n                return null;\n            }\n\n            return undefined;\n        })\n    );\n\n    return (\n        <Fragment>\n            <ContentEntriesModule />\n            <Provider hoc={createHeadlessCMSProvider(createApolloClient)} />\n            <Plugins>\n                <CmsMenuLoader />\n                <DefaultOnEntryDelete />\n                <DefaultOnEntryPublish />\n            </Plugins>\n        </Fragment>\n    );\n};\n\nexport const HeadlessCMS = memo(HeadlessCMSExtension);\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA,IAAMA,yBAAyB,GAC3B,SADEA,yBACF,CAACC,kBAAD;EAAA,OACA,UAACC,SAAD,EAAmC;IAC/B,OAAO,SAASC,mBAAT,OAA2C;MAAA,IAAZC,QAAY,QAAZA,QAAY;MAC9C,oBACI,6BAAC,gBAAD;QAAa,kBAAkB,EAAEH;MAAjC,gBACI,6BAAC,SAAD,QAAYG,QAAZ,CADJ,CADJ;IAKH,CAND;EAOH,CATD;AAAA,CADJ;;AAuBA,IAAMC,oBAAoB,GAAG,SAAvBA,oBAAuB,QAA8C;EAAA,IAA3CJ,kBAA2C,SAA3CA,kBAA2C;;EACvEK,gBAAA,CAAQC,QAAR,CAAiBC,uBAAjB;;EAEAF,gBAAA,CAAQC,QAAR,CACI,IAAIE,8BAAJ,CAA8B,UAAAC,GAAG,EAAI;IACjC,IAAIA,GAAG,CAACC,UAAJ,KAAmB,sBAAvB,EAA+C;MAC3C,OAAO,IAAP;IACH;;IAED,OAAOC,SAAP;EACH,CAND,CADJ;;EAUA,oBACI,6BAAC,eAAD,qBACI,6BAAC,0CAAD,OADJ,eAEI,6BAAC,kBAAD;IAAU,GAAG,EAAEZ,yBAAyB,CAACC,kBAAD;EAAxC,EAFJ,eAGI,6BAAC,iBAAD,qBACI,6BAAC,4BAAD,OADJ,eAEI,6BAAC,0CAAD,OAFJ,eAGI,6BAAC,4CAAD,OAHJ,CAHJ,CADJ;AAWH,CAxBD;;AA0BO,IAAMY,WAAW,gBAAG,IAAAC,WAAA,EAAKT,oBAAL,CAApB"}
+{"version":3,"names":["createHeadlessCMSProvider","createApolloClient","Component","HeadlessCMSProvider","children","HeadlessCMSExtension","plugins","register","apiInformation","allPlugins","ApolloCacheObjectIdPlugin","obj","__typename","undefined","HeadlessCMS","memo"],"sources":["HeadlessCMS.tsx"],"sourcesContent":["import React, { Fragment, memo } from \"react\";\nimport { plugins } from \"@webiny/plugins\";\nimport { Plugins, Provider } from \"@webiny/app-admin\";\nimport { ApolloCacheObjectIdPlugin } from \"@webiny/app\";\nimport { ApolloClient } from \"apollo-client\";\nimport { CmsProvider } from \"./admin/contexts/Cms\";\nimport { CmsMenuLoader } from \"~/admin/menus/CmsMenuLoader\";\nimport apiInformation from \"./admin/plugins/apiInformation\";\nimport { ContentEntriesModule } from \"./admin/views/contentEntries/experiment/ContentEntriesModule\";\nimport { DefaultOnEntryDelete } from \"./admin/plugins/entry/DefaultOnEntryDelete\";\nimport { DefaultOnEntryPublish } from \"~/admin/plugins/entry/DefaultOnEntryPublish\";\nimport allPlugins from \"./allPlugins\";\n\nconst createHeadlessCMSProvider =\n    (createApolloClient: CreateApolloClient) =>\n    (Component: React.FC): React.FC => {\n        return function HeadlessCMSProvider({ children }) {\n            return (\n                <CmsProvider createApolloClient={createApolloClient}>\n                    <Component>{children}</Component>\n                </CmsProvider>\n            );\n        };\n    };\n\ninterface CreateApolloClientParams {\n    uri: string;\n}\ninterface CreateApolloClient {\n    (params: CreateApolloClientParams): ApolloClient<any>;\n}\n\nexport interface HeadlessCMSProps {\n    createApolloClient: CreateApolloClient;\n}\n\nconst HeadlessCMSExtension = ({ createApolloClient }: HeadlessCMSProps) => {\n    plugins.register(apiInformation);\n    plugins.register(allPlugins);\n\n    plugins.register(\n        new ApolloCacheObjectIdPlugin(obj => {\n            if (obj.__typename === \"CmsContentModelField\") {\n                return null;\n            }\n\n            return undefined;\n        })\n    );\n\n    return (\n        <Fragment>\n            <ContentEntriesModule />\n            <Provider hoc={createHeadlessCMSProvider(createApolloClient)} />\n            <Plugins>\n                <CmsMenuLoader />\n                <DefaultOnEntryDelete />\n                <DefaultOnEntryPublish />\n            </Plugins>\n        </Fragment>\n    );\n};\n\nexport const HeadlessCMS = memo(HeadlessCMSExtension);\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA,IAAMA,yBAAyB,GAC3B,SADEA,yBACF,CAACC,kBAAD;EAAA,OACA,UAACC,SAAD,EAAmC;IAC/B,OAAO,SAASC,mBAAT,OAA2C;MAAA,IAAZC,QAAY,QAAZA,QAAY;MAC9C,oBACI,6BAAC,gBAAD;QAAa,kBAAkB,EAAEH;MAAjC,gBACI,6BAAC,SAAD,QAAYG,QAAZ,CADJ,CADJ;IAKH,CAND;EAOH,CATD;AAAA,CADJ;;AAuBA,IAAMC,oBAAoB,GAAG,SAAvBA,oBAAuB,QAA8C;EAAA,IAA3CJ,kBAA2C,SAA3CA,kBAA2C;;EACvEK,gBAAA,CAAQC,QAAR,CAAiBC,uBAAjB;;EACAF,gBAAA,CAAQC,QAAR,CAAiBE,mBAAjB;;EAEAH,gBAAA,CAAQC,QAAR,CACI,IAAIG,8BAAJ,CAA8B,UAAAC,GAAG,EAAI;IACjC,IAAIA,GAAG,CAACC,UAAJ,KAAmB,sBAAvB,EAA+C;MAC3C,OAAO,IAAP;IACH;;IAED,OAAOC,SAAP;EACH,CAND,CADJ;;EAUA,oBACI,6BAAC,eAAD,qBACI,6BAAC,0CAAD,OADJ,eAEI,6BAAC,kBAAD;IAAU,GAAG,EAAEb,yBAAyB,CAACC,kBAAD;EAAxC,EAFJ,eAGI,6BAAC,iBAAD,qBACI,6BAAC,4BAAD,OADJ,eAEI,6BAAC,0CAAD,OAFJ,eAGI,6BAAC,4CAAD,OAHJ,CAHJ,CADJ;AAWH,CAzBD;;AA2BO,IAAMa,WAAW,gBAAG,IAAAC,WAAA,EAAKV,oBAAL,CAApB"}

package/admin/components/ContentEntryForm/ContentEntryForm.js

@@ -35,6 +35,8 @@ var _reactRouter = require("@webiny/react-router");
 
 var _appAdmin = require("@webiny/app-admin");
 
+var _ModelProvider = require("../ModelProvider");
+
 var _excluded = ["onForm"];
 var FormWrapper = /*#__PURE__*/(0, _styled.default)("div", {
   target: "ejw5gwy0",
@@ -63,7 +65,6 @@ var isDifferent = function isDifferent(value, compare) {
 var ContentEntryForm = function ContentEntryForm(_ref) {
   var onForm = _ref.onForm,
       props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var contentModel = props.contentModel;
 
   var _useContentEntryForm = (0, _useContentEntryForm2.useContentEntryForm)(props),
       loading = _useContentEntryForm.loading,
@@ -72,6 +73,9 @@ var ContentEntryForm = function ContentEntryForm(_ref) {
       _onSubmit = _useContentEntryForm.onSubmit,
       invalidFields = _useContentEntryForm.invalidFields;
 
+  var _useModel = (0, _ModelProvider.useModel)(),
+      model = _useModel.model;
+
   var _React$useState = _react.default.useState(false),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
       isDirty = _React$useState2[0],
@@ -102,11 +106,11 @@ var ContentEntryForm = function ContentEntryForm(_ref) {
   }, []);
 
   var formRenderer = _plugins.plugins.byType("cms-content-form-renderer").find(function (pl) {
-    return pl.modelId === contentModel.modelId;
+    return pl.modelId === model.modelId;
   });
 
   var renderCustomLayout = (0, _react.useCallback)(function (formRenderProps) {
-    var fields = contentModel.fields.reduce(function (acc, field) {
+    var fields = model.fields.reduce(function (acc, field) {
       /**
        * TODO @ts-refactor
        * Figure out type for Bind.
@@ -114,17 +118,17 @@ var ContentEntryForm = function ContentEntryForm(_ref) {
       acc[field.fieldId] = /*#__PURE__*/_react.default.createElement(_RenderFieldElement.default, {
         field: field,
         Bind: formRenderProps.Bind,
-        contentModel: contentModel
+        contentModel: model
       });
       return acc;
     }, {});
 
     if (!formRenderer) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "Missing form renderer for modelId \"".concat(contentModel.modelId, "\"."));
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "Missing form renderer for modelId \"".concat(model.modelId, "\"."));
     }
 
     return formRenderer.render((0, _objectSpread2.default)((0, _objectSpread2.default)({}, formRenderProps), {}, {
-      contentModel: contentModel,
+      contentModel: model,
       fields: fields,
 
       /**
@@ -153,18 +157,20 @@ var ContentEntryForm = function ContentEntryForm(_ref) {
     invalidFields: invalidFields,
     onInvalid: function onInvalid() {
       setIsDirty(true);
-      showSnackbar("You have fields that did not pass the validation. Please check the form.");
+      showSnackbar("Some fields did not pass the validation. Please check the form.");
     }
   }, function (formProps) {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactRouter.Prompt, {
+    return /*#__PURE__*/_react.default.createElement(_ModelProvider.ModelProvider, {
+      model: model
+    }, /*#__PURE__*/_react.default.createElement(_reactRouter.Prompt, {
       when: isDirty,
       message: "There are some unsaved changes! Are you sure you want to navigate away and discard all changes?"
     }), /*#__PURE__*/_react.default.createElement(FormWrapper, {
       "data-testid": "cms-content-form"
     }, loading && /*#__PURE__*/_react.default.createElement(_Progress.CircularProgress, null), formRenderer ? renderCustomLayout(formProps) : /*#__PURE__*/_react.default.createElement(_Fields.Fields, Object.assign({
-      contentModel: contentModel,
-      fields: contentModel.fields || [],
-      layout: contentModel.layout || []
+      contentModel: model,
+      fields: model.fields || [],
+      layout: model.layout || []
     }, formProps, {
       Bind: formProps.Bind
     }))));

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

@@ -1 +1 @@
-{"version":3,"names":["FormWrapper","styled","height","overflow","omitTypename","key","value","undefined","stringify","JSON","isDifferent","compare","ContentEntryForm","onForm","props","contentModel","useContentEntryForm","loading","initialData","data","onChange","onSubmit","invalidFields","React","useState","isDirty","setIsDirty","useEffect","useSnackbar","showSnackbar","ref","useRef","current","formRenderer","plugins","byType","find","pl","modelId","renderCustomLayout","useCallback","formRenderProps","fields","reduce","acc","field","fieldId","Bind","render","form","different","formProps","layout"],"sources":["ContentEntryForm.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useRef } from \"react\";\nimport RenderFieldElement from \"./RenderFieldElement\";\nimport styled from \"@emotion/styled\";\nimport { Form } from \"@webiny/form\";\nimport { FormAPI, FormRenderPropParams } from \"@webiny/form/types\";\nimport { plugins } from \"@webiny/plugins\";\nimport { CircularProgress } from \"@webiny/ui/Progress\";\nimport { CmsContentFormRendererPlugin } from \"~/types\";\nimport { useContentEntryForm, UseContentEntryFormParams } from \"./useContentEntryForm\";\nimport { Fields } from \"./Fields\";\nimport { Prompt } from \"@webiny/react-router\";\nimport { useSnackbar } from \"@webiny/app-admin\";\n\nconst FormWrapper = styled(\"div\")({\n    height: \"calc(100vh - 260px)\",\n    overflow: \"auto\"\n});\n\ninterface ContentEntryFormProps extends UseContentEntryFormParams {\n    onForm?: (form: FormAPI) => void;\n}\n\nfunction omitTypename(key: string, value: string): string | undefined {\n    return key === \"__typename\" ? undefined : value;\n}\n\nconst stringify = (value: any): string => {\n    return JSON.stringify(value || {}, omitTypename);\n};\n\nconst isDifferent = (value: any, compare: any): boolean => {\n    if (!value && !compare) {\n        return false;\n    }\n    return stringify(value) !== stringify(compare);\n};\n\nexport const ContentEntryForm: React.FC<ContentEntryFormProps> = ({ onForm, ...props }) => {\n    const { contentModel } = props;\n    const {\n        loading,\n        data: initialData,\n        onChange,\n        onSubmit,\n        invalidFields\n    } = useContentEntryForm(props);\n\n    const [isDirty, setIsDirty] = React.useState<boolean>(false);\n    /**\n     * Reset isDirty when the loaded data changes.\n     */\n    useEffect(() => {\n        if (!isDirty) {\n            return;\n        }\n        setIsDirty(false);\n    }, [initialData]);\n\n    const { showSnackbar } = useSnackbar();\n\n    const ref = useRef<FormAPI | null>(null);\n\n    useEffect(() => {\n        if (typeof onForm !== \"function\" || !ref.current) {\n            return;\n        }\n        onForm(ref.current);\n    }, []);\n\n    const formRenderer = plugins\n        .byType<CmsContentFormRendererPlugin>(\"cms-content-form-renderer\")\n        .find(pl => pl.modelId === contentModel.modelId);\n\n    const renderCustomLayout = useCallback(\n        (formRenderProps: FormRenderPropParams) => {\n            const fields = contentModel.fields.reduce((acc, field) => {\n                /**\n                 * TODO @ts-refactor\n                 * Figure out type for Bind.\n                 */\n                acc[field.fieldId] = (\n                    <RenderFieldElement\n                        field={field}\n                        Bind={formRenderProps.Bind as any}\n                        contentModel={contentModel}\n                    />\n                );\n\n                return acc;\n            }, {} as Record<string, React.ReactElement>);\n            if (!formRenderer) {\n                return <>{`Missing form renderer for modelId \"${contentModel.modelId}\".`}</>;\n            }\n            return formRenderer.render({\n                ...formRenderProps,\n                contentModel,\n                fields,\n                /**\n                 * TODO @ts-refactor\n                 * Figure out type for Bind.\n                 */\n                Bind: formRenderProps.Bind as any\n            });\n        },\n        [formRenderer]\n    );\n\n    return (\n        <Form\n            onChange={(data, form) => {\n                const different = isDifferent(data, initialData);\n                if (isDirty !== different) {\n                    setIsDirty(different);\n                }\n                return onChange(data, form);\n            }}\n            onSubmit={(data, form) => {\n                setIsDirty(false);\n                return onSubmit(data, form);\n            }}\n            data={initialData}\n            ref={ref}\n            invalidFields={invalidFields}\n            onInvalid={() => {\n                setIsDirty(true);\n                showSnackbar(\n                    \"You have fields that did not pass the validation. Please check the form.\"\n                );\n            }}\n        >\n            {formProps => {\n                return (\n                    <>\n                        <Prompt\n                            when={isDirty}\n                            message={\n                                \"There are some unsaved changes! Are you sure you want to navigate away and discard all changes?\"\n                            }\n                        />\n                        <FormWrapper data-testid={\"cms-content-form\"}>\n                            {loading && <CircularProgress />}\n                            {formRenderer ? (\n                                renderCustomLayout(formProps)\n                            ) : (\n                                <Fields\n                                    contentModel={contentModel}\n                                    fields={contentModel.fields || []}\n                                    layout={contentModel.layout || []}\n                                    {...formProps}\n                                    Bind={formProps.Bind as any}\n                                />\n                            )}\n                        </FormWrapper>\n                    </>\n                );\n            }}\n        </Form>\n    );\n};\n"],"mappings":"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"}
+{"version":3,"names":["FormWrapper","styled","height","overflow","omitTypename","key","value","undefined","stringify","JSON","isDifferent","compare","ContentEntryForm","onForm","props","useContentEntryForm","loading","initialData","data","onChange","onSubmit","invalidFields","useModel","model","React","useState","isDirty","setIsDirty","useEffect","useSnackbar","showSnackbar","ref","useRef","current","formRenderer","plugins","byType","find","pl","modelId","renderCustomLayout","useCallback","formRenderProps","fields","reduce","acc","field","fieldId","Bind","render","contentModel","form","different","formProps","layout"],"sources":["ContentEntryForm.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useRef } from \"react\";\nimport RenderFieldElement from \"./RenderFieldElement\";\nimport styled from \"@emotion/styled\";\nimport { Form } from \"@webiny/form\";\nimport { FormAPI, FormRenderPropParams } from \"@webiny/form/types\";\nimport { plugins } from \"@webiny/plugins\";\nimport { CircularProgress } from \"@webiny/ui/Progress\";\nimport { CmsContentFormRendererPlugin } from \"~/types\";\nimport { useContentEntryForm, UseContentEntryFormParams } from \"./useContentEntryForm\";\nimport { Fields } from \"./Fields\";\nimport { Prompt } from \"@webiny/react-router\";\nimport { useSnackbar } from \"@webiny/app-admin\";\nimport { ModelProvider, useModel } from \"~/admin/components/ModelProvider\";\n\nconst FormWrapper = styled(\"div\")({\n    height: \"calc(100vh - 260px)\",\n    overflow: \"auto\"\n});\n\ninterface ContentEntryFormProps extends UseContentEntryFormParams {\n    onForm?: (form: FormAPI) => void;\n}\n\nfunction omitTypename(key: string, value: string): string | undefined {\n    return key === \"__typename\" ? undefined : value;\n}\n\nconst stringify = (value: any): string => {\n    return JSON.stringify(value || {}, omitTypename);\n};\n\nconst isDifferent = (value: any, compare: any): boolean => {\n    if (!value && !compare) {\n        return false;\n    }\n    return stringify(value) !== stringify(compare);\n};\n\nexport const ContentEntryForm: React.FC<ContentEntryFormProps> = ({ onForm, ...props }) => {\n    const {\n        loading,\n        data: initialData,\n        onChange,\n        onSubmit,\n        invalidFields\n    } = useContentEntryForm(props);\n    const { model } = useModel();\n\n    const [isDirty, setIsDirty] = React.useState<boolean>(false);\n    /**\n     * Reset isDirty when the loaded data changes.\n     */\n    useEffect(() => {\n        if (!isDirty) {\n            return;\n        }\n        setIsDirty(false);\n    }, [initialData]);\n\n    const { showSnackbar } = useSnackbar();\n\n    const ref = useRef<FormAPI | null>(null);\n\n    useEffect(() => {\n        if (typeof onForm !== \"function\" || !ref.current) {\n            return;\n        }\n        onForm(ref.current);\n    }, []);\n\n    const formRenderer = plugins\n        .byType<CmsContentFormRendererPlugin>(\"cms-content-form-renderer\")\n        .find(pl => pl.modelId === model.modelId);\n\n    const renderCustomLayout = useCallback(\n        (formRenderProps: FormRenderPropParams) => {\n            const fields = model.fields.reduce((acc, field) => {\n                /**\n                 * TODO @ts-refactor\n                 * Figure out type for Bind.\n                 */\n                acc[field.fieldId] = (\n                    <RenderFieldElement\n                        field={field}\n                        Bind={formRenderProps.Bind as any}\n                        contentModel={model}\n                    />\n                );\n\n                return acc;\n            }, {} as Record<string, React.ReactElement>);\n            if (!formRenderer) {\n                return <>{`Missing form renderer for modelId \"${model.modelId}\".`}</>;\n            }\n            return formRenderer.render({\n                ...formRenderProps,\n                contentModel: model,\n                fields,\n                /**\n                 * TODO @ts-refactor\n                 * Figure out type for Bind.\n                 */\n                Bind: formRenderProps.Bind as any\n            });\n        },\n        [formRenderer]\n    );\n\n    return (\n        <Form\n            onChange={(data, form) => {\n                const different = isDifferent(data, initialData);\n                if (isDirty !== different) {\n                    setIsDirty(different);\n                }\n                return onChange(data, form);\n            }}\n            onSubmit={(data, form) => {\n                setIsDirty(false);\n                return onSubmit(data, form);\n            }}\n            data={initialData}\n            ref={ref}\n            invalidFields={invalidFields}\n            onInvalid={() => {\n                setIsDirty(true);\n                showSnackbar(\"Some fields did not pass the validation. Please check the form.\");\n            }}\n        >\n            {formProps => {\n                return (\n                    <ModelProvider model={model}>\n                        <Prompt\n                            when={isDirty}\n                            message={\n                                \"There are some unsaved changes! Are you sure you want to navigate away and discard all changes?\"\n                            }\n                        />\n                        <FormWrapper data-testid={\"cms-content-form\"}>\n                            {loading && <CircularProgress />}\n                            {formRenderer ? (\n                                renderCustomLayout(formProps)\n                            ) : (\n                                <Fields\n                                    contentModel={model}\n                                    fields={model.fields || []}\n                                    layout={model.layout || []}\n                                    {...formProps}\n                                    Bind={formProps.Bind as any}\n                                />\n                            )}\n                        </FormWrapper>\n                    </ModelProvider>\n                );\n            }}\n        </Form>\n    );\n};\n"],"mappings":"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"}

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

@@ -1,9 +1,9 @@
 import React from "react";
-import { CmsEditorContentModel, CmsEditorField, CmsEditorFieldsLayout, BindComponent } from "../../../types";
+import { CmsEditorContentModel, CmsModelField, CmsEditorFieldsLayout, BindComponent } from "../../../types";
 interface FieldsProps {
     Bind: BindComponent;
     contentModel: CmsEditorContentModel;
-    fields: CmsEditorField[];
+    fields: CmsModelField[];
     layout: CmsEditorFieldsLayout;
     gridClassName?: string;
 }

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

@@ -1 +1 @@
-{"version":3,"names":["getFieldById","fields","id","find","field","Fields","Bind","layout","contentModel","gridClassName","map","row","rowIndex","fieldId","Math","floor","length"],"sources":["Fields.tsx"],"sourcesContent":["import React from \"react\";\nimport { Cell, Grid } from \"@webiny/ui/Grid\";\nimport RenderFieldElement from \"./RenderFieldElement\";\nimport {\n    CmsEditorContentModel,\n    CmsEditorField,\n    CmsEditorFieldsLayout,\n    BindComponent\n} from \"~/types\";\n\ninterface FieldsProps {\n    Bind: BindComponent;\n    contentModel: CmsEditorContentModel;\n    fields: CmsEditorField[];\n    layout: CmsEditorFieldsLayout;\n    gridClassName?: string;\n}\n\nconst getFieldById = (fields: CmsEditorField[], id: string): CmsEditorField | null => {\n    return fields.find(field => field.id === id) || null;\n};\n\nexport const Fields: React.FC<FieldsProps> = ({\n    Bind,\n    fields,\n    layout,\n    contentModel,\n    gridClassName\n}) => {\n    return (\n        <Grid className={gridClassName}>\n            {layout.map((row, rowIndex) => (\n                <React.Fragment key={rowIndex}>\n                    {row.map(fieldId => (\n                        <Cell span={Math.floor(12 / row.length)} key={fieldId}>\n                            <RenderFieldElement\n                                field={getFieldById(fields, fieldId) as CmsEditorField}\n                                Bind={Bind}\n                                contentModel={contentModel}\n                            />\n                        </Cell>\n                    ))}\n                </React.Fragment>\n            ))}\n        </Grid>\n    );\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAgBA,IAAMA,YAAY,GAAG,SAAfA,YAAe,CAACC,MAAD,EAA2BC,EAA3B,EAAiE;EAClF,OAAOD,MAAM,CAACE,IAAP,CAAY,UAAAC,KAAK;IAAA,OAAIA,KAAK,CAACF,EAAN,KAAaA,EAAjB;EAAA,CAAjB,KAAyC,IAAhD;AACH,CAFD;;AAIO,IAAMG,MAA6B,GAAG,SAAhCA,MAAgC,OAMvC;EAAA,IALFC,IAKE,QALFA,IAKE;EAAA,IAJFL,MAIE,QAJFA,MAIE;EAAA,IAHFM,MAGE,QAHFA,MAGE;EAAA,IAFFC,YAEE,QAFFA,YAEE;EAAA,IADFC,aACE,QADFA,aACE;EACF,oBACI,6BAAC,UAAD;IAAM,SAAS,EAAEA;EAAjB,GACKF,MAAM,CAACG,GAAP,CAAW,UAACC,GAAD,EAAMC,QAAN;IAAA,oBACR,6BAAC,cAAD,CAAO,QAAP;MAAgB,GAAG,EAAEA;IAArB,GACKD,GAAG,CAACD,GAAJ,CAAQ,UAAAG,OAAO;MAAA,oBACZ,6BAAC,UAAD;QAAM,IAAI,EAAEC,IAAI,CAACC,KAAL,CAAW,KAAKJ,GAAG,CAACK,MAApB,CAAZ;QAAyC,GAAG,EAAEH;MAA9C,gBACI,6BAAC,2BAAD;QACI,KAAK,EAAEb,YAAY,CAACC,MAAD,EAASY,OAAT,CADvB;QAEI,IAAI,EAAEP,IAFV;QAGI,YAAY,EAAEE;MAHlB,EADJ,CADY;IAAA,CAAf,CADL,CADQ;EAAA,CAAX,CADL,CADJ;AAiBH,CAxBM"}
+{"version":3,"names":["getFieldById","fields","id","find","field","Fields","Bind","layout","contentModel","gridClassName","map","row","rowIndex","fieldId","Math","floor","length"],"sources":["Fields.tsx"],"sourcesContent":["import React from \"react\";\nimport { Cell, Grid } from \"@webiny/ui/Grid\";\nimport RenderFieldElement from \"./RenderFieldElement\";\nimport {\n    CmsEditorContentModel,\n    CmsModelField,\n    CmsEditorFieldsLayout,\n    BindComponent\n} from \"~/types\";\n\ninterface FieldsProps {\n    Bind: BindComponent;\n    contentModel: CmsEditorContentModel;\n    fields: CmsModelField[];\n    layout: CmsEditorFieldsLayout;\n    gridClassName?: string;\n}\n\nconst getFieldById = (fields: CmsModelField[], id: string): CmsModelField | null => {\n    return fields.find(field => field.id === id) || null;\n};\n\nexport const Fields: React.FC<FieldsProps> = ({\n    Bind,\n    fields,\n    layout,\n    contentModel,\n    gridClassName\n}) => {\n    return (\n        <Grid className={gridClassName}>\n            {layout.map((row, rowIndex) => (\n                <React.Fragment key={rowIndex}>\n                    {row.map(fieldId => (\n                        <Cell span={Math.floor(12 / row.length)} key={fieldId}>\n                            <RenderFieldElement\n                                field={getFieldById(fields, fieldId) as CmsModelField}\n                                Bind={Bind}\n                                contentModel={contentModel}\n                            />\n                        </Cell>\n                    ))}\n                </React.Fragment>\n            ))}\n        </Grid>\n    );\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAgBA,IAAMA,YAAY,GAAG,SAAfA,YAAe,CAACC,MAAD,EAA0BC,EAA1B,EAA+D;EAChF,OAAOD,MAAM,CAACE,IAAP,CAAY,UAAAC,KAAK;IAAA,OAAIA,KAAK,CAACF,EAAN,KAAaA,EAAjB;EAAA,CAAjB,KAAyC,IAAhD;AACH,CAFD;;AAIO,IAAMG,MAA6B,GAAG,SAAhCA,MAAgC,OAMvC;EAAA,IALFC,IAKE,QALFA,IAKE;EAAA,IAJFL,MAIE,QAJFA,MAIE;EAAA,IAHFM,MAGE,QAHFA,MAGE;EAAA,IAFFC,YAEE,QAFFA,YAEE;EAAA,IADFC,aACE,QADFA,aACE;EACF,oBACI,6BAAC,UAAD;IAAM,SAAS,EAAEA;EAAjB,GACKF,MAAM,CAACG,GAAP,CAAW,UAACC,GAAD,EAAMC,QAAN;IAAA,oBACR,6BAAC,cAAD,CAAO,QAAP;MAAgB,GAAG,EAAEA;IAArB,GACKD,GAAG,CAACD,GAAJ,CAAQ,UAAAG,OAAO;MAAA,oBACZ,6BAAC,UAAD;QAAM,IAAI,EAAEC,IAAI,CAACC,KAAL,CAAW,KAAKJ,GAAG,CAACK,MAApB,CAAZ;QAAyC,GAAG,EAAEH;MAA9C,gBACI,6BAAC,2BAAD;QACI,KAAK,EAAEb,YAAY,CAACC,MAAD,EAASY,OAAT,CADvB;QAEI,IAAI,EAAEP,IAFV;QAGI,YAAY,EAAEE;MAHlB,EADJ,CADY;IAAA,CAAf,CADL,CADQ;EAAA,CAAX,CADL,CADJ;AAiBH,CAxBM"}

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

@@ -1,7 +1,7 @@
 import React from "react";
-import { CmsEditorField, CmsEditorContentModel, BindComponent } from "../../../types";
+import { CmsModelField, CmsEditorContentModel, BindComponent } from "../../../types";
 interface RenderFieldElementProps {
-    field: CmsEditorField;
+    field: CmsModelField;
     Bind: BindComponent;
     contentModel: CmsEditorContentModel;
 }

package/admin/components/ContentEntryForm/RenderFieldElement.js

@@ -21,6 +21,8 @@ var _useBind = require("./useBind");
 
 var _useRenderPlugins = require("./useRenderPlugins");
 
+var _ModelFieldProvider = require("../ModelFieldProvider");
+
 var _templateObject;
 
 var t = _i18n.i18n.ns("app-headless-cms/admin/components/content-form");
@@ -44,12 +46,14 @@ var RenderFieldElement = function RenderFieldElement(props) {
     });
   }
 
-  return renderPlugin.renderer.render({
+  return /*#__PURE__*/_react.default.createElement(_ModelFieldProvider.ModelFieldProvider, {
+    field: field
+  }, renderPlugin.renderer.render({
     field: field,
     getBind: getBind,
     Label: _Label.default,
     contentModel: contentModel
-  });
+  }));
 };
 
 var _default = RenderFieldElement;

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

@@ -1 +1 @@
-{"version":3,"names":["t","i18n","ns","RenderFieldElement","props","renderPlugins","useRenderPlugins","field","Bind","contentModel","getBind","useBind","renderPlugin","find","plugin","renderer","rendererName","get","fieldName","fieldId","render","Label"],"sources":["RenderFieldElement.tsx"],"sourcesContent":["import React from \"react\";\nimport { CmsEditorField, CmsEditorContentModel, BindComponent } from \"~/types\";\nimport get from \"lodash/get\";\nimport { i18n } from \"@webiny/app/i18n\";\nimport Label from \"./Label\";\nimport { useBind } from \"./useBind\";\nimport { useRenderPlugins } from \"./useRenderPlugins\";\n\nconst t = i18n.ns(\"app-headless-cms/admin/components/content-form\");\n\ninterface RenderFieldElementProps {\n    field: CmsEditorField;\n    Bind: BindComponent;\n    contentModel: CmsEditorContentModel;\n}\nconst RenderFieldElement: React.FC<RenderFieldElementProps> = props => {\n    const renderPlugins = useRenderPlugins();\n    const { field, Bind, contentModel } = props;\n    const getBind = useBind({ Bind, field });\n\n    const renderPlugin = renderPlugins.find(\n        plugin => plugin.renderer.rendererName === get(field, \"renderer.name\")\n    );\n\n    if (!renderPlugin) {\n        return t`Cannot render \"{fieldName}\" field - field renderer missing.`({\n            fieldName: <strong>{field.fieldId}</strong>\n        });\n    }\n\n    return renderPlugin.renderer.render({ field, getBind, Label, contentModel });\n};\n\nexport default RenderFieldElement;\n"],"mappings":";;;;;;;;;;;AAAA;;AAEA;;AACA;;AACA;;AACA;;AACA;;;;AAEA,IAAMA,CAAC,GAAGC,UAAA,CAAKC,EAAL,CAAQ,gDAAR,CAAV;;AAOA,IAAMC,kBAAqD,GAAG,SAAxDA,kBAAwD,CAAAC,KAAK,EAAI;EACnE,IAAMC,aAAa,GAAG,IAAAC,kCAAA,GAAtB;EACA,IAAQC,KAAR,GAAsCH,KAAtC,CAAQG,KAAR;EAAA,IAAeC,IAAf,GAAsCJ,KAAtC,CAAeI,IAAf;EAAA,IAAqBC,YAArB,GAAsCL,KAAtC,CAAqBK,YAArB;EACA,IAAMC,OAAO,GAAG,IAAAC,gBAAA,EAAQ;IAAEH,IAAI,EAAJA,IAAF;IAAQD,KAAK,EAALA;EAAR,CAAR,CAAhB;EAEA,IAAMK,YAAY,GAAGP,aAAa,CAACQ,IAAd,CACjB,UAAAC,MAAM;IAAA,OAAIA,MAAM,CAACC,QAAP,CAAgBC,YAAhB,KAAiC,IAAAC,YAAA,EAAIV,KAAJ,EAAW,eAAX,CAArC;EAAA,CADW,CAArB;;EAIA,IAAI,CAACK,YAAL,EAAmB;IACf,OAAOZ,CAAC,gJAAD,CAA+D;MAClEkB,SAAS,eAAE,6CAASX,KAAK,CAACY,OAAf;IADuD,CAA/D,CAAP;EAGH;;EAED,OAAOP,YAAY,CAACG,QAAb,CAAsBK,MAAtB,CAA6B;IAAEb,KAAK,EAALA,KAAF;IAASG,OAAO,EAAPA,OAAT;IAAkBW,KAAK,EAALA,cAAlB;IAAyBZ,YAAY,EAAZA;EAAzB,CAA7B,CAAP;AACH,CAhBD;;eAkBeN,kB"}
+{"version":3,"names":["t","i18n","ns","RenderFieldElement","props","renderPlugins","useRenderPlugins","field","Bind","contentModel","getBind","useBind","renderPlugin","find","plugin","renderer","rendererName","get","fieldName","fieldId","render","Label"],"sources":["RenderFieldElement.tsx"],"sourcesContent":["import React from \"react\";\nimport { CmsModelField, CmsEditorContentModel, BindComponent } from \"~/types\";\nimport get from \"lodash/get\";\nimport { i18n } from \"@webiny/app/i18n\";\nimport Label from \"./Label\";\nimport { useBind } from \"./useBind\";\nimport { useRenderPlugins } from \"./useRenderPlugins\";\nimport { ModelFieldProvider } from \"../ModelFieldProvider\";\n\nconst t = i18n.ns(\"app-headless-cms/admin/components/content-form\");\n\ninterface RenderFieldElementProps {\n    field: CmsModelField;\n    Bind: BindComponent;\n    contentModel: CmsEditorContentModel;\n}\n\nconst RenderFieldElement: React.FC<RenderFieldElementProps> = props => {\n    const renderPlugins = useRenderPlugins();\n    const { field, Bind, contentModel } = props;\n    const getBind = useBind({ Bind, field });\n\n    const renderPlugin = renderPlugins.find(\n        plugin => plugin.renderer.rendererName === get(field, \"renderer.name\")\n    );\n\n    if (!renderPlugin) {\n        return t`Cannot render \"{fieldName}\" field - field renderer missing.`({\n            fieldName: <strong>{field.fieldId}</strong>\n        });\n    }\n\n    return (\n        <ModelFieldProvider field={field}>\n            {renderPlugin.renderer.render({ field, getBind, Label, contentModel })}\n        </ModelFieldProvider>\n    );\n};\n\nexport default RenderFieldElement;\n"],"mappings":";;;;;;;;;;;AAAA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;AAEA,IAAMA,CAAC,GAAGC,UAAA,CAAKC,EAAL,CAAQ,gDAAR,CAAV;;AAQA,IAAMC,kBAAqD,GAAG,SAAxDA,kBAAwD,CAAAC,KAAK,EAAI;EACnE,IAAMC,aAAa,GAAG,IAAAC,kCAAA,GAAtB;EACA,IAAQC,KAAR,GAAsCH,KAAtC,CAAQG,KAAR;EAAA,IAAeC,IAAf,GAAsCJ,KAAtC,CAAeI,IAAf;EAAA,IAAqBC,YAArB,GAAsCL,KAAtC,CAAqBK,YAArB;EACA,IAAMC,OAAO,GAAG,IAAAC,gBAAA,EAAQ;IAAEH,IAAI,EAAJA,IAAF;IAAQD,KAAK,EAALA;EAAR,CAAR,CAAhB;EAEA,IAAMK,YAAY,GAAGP,aAAa,CAACQ,IAAd,CACjB,UAAAC,MAAM;IAAA,OAAIA,MAAM,CAACC,QAAP,CAAgBC,YAAhB,KAAiC,IAAAC,YAAA,EAAIV,KAAJ,EAAW,eAAX,CAArC;EAAA,CADW,CAArB;;EAIA,IAAI,CAACK,YAAL,EAAmB;IACf,OAAOZ,CAAC,gJAAD,CAA+D;MAClEkB,SAAS,eAAE,6CAASX,KAAK,CAACY,OAAf;IADuD,CAA/D,CAAP;EAGH;;EAED,oBACI,6BAAC,sCAAD;IAAoB,KAAK,EAAEZ;EAA3B,GACKK,YAAY,CAACG,QAAb,CAAsBK,MAAtB,CAA6B;IAAEb,KAAK,EAALA,KAAF;IAASG,OAAO,EAAPA,OAAT;IAAkBW,KAAK,EAALA,cAAlB;IAAyBZ,YAAY,EAAZA;EAAzB,CAA7B,CADL,CADJ;AAKH,CApBD;;eAsBeN,kB"}

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

@@ -1,3 +1,3 @@
-import { CmsEditorFieldValidator } from "../../../../types";
+import { CmsModelField, CmsEditorFieldValidator } from "../../../../types";
 import { Validator } from "@webiny/validation/types";
-export declare const createValidators: (validation: CmsEditorFieldValidator[]) => Validator[];
+export declare const createValidators: (field: CmsModelField, validation: CmsEditorFieldValidator[]) => Validator[];

package/admin/components/ContentEntryForm/functions/createValidators.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _plugins = require("@webiny/plugins");
 
-var createValidators = function createValidators(validation) {
+var createValidators = function createValidators(field, validation) {
   var validatorPlugins = _plugins.plugins.byType("cms-model-field-validator");
 
   return validation.reduce(function (collection, item) {
@@ -27,40 +27,45 @@ var createValidators = function createValidators(validation) {
 
     var validator = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
-        var isInvalid, result;
+        var isInvalid, message, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.prev = 0;
-                _context.next = 3;
-                return validatorPlugin.validator.validate(value, item);
+                message = item.message;
+                _context.prev = 1;
+                _context.next = 4;
+                return validatorPlugin.validator.validate(value, item, field);
 
-              case 3:
+              case 4:
                 result = _context.sent;
                 isInvalid = result === false;
-                _context.next = 10;
+                _context.next = 12;
                 break;
 
-              case 7:
-                _context.prev = 7;
-                _context.t0 = _context["catch"](0);
+              case 8:
+                _context.prev = 8;
+                _context.t0 = _context["catch"](1);
                 isInvalid = true;
 
-              case 10:
+                if (_context.t0.message && !item.message) {
+                  message = _context.t0.message;
+                }
+
+              case 12:
                 if (!isInvalid) {
-                  _context.next = 12;
+                  _context.next = 14;
                   break;
                 }
 
-                throw new Error(item.message || "Invalid value.");
+                throw new Error(message || "Invalid value.");
 
-              case 12:
+              case 14:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[0, 7]]);
+        }, _callee, null, [[1, 8]]);
       }));
 
       return function validator(_x) {

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

@@ -1 +1 @@
-{"version":3,"names":["createValidators","validation","validatorPlugins","plugins","byType","reduce","collection","item","validatorPlugin","find","plugin","validator","name","validate","value","result","isInvalid","Error","message","push"],"sources":["createValidators.ts"],"sourcesContent":["import { plugins } from \"@webiny/plugins\";\nimport { CmsEditorFieldValidator, CmsModelFieldValidatorPlugin } from \"~/types\";\nimport { Validator } from \"@webiny/validation/types\";\n\nexport const createValidators = (validation: CmsEditorFieldValidator[]): Validator[] => {\n    const validatorPlugins = plugins.byType<CmsModelFieldValidatorPlugin>(\n        \"cms-model-field-validator\"\n    );\n\n    return validation.reduce((collection, item) => {\n        const validatorPlugin = validatorPlugins.find(\n            plugin => plugin.validator.name === item.name\n        );\n\n        if (!validatorPlugin || typeof validatorPlugin.validator.validate !== \"function\") {\n            return collection;\n        }\n\n        const validator = async (value: string | string[]) => {\n            let isInvalid;\n            try {\n                const result = await validatorPlugin.validator.validate(value, item);\n                isInvalid = result === false;\n            } catch (e) {\n                isInvalid = true;\n            }\n\n            if (isInvalid) {\n                throw new Error(item.message || \"Invalid value.\");\n            }\n        };\n        collection.push(validator);\n        return collection;\n    }, [] as Validator[]);\n};\n"],"mappings":";;;;;;;;;;;;;AAAA;;AAIO,IAAMA,gBAAgB,GAAG,SAAnBA,gBAAmB,CAACC,UAAD,EAAwD;EACpF,IAAMC,gBAAgB,GAAGC,gBAAA,CAAQC,MAAR,CACrB,2BADqB,CAAzB;;EAIA,OAAOH,UAAU,CAACI,MAAX,CAAkB,UAACC,UAAD,EAAaC,IAAb,EAAsB;IAC3C,IAAMC,eAAe,GAAGN,gBAAgB,CAACO,IAAjB,CACpB,UAAAC,MAAM;MAAA,OAAIA,MAAM,CAACC,SAAP,CAAiBC,IAAjB,KAA0BL,IAAI,CAACK,IAAnC;IAAA,CADc,CAAxB;;IAIA,IAAI,CAACJ,eAAD,IAAoB,OAAOA,eAAe,CAACG,SAAhB,CAA0BE,QAAjC,KAA8C,UAAtE,EAAkF;MAC9E,OAAOP,UAAP;IACH;;IAED,IAAMK,SAAS;MAAA,kGAAG,iBAAOG,KAAP;QAAA;QAAA;UAAA;YAAA;cAAA;gBAAA;gBAAA;gBAAA,OAGWN,eAAe,CAACG,SAAhB,CAA0BE,QAA1B,CAAmCC,KAAnC,EAA0CP,IAA1C,CAHX;;cAAA;gBAGJQ,MAHI;gBAIVC,SAAS,GAAGD,MAAM,KAAK,KAAvB;gBAJU;gBAAA;;cAAA;gBAAA;gBAAA;gBAMVC,SAAS,GAAG,IAAZ;;cANU;gBAAA,KASVA,SATU;kBAAA;kBAAA;gBAAA;;gBAAA,MAUJ,IAAIC,KAAJ,CAAUV,IAAI,CAACW,OAAL,IAAgB,gBAA1B,CAVI;;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA,CAAH;;MAAA,gBAATP,SAAS;QAAA;MAAA;IAAA,GAAf;;IAaAL,UAAU,CAACa,IAAX,CAAgBR,SAAhB;IACA,OAAOL,UAAP;EACH,CAxBM,EAwBJ,EAxBI,CAAP;AAyBH,CA9BM"}
+{"version":3,"names":["createValidators","field","validation","validatorPlugins","plugins","byType","reduce","collection","item","validatorPlugin","find","plugin","validator","name","validate","value","message","result","isInvalid","Error","push"],"sources":["createValidators.ts"],"sourcesContent":["import { plugins } from \"@webiny/plugins\";\nimport { CmsModelField, CmsEditorFieldValidator, CmsModelFieldValidatorPlugin } from \"~/types\";\nimport { Validator } from \"@webiny/validation/types\";\n\nexport const createValidators = (\n    field: CmsModelField,\n    validation: CmsEditorFieldValidator[]\n): Validator[] => {\n    const validatorPlugins = plugins.byType<CmsModelFieldValidatorPlugin>(\n        \"cms-model-field-validator\"\n    );\n\n    return validation.reduce((collection, item) => {\n        const validatorPlugin = validatorPlugins.find(\n            plugin => plugin.validator.name === item.name\n        );\n\n        if (!validatorPlugin || typeof validatorPlugin.validator.validate !== \"function\") {\n            return collection;\n        }\n\n        const validator = async (value: any | any[]) => {\n            let isInvalid;\n            let message = item.message;\n            try {\n                const result = await validatorPlugin.validator.validate(value, item, field);\n                isInvalid = result === false;\n            } catch (e) {\n                isInvalid = true;\n                if (e.message && !item.message) {\n                    message = e.message;\n                }\n            }\n\n            if (isInvalid) {\n                throw new Error(message || \"Invalid value.\");\n            }\n        };\n        collection.push(validator);\n        return collection;\n    }, [] as Validator[]);\n};\n"],"mappings":";;;;;;;;;;;;;AAAA;;AAIO,IAAMA,gBAAgB,GAAG,SAAnBA,gBAAmB,CAC5BC,KAD4B,EAE5BC,UAF4B,EAGd;EACd,IAAMC,gBAAgB,GAAGC,gBAAA,CAAQC,MAAR,CACrB,2BADqB,CAAzB;;EAIA,OAAOH,UAAU,CAACI,MAAX,CAAkB,UAACC,UAAD,EAAaC,IAAb,EAAsB;IAC3C,IAAMC,eAAe,GAAGN,gBAAgB,CAACO,IAAjB,CACpB,UAAAC,MAAM;MAAA,OAAIA,MAAM,CAACC,SAAP,CAAiBC,IAAjB,KAA0BL,IAAI,CAACK,IAAnC;IAAA,CADc,CAAxB;;IAIA,IAAI,CAACJ,eAAD,IAAoB,OAAOA,eAAe,CAACG,SAAhB,CAA0BE,QAAjC,KAA8C,UAAtE,EAAkF;MAC9E,OAAOP,UAAP;IACH;;IAED,IAAMK,SAAS;MAAA,kGAAG,iBAAOG,KAAP;QAAA;QAAA;UAAA;YAAA;cAAA;gBAEVC,OAFU,GAEAR,IAAI,CAACQ,OAFL;gBAAA;gBAAA;gBAAA,OAIWP,eAAe,CAACG,SAAhB,CAA0BE,QAA1B,CAAmCC,KAAnC,EAA0CP,IAA1C,EAAgDP,KAAhD,CAJX;;cAAA;gBAIJgB,MAJI;gBAKVC,SAAS,GAAGD,MAAM,KAAK,KAAvB;gBALU;gBAAA;;cAAA;gBAAA;gBAAA;gBAOVC,SAAS,GAAG,IAAZ;;gBACA,IAAI,YAAEF,OAAF,IAAa,CAACR,IAAI,CAACQ,OAAvB,EAAgC;kBAC5BA,OAAO,GAAG,YAAEA,OAAZ;gBACH;;cAVS;gBAAA,KAaVE,SAbU;kBAAA;kBAAA;gBAAA;;gBAAA,MAcJ,IAAIC,KAAJ,CAAUH,OAAO,IAAI,gBAArB,CAdI;;cAAA;cAAA;gBAAA;YAAA;UAAA;QAAA;MAAA,CAAH;;MAAA,gBAATJ,SAAS;QAAA;MAAA;IAAA,GAAf;;IAiBAL,UAAU,CAACa,IAAX,CAAgBR,SAAhB;IACA,OAAOL,UAAP;EACH,CA5BM,EA4BJ,EA5BI,CAAP;AA6BH,CArCM"}

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

@@ -1,8 +1,8 @@
-import { CmsEditorField } from "../../../../types";
+import { CmsModelField } from "../../../../types";
 import { BindComponentRenderProp } from "@webiny/form";
 interface GetValueParams {
     bind: BindComponentRenderProp;
-    field: Pick<CmsEditorField, "multipleValues">;
+    field: Pick<CmsModelField, "multipleValues">;
     index: number;
 }
 export declare const getValue: (params: GetValueParams) => string;

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

@@ -1 +1 @@
-{"version":3,"names":["getValue","params","bind","field","index","value","multipleValues","Array","isArray"],"sources":["getValue.ts"],"sourcesContent":["import { CmsEditorField } from \"~/types\";\nimport { BindComponentRenderProp } from \"@webiny/form\";\n\ninterface GetValueParams {\n    bind: BindComponentRenderProp;\n    field: Pick<CmsEditorField, \"multipleValues\">;\n    index: number;\n}\nexport const getValue = (params: GetValueParams): string => {\n    const { bind, field, index } = params;\n    let value = bind.value || null;\n\n    if (field.multipleValues) {\n        if (!Array.isArray(value)) {\n            value = [];\n        }\n\n        if (index >= 0) {\n            return value[index] || null;\n        }\n\n        return value;\n    }\n\n    return value;\n};\n"],"mappings":";;;;;;;AAQO,IAAMA,QAAQ,GAAG,SAAXA,QAAW,CAACC,MAAD,EAAoC;EACxD,IAAQC,IAAR,GAA+BD,MAA/B,CAAQC,IAAR;EAAA,IAAcC,KAAd,GAA+BF,MAA/B,CAAcE,KAAd;EAAA,IAAqBC,KAArB,GAA+BH,MAA/B,CAAqBG,KAArB;EACA,IAAIC,KAAK,GAAGH,IAAI,CAACG,KAAL,IAAc,IAA1B;;EAEA,IAAIF,KAAK,CAACG,cAAV,EAA0B;IACtB,IAAI,CAACC,KAAK,CAACC,OAAN,CAAcH,KAAd,CAAL,EAA2B;MACvBA,KAAK,GAAG,EAAR;IACH;;IAED,IAAID,KAAK,IAAI,CAAb,EAAgB;MACZ,OAAOC,KAAK,CAACD,KAAD,CAAL,IAAgB,IAAvB;IACH;;IAED,OAAOC,KAAP;EACH;;EAED,OAAOA,KAAP;AACH,CAjBM"}
+{"version":3,"names":["getValue","params","bind","field","index","value","multipleValues","Array","isArray"],"sources":["getValue.ts"],"sourcesContent":["import { CmsModelField } from \"~/types\";\nimport { BindComponentRenderProp } from \"@webiny/form\";\n\ninterface GetValueParams {\n    bind: BindComponentRenderProp;\n    field: Pick<CmsModelField, \"multipleValues\">;\n    index: number;\n}\nexport const getValue = (params: GetValueParams): string => {\n    const { bind, field, index } = params;\n    let value = bind.value || null;\n\n    if (field.multipleValues) {\n        if (!Array.isArray(value)) {\n            value = [];\n        }\n\n        if (index >= 0) {\n            return value[index] || null;\n        }\n\n        return value;\n    }\n\n    return value;\n};\n"],"mappings":";;;;;;;AAQO,IAAMA,QAAQ,GAAG,SAAXA,QAAW,CAACC,MAAD,EAAoC;EACxD,IAAQC,IAAR,GAA+BD,MAA/B,CAAQC,IAAR;EAAA,IAAcC,KAAd,GAA+BF,MAA/B,CAAcE,KAAd;EAAA,IAAqBC,KAArB,GAA+BH,MAA/B,CAAqBG,KAArB;EACA,IAAIC,KAAK,GAAGH,IAAI,CAACG,KAAL,IAAc,IAA1B;;EAEA,IAAIF,KAAK,CAACG,cAAV,EAA0B;IACtB,IAAI,CAACC,KAAK,CAACC,OAAN,CAAcH,KAAd,CAAL,EAA2B;MACvBA,KAAK,GAAG,EAAR;IACH;;IAED,IAAID,KAAK,IAAI,CAAb,EAAgB;MACZ,OAAOC,KAAK,CAACD,KAAD,CAAL,IAAgB,IAAvB;IACH;;IAED,OAAOC,KAAP;EACH;;EAED,OAAOA,KAAP;AACH,CAjBM"}

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

@@ -1,9 +1,9 @@
-import { CmsEditorField } from "../../../../types";
+import { CmsModelField } from "../../../../types";
 import { BindComponentRenderProp } from "@webiny/form";
 interface setValueParams {
     value: string[];
     bind: BindComponentRenderProp;
-    field: Pick<CmsEditorField, "multipleValues">;
+    field: Pick<CmsModelField, "multipleValues">;
     index: number;
 }
 export declare const setValue: (params: setValueParams) => void;

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

@@ -1 +1 @@
-{"version":3,"names":["setValue","params","value","bind","field","index","newValue","multipleValues","onChange"],"sources":["setValue.ts"],"sourcesContent":["import { CmsEditorField } from \"~/types\";\nimport { BindComponentRenderProp } from \"@webiny/form\";\n\ninterface setValueParams {\n    value: string[];\n    bind: BindComponentRenderProp;\n    field: Pick<CmsEditorField, \"multipleValues\">;\n    index: number;\n}\nexport const setValue = (params: setValueParams): void => {\n    const { value, bind, field, index } = params;\n    let newValue = field.multipleValues ? [...(bind.value || [])] : bind.value;\n\n    if (field.multipleValues) {\n        if (index >= 0) {\n            newValue[index] = value;\n        } else {\n            newValue = value;\n        }\n    } else {\n        newValue = value;\n    }\n\n    bind.onChange(newValue);\n};\n"],"mappings":";;;;;;;;;;;AASO,IAAMA,QAAQ,GAAG,SAAXA,QAAW,CAACC,MAAD,EAAkC;EACtD,IAAQC,KAAR,GAAsCD,MAAtC,CAAQC,KAAR;EAAA,IAAeC,IAAf,GAAsCF,MAAtC,CAAeE,IAAf;EAAA,IAAqBC,KAArB,GAAsCH,MAAtC,CAAqBG,KAArB;EAAA,IAA4BC,KAA5B,GAAsCJ,MAAtC,CAA4BI,KAA5B;EACA,IAAIC,QAAQ,GAAGF,KAAK,CAACG,cAAN,oCAA4BJ,IAAI,CAACD,KAAL,IAAc,EAA1C,IAAiDC,IAAI,CAACD,KAArE;;EAEA,IAAIE,KAAK,CAACG,cAAV,EAA0B;IACtB,IAAIF,KAAK,IAAI,CAAb,EAAgB;MACZC,QAAQ,CAACD,KAAD,CAAR,GAAkBH,KAAlB;IACH,CAFD,MAEO;MACHI,QAAQ,GAAGJ,KAAX;IACH;EACJ,CAND,MAMO;IACHI,QAAQ,GAAGJ,KAAX;EACH;;EAEDC,IAAI,CAACK,QAAL,CAAcF,QAAd;AACH,CAfM"}
+{"version":3,"names":["setValue","params","value","bind","field","index","newValue","multipleValues","onChange"],"sources":["setValue.ts"],"sourcesContent":["import { CmsModelField } from \"~/types\";\nimport { BindComponentRenderProp } from \"@webiny/form\";\n\ninterface setValueParams {\n    value: string[];\n    bind: BindComponentRenderProp;\n    field: Pick<CmsModelField, \"multipleValues\">;\n    index: number;\n}\nexport const setValue = (params: setValueParams): void => {\n    const { value, bind, field, index } = params;\n    let newValue = field.multipleValues ? [...(bind.value || [])] : bind.value;\n\n    if (field.multipleValues) {\n        if (index >= 0) {\n            newValue[index] = value;\n        } else {\n            newValue = value;\n        }\n    } else {\n        newValue = value;\n    }\n\n    bind.onChange(newValue);\n};\n"],"mappings":";;;;;;;;;;;AASO,IAAMA,QAAQ,GAAG,SAAXA,QAAW,CAACC,MAAD,EAAkC;EACtD,IAAQC,KAAR,GAAsCD,MAAtC,CAAQC,KAAR;EAAA,IAAeC,IAAf,GAAsCF,MAAtC,CAAeE,IAAf;EAAA,IAAqBC,KAArB,GAAsCH,MAAtC,CAAqBG,KAArB;EAAA,IAA4BC,KAA5B,GAAsCJ,MAAtC,CAA4BI,KAA5B;EACA,IAAIC,QAAQ,GAAGF,KAAK,CAACG,cAAN,oCAA4BJ,IAAI,CAACD,KAAL,IAAc,EAA1C,IAAiDC,IAAI,CAACD,KAArE;;EAEA,IAAIE,KAAK,CAACG,cAAV,EAA0B;IACtB,IAAIF,KAAK,IAAI,CAAb,EAAgB;MACZC,QAAQ,CAACD,KAAD,CAAR,GAAkBH,KAAlB;IACH,CAFD,MAEO;MACHI,QAAQ,GAAGJ,KAAX;IACH;EACJ,CAND,MAMO;IACHI,QAAQ,GAAGJ,KAAX;EACH;;EAEDC,IAAI,CAACK,QAAL,CAAcF,QAAd;AACH,CAfM"}

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

@@ -1,6 +1,6 @@
-import { BindComponent, CmsEditorField } from "../../../types";
+import { BindComponent, CmsModelField } from "../../../types";
 interface UseBindProps {
-    field: CmsEditorField;
+    field: CmsModelField;
     Bind: BindComponent;
 }
 export interface GetBindCallable {

package/admin/components/ContentEntryForm/useBind.js

@@ -34,8 +34,8 @@ function useBind(_ref) {
       return memoizedBindComponents.current[name];
     }
 
-    var validators = (0, _createValidators.createValidators)(field.validation || []);
-    var listValidators = (0, _createValidators.createValidators)(field.listValidation || []);
+    var validators = (0, _createValidators.createValidators)(field, field.validation || []);
+    var listValidators = (0, _createValidators.createValidators)(field, field.listValidation || []);
     var defaultValue = field.multipleValues ? [] : undefined;
     var isMultipleValues = index === -1 && field.multipleValues;
     var inputValidators = isMultipleValues ? listValidators : validators;
@@ -53,16 +53,18 @@ function useBind(_ref) {
         var props = (0, _objectSpread2.default)({}, bind);
 
         if (field.multipleValues && index === -1) {
-          props.appendValue = function (newValue) {
-            bind.onChange([].concat((0, _toConsumableArray2.default)(bind.value), [newValue]));
+          props.appendValue = function (newValue, index) {
+            var currentValue = bind.value || [];
+            var newIndex = index !== null && index !== void 0 ? index : currentValue.length;
+            bind.onChange([].concat((0, _toConsumableArray2.default)(currentValue.slice(0, newIndex)), [newValue], (0, _toConsumableArray2.default)(currentValue.slice(newIndex))));
           };
 
           props.prependValue = function (newValue) {
-            bind.onChange([newValue].concat((0, _toConsumableArray2.default)(bind.value)));
+            bind.onChange([newValue].concat((0, _toConsumableArray2.default)(bind.value || [])));
           };
 
           props.appendValues = function (newValues) {
-            bind.onChange([].concat((0, _toConsumableArray2.default)(bind.value), (0, _toConsumableArray2.default)(newValues)));
+            bind.onChange([].concat((0, _toConsumableArray2.default)(bind.value || []), (0, _toConsumableArray2.default)(newValues)));
           };
 
           props.removeValue = function (index) {
@@ -110,6 +112,7 @@ function useBind(_ref) {
 
 
     memoizedBindComponents.current[name].parentName = name;
+    memoizedBindComponents.current[name].displayName = "ParentBind<".concat(name, ">");
     return memoizedBindComponents.current[name];
   }, [field.fieldId]);
-} // [0,1,2,3,4,5]
+}

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

@@ -1 +1 @@
-{"version":3,"names":["useBind","ParentBind","Bind","field","memoizedBindComponents","useRef","useCallback","index","parentName","name","fieldId","undefined","filter","v","join","current","validators","createValidators","validation","listValidators","listValidation","defaultValue","multipleValues","isMultipleValues","inputValidators","UseBind","params","childName","childValidators","children","bind","props","appendValue","newValue","onChange","value","prependValue","appendValues","newValues","removeValue","slice","form","validateInput","moveValueUp","splice","moveValueDown","length","cloneElement"],"sources":["useBind.tsx"],"sourcesContent":["import React, { useRef, useCallback, cloneElement } from \"react\";\nimport { createValidators } from \"./functions/createValidators\";\nimport { BindComponent, CmsEditorField } from \"~/types\";\nimport { Validator } from \"@webiny/validation/types\";\n\ninterface UseBindProps {\n    field: CmsEditorField;\n    Bind: BindComponent;\n}\n\ninterface UseBindParams {\n    name?: string;\n    validators?: Validator | Validator[];\n    children?: any;\n}\n\nexport interface GetBindCallable {\n    (index?: number): BindComponent;\n}\n\nexport function useBind({ Bind: ParentBind, field }: UseBindProps) {\n    const memoizedBindComponents = useRef<Record<string, BindComponent>>({});\n\n    return useCallback(\n        (index = -1) => {\n            const { parentName } = ParentBind;\n            // If there's a parent name assigned to the given Bind component, we need to include it in the new field \"name\".\n            // This allows us to have nested fields (like \"object\" field with nested properties)\n            const name = [parentName, field.fieldId, index >= 0 ? index : undefined]\n                .filter(v => v !== undefined)\n                .join(\".\");\n\n            if (memoizedBindComponents.current[name]) {\n                return memoizedBindComponents.current[name];\n            }\n\n            const validators = createValidators(field.validation || []);\n            const listValidators = createValidators(field.listValidation || []);\n            const defaultValue: string[] | undefined = field.multipleValues ? [] : undefined;\n            const isMultipleValues = index === -1 && field.multipleValues;\n            const inputValidators = isMultipleValues ? listValidators : validators;\n\n            memoizedBindComponents.current[name] = function UseBind(params: UseBindParams) {\n                const { name: childName, validators: childValidators, children } = params;\n                return (\n                    <ParentBind\n                        name={childName || name}\n                        validators={childValidators || inputValidators}\n                        defaultValue={index === -1 ? defaultValue : null}\n                    >\n                        {bind => {\n                            // Multiple-values functions below.\n                            const props = { ...bind };\n                            if (field.multipleValues && index === -1) {\n                                props.appendValue = (newValue: string) => {\n                                    bind.onChange([...bind.value, newValue]);\n                                };\n                                props.prependValue = (newValue: string) => {\n                                    bind.onChange([newValue, ...bind.value]);\n                                };\n                                props.appendValues = (newValues: string[]) => {\n                                    bind.onChange([...bind.value, ...newValues]);\n                                };\n\n                                props.removeValue = (index: number) => {\n                                    if (index < 0) {\n                                        return;\n                                    }\n                                    let value = bind.value;\n                                    value = [...value.slice(0, index), ...value.slice(index + 1)];\n\n                                    bind.onChange(value);\n\n                                    // To make sure the field is still valid, we must trigger validation.\n                                    bind.form.validateInput(field.fieldId);\n                                };\n\n                                props.moveValueUp = (index: number) => {\n                                    if (index <= 0) {\n                                        return;\n                                    }\n\n                                    const value = [...bind.value];\n                                    value.splice(index, 1);\n                                    value.splice(index - 1, 0, bind.value[index]);\n\n                                    bind.onChange(value);\n                                };\n\n                                props.moveValueDown = (index: number) => {\n                                    if (index >= bind.value.length) {\n                                        return;\n                                    }\n\n                                    const value = [...bind.value];\n                                    value.splice(index, 1);\n                                    value.splice(index + 1, 0, bind.value[index]);\n\n                                    bind.onChange(value);\n                                };\n                            }\n\n                            if (typeof children === \"function\") {\n                                return children(props);\n                            }\n\n                            return cloneElement(children, props);\n                        }}\n                    </ParentBind>\n                );\n            };\n\n            // We need to keep track of current field name, to support nested fields.\n            memoizedBindComponents.current[name].parentName = name;\n\n            return memoizedBindComponents.current[name];\n        },\n        [field.fieldId]\n    );\n}\n\n// [0,1,2,3,4,5]\n"],"mappings":"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"}
+{"version":3,"names":["useBind","ParentBind","Bind","field","memoizedBindComponents","useRef","useCallback","index","parentName","name","fieldId","undefined","filter","v","join","current","validators","createValidators","validation","listValidators","listValidation","defaultValue","multipleValues","isMultipleValues","inputValidators","UseBind","params","childName","childValidators","children","bind","props","appendValue","newValue","currentValue","value","newIndex","length","onChange","slice","prependValue","appendValues","newValues","removeValue","form","validateInput","moveValueUp","splice","moveValueDown","cloneElement","displayName"],"sources":["useBind.tsx"],"sourcesContent":["import React, { useRef, useCallback, cloneElement } from \"react\";\nimport { createValidators } from \"./functions/createValidators\";\nimport { BindComponent, CmsModelField } from \"~/types\";\nimport { Validator } from \"@webiny/validation/types\";\n\ninterface UseBindProps {\n    field: CmsModelField;\n    Bind: BindComponent;\n}\n\ninterface UseBindParams {\n    name?: string;\n    validators?: Validator | Validator[];\n    children?: any;\n}\n\nexport interface GetBindCallable {\n    (index?: number): BindComponent;\n}\n\nexport function useBind({ Bind: ParentBind, field }: UseBindProps) {\n    const memoizedBindComponents = useRef<Record<string, BindComponent>>({});\n\n    return useCallback(\n        (index = -1) => {\n            const { parentName } = ParentBind;\n            // If there's a parent name assigned to the given Bind component, we need to include it in the new field \"name\".\n            // This allows us to have nested fields (like \"object\" field with nested properties)\n            const name = [parentName, field.fieldId, index >= 0 ? index : undefined]\n                .filter(v => v !== undefined)\n                .join(\".\");\n\n            if (memoizedBindComponents.current[name]) {\n                return memoizedBindComponents.current[name];\n            }\n\n            const validators = createValidators(field, field.validation || []);\n            const listValidators = createValidators(field, field.listValidation || []);\n            const defaultValue: string[] | undefined = field.multipleValues ? [] : undefined;\n            const isMultipleValues = index === -1 && field.multipleValues;\n            const inputValidators = isMultipleValues ? listValidators : validators;\n\n            memoizedBindComponents.current[name] = function UseBind(params: UseBindParams) {\n                const { name: childName, validators: childValidators, children } = params;\n\n                return (\n                    <ParentBind\n                        name={childName || name}\n                        validators={childValidators || inputValidators}\n                        defaultValue={index === -1 ? defaultValue : null}\n                    >\n                        {bind => {\n                            // Multiple-values functions below.\n                            const props = { ...bind };\n                            if (field.multipleValues && index === -1) {\n                                props.appendValue = (newValue: any, index?: number) => {\n                                    const currentValue = bind.value || [];\n                                    const newIndex = index ?? currentValue.length;\n\n                                    bind.onChange([\n                                        ...currentValue.slice(0, newIndex),\n                                        newValue,\n                                        ...currentValue.slice(newIndex)\n                                    ]);\n                                };\n                                props.prependValue = (newValue: any) => {\n                                    bind.onChange([newValue, ...(bind.value || [])]);\n                                };\n                                props.appendValues = (newValues: any[]) => {\n                                    bind.onChange([...(bind.value || []), ...newValues]);\n                                };\n\n                                props.removeValue = (index: number) => {\n                                    if (index < 0) {\n                                        return;\n                                    }\n                                    let value = bind.value;\n                                    value = [...value.slice(0, index), ...value.slice(index + 1)];\n\n                                    bind.onChange(value);\n\n                                    // To make sure the field is still valid, we must trigger validation.\n                                    bind.form.validateInput(field.fieldId);\n                                };\n\n                                props.moveValueUp = (index: number) => {\n                                    if (index <= 0) {\n                                        return;\n                                    }\n\n                                    const value = [...bind.value];\n                                    value.splice(index, 1);\n                                    value.splice(index - 1, 0, bind.value[index]);\n\n                                    bind.onChange(value);\n                                };\n\n                                props.moveValueDown = (index: number) => {\n                                    if (index >= bind.value.length) {\n                                        return;\n                                    }\n\n                                    const value = [...bind.value];\n                                    value.splice(index, 1);\n                                    value.splice(index + 1, 0, bind.value[index]);\n\n                                    bind.onChange(value);\n                                };\n                            }\n\n                            if (typeof children === \"function\") {\n                                return children(props);\n                            }\n\n                            return cloneElement(children, props);\n                        }}\n                    </ParentBind>\n                );\n            };\n\n            // We need to keep track of current field name, to support nested fields.\n            memoizedBindComponents.current[name].parentName = name;\n            memoizedBindComponents.current[name].displayName = `ParentBind<${name}>`;\n\n            return memoizedBindComponents.current[name];\n        },\n        [field.fieldId]\n    );\n}\n"],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import { Dispatch, SetStateAction } from "react";
 import { FormOnSubmit } from "@webiny/form";
-import { CmsEditorContentEntry, CmsEditorContentModel, CmsEditorFieldRendererPlugin } from "../../../types";
+import { CmsEditorContentEntry, CmsEditorFieldRendererPlugin } from "../../../types";
 interface UseContentEntryForm {
     data: Record<string, any>;
     loading: boolean;
@@ -11,7 +11,6 @@ interface UseContentEntryForm {
     renderPlugins: CmsEditorFieldRendererPlugin[];
 }
 export interface UseContentEntryFormParams {
-    contentModel: CmsEditorContentModel;
     entry: Partial<CmsEditorContentEntry>;
     onChange?: FormOnSubmit;
     onSubmit?: FormOnSubmit;