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

package/admin/plugins/permissionRenderer/components/useCmsData.js

@@ -1,6 +1,5 @@
-import { useEffect, useReducer } from "react";
 import gql from "graphql-tag";
-import { useCms } from "../../../hooks";
+import { useQuery } from "../../../hooks/index.js";
 
 /**
  * ########################
@@ -14,10 +13,7 @@ const LIST_DATA = gql`
                 modelId
                 id: modelId
                 label: name
-                group {
-                    id
-                    label: name
-                }
+                group
             }
             meta {
                 totalCount
@@ -33,6 +29,7 @@ const LIST_DATA = gql`
         listContentModelGroups {
             data {
                 id
+                slug
                 label: name
             }
             meta {
@@ -48,49 +45,21 @@ const LIST_DATA = gql`
         }
     }
 `;
-export const useCmsData = locales => {
+export const useCmsData = () => {
   const {
-    getApolloClient
-  } = useCms();
-  const [state, setState] = useReducer((prev, next) => {
-    return {
-      ...prev,
-      ...next
-    };
-  }, {});
-  const loadData = async () => {
-    for (const code of locales) {
-      const client = getApolloClient(code);
-      if (!state[code]) {
-        client.query({
-          query: LIST_DATA
-        }).then(({
-          data
-        }) => {
-          setState({
-            [code]: {
-              models: data.listContentModels.data,
-              groups: data.listContentModelGroups.data
-            }
-          });
-        });
-      }
-    }
-  };
-  useEffect(() => {
-    loadData();
-  }, [locales.sort().join(":")]);
-  return locales.reduce((acc, code) => {
-    if (!state[code]) {
-      acc[code] = {
-        models: [],
-        groups: []
+    data
+  } = useQuery(LIST_DATA);
+  const groups = data?.listContentModelGroups.data ?? [];
+  return {
+    models: (data?.listContentModels.data ?? []).filter(model => model.group !== "hidden").map(model => {
+      // `model.group` is a slug. we need to remap it to actual group object.
+      return {
+        ...model,
+        group: groups.find(item => item.slug === model.group)
       };
-      return acc;
-    }
-    acc[code] = state[code];
-    return acc;
-  }, {});
+    }),
+    groups
+  };
 };
 
 //# sourceMappingURL=useCmsData.js.map

package/admin/plugins/permissionRenderer/components/useCmsData.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useReducer","gql","useCms","LIST_DATA","useCmsData","locales","getApolloClient","state","setState","prev","next","loadData","code","client","query","then","data","models","listContentModels","groups","listContentModelGroups","sort","join","reduce","acc"],"sources":["useCmsData.ts"],"sourcesContent":["import { useEffect, useReducer } from \"react\";\nimport gql from \"graphql-tag\";\nimport { useCms } from \"../../../hooks\";\nimport type { CmsErrorResponse } from \"~/types\";\n\nexport interface CmsDataCmsGroup {\n    id: string;\n    label: string;\n}\nexport interface CmsDataCmsModel {\n    id: string;\n    modelId: string;\n    label: string;\n    group: CmsDataCmsGroup;\n}\n/**\n * ########################\n * List CMS Models And Groups for Permissions\n */\ninterface ListCmsPermissionsResponse {\n    listContentModels: {\n        data: CmsDataCmsModel[];\n        error?: CmsErrorResponse;\n    };\n    listContentModelGroups: {\n        data: CmsDataCmsGroup[];\n        error?: CmsErrorResponse;\n    };\n}\nconst LIST_DATA = gql`\n    query CmsLoadPermissionsData {\n        listContentModels {\n            data {\n                modelId\n                id: modelId\n                label: name\n                group {\n                    id\n                    label: name\n                }\n            }\n            meta {\n                totalCount\n                cursor\n                hasMoreItems\n            }\n            error {\n                code\n                message\n                data\n            }\n        }\n        listContentModelGroups {\n            data {\n                id\n                label: name\n            }\n            meta {\n                totalCount\n                cursor\n                hasMoreItems\n            }\n            error {\n                code\n                message\n                data\n            }\n        }\n    }\n`;\n\nexport interface UseCmsDataResponseRecords {\n    models: CmsDataCmsModel[];\n    groups: CmsDataCmsGroup[];\n}\ninterface State {\n    [key: string]: UseCmsDataResponseRecords;\n}\ninterface Reducer {\n    (prev: State, next: State): State;\n}\n\nexport interface UseCmsDataResponse {\n    [locale: string]: UseCmsDataResponseRecords;\n}\nexport const useCmsData = (locales: string[]): UseCmsDataResponse => {\n    const { getApolloClient } = useCms();\n    const [state, setState] = useReducer<Reducer>((prev, next) => {\n        return {\n            ...prev,\n            ...next\n        };\n    }, {});\n\n    const loadData = async () => {\n        for (const code of locales) {\n            const client = getApolloClient(code);\n\n            if (!state[code]) {\n                client.query<ListCmsPermissionsResponse>({ query: LIST_DATA }).then(({ data }) => {\n                    setState({\n                        [code]: {\n                            models: data.listContentModels.data,\n                            groups: data.listContentModelGroups.data\n                        }\n                    });\n                });\n            }\n        }\n    };\n\n    useEffect(() => {\n        loadData();\n    }, [locales.sort().join(\":\")]);\n\n    return locales.reduce((acc, code) => {\n        if (!state[code]) {\n            acc[code] = {\n                models: [],\n                groups: []\n            };\n            return acc;\n        }\n        acc[code] = state[code];\n        return acc;\n    }, {} as UseCmsDataResponse);\n};\n"],"mappings":"AAAA,SAASA,SAAS,EAAEC,UAAU,QAAQ,OAAO;AAC7C,OAAOC,GAAG,MAAM,aAAa;AAC7B,SAASC,MAAM;;AAaf;AACA;AACA;AACA;;AAWA,MAAMC,SAAS,GAAGF,GAAG;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAgBD,OAAO,MAAMG,UAAU,GAAIC,OAAiB,IAAyB;EACjE,MAAM;IAAEC;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EACpC,MAAM,CAACK,KAAK,EAAEC,QAAQ,CAAC,GAAGR,UAAU,CAAU,CAACS,IAAI,EAAEC,IAAI,KAAK;IAC1D,OAAO;MACH,GAAGD,IAAI;MACP,GAAGC;IACP,CAAC;EACL,CAAC,EAAE,CAAC,CAAC,CAAC;EAEN,MAAMC,QAAQ,GAAG,MAAAA,CAAA,KAAY;IACzB,KAAK,MAAMC,IAAI,IAAIP,OAAO,EAAE;MACxB,MAAMQ,MAAM,GAAGP,eAAe,CAACM,IAAI,CAAC;MAEpC,IAAI,CAACL,KAAK,CAACK,IAAI,CAAC,EAAE;QACdC,MAAM,CAACC,KAAK,CAA6B;UAAEA,KAAK,EAAEX;QAAU,CAAC,CAAC,CAACY,IAAI,CAAC,CAAC;UAAEC;QAAK,CAAC,KAAK;UAC9ER,QAAQ,CAAC;YACL,CAACI,IAAI,GAAG;cACJK,MAAM,EAAED,IAAI,CAACE,iBAAiB,CAACF,IAAI;cACnCG,MAAM,EAAEH,IAAI,CAACI,sBAAsB,CAACJ;YACxC;UACJ,CAAC,CAAC;QACN,CAAC,CAAC;MACN;IACJ;EACJ,CAAC;EAEDjB,SAAS,CAAC,MAAM;IACZY,QAAQ,CAAC,CAAC;EACd,CAAC,EAAE,CAACN,OAAO,CAACgB,IAAI,CAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;EAE9B,OAAOjB,OAAO,CAACkB,MAAM,CAAC,CAACC,GAAG,EAAEZ,IAAI,KAAK;IACjC,IAAI,CAACL,KAAK,CAACK,IAAI,CAAC,EAAE;MACdY,GAAG,CAACZ,IAAI,CAAC,GAAG;QACRK,MAAM,EAAE,EAAE;QACVE,MAAM,EAAE;MACZ,CAAC;MACD,OAAOK,GAAG;IACd;IACAA,GAAG,CAACZ,IAAI,CAAC,GAAGL,KAAK,CAACK,IAAI,CAAC;IACvB,OAAOY,GAAG;EACd,CAAC,EAAE,CAAC,CAAuB,CAAC;AAChC,CAAC","ignoreList":[]}
+{"version":3,"names":["gql","useQuery","LIST_DATA","useCmsData","data","groups","listContentModelGroups","models","listContentModels","filter","model","group","map","find","item","slug"],"sources":["useCmsData.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { useQuery } from \"../../../hooks/index.js\";\nimport type { CmsErrorResponse } from \"~/types.js\";\n\nexport interface CmsDataCmsGroup {\n    id: string;\n    slug: string;\n    label: string;\n}\nexport interface CmsDataCmsModel<TGroup = string> {\n    id: string;\n    modelId: string;\n    label: string;\n    group: TGroup;\n}\n/**\n * ########################\n * List CMS Models And Groups for Permissions\n */\ninterface ListCmsPermissionsResponse {\n    listContentModels: {\n        data: CmsDataCmsModel[];\n        error?: CmsErrorResponse;\n    };\n    listContentModelGroups: {\n        data: CmsDataCmsGroup[];\n        error?: CmsErrorResponse;\n    };\n}\nconst LIST_DATA = gql`\n    query CmsLoadPermissionsData {\n        listContentModels {\n            data {\n                modelId\n                id: modelId\n                label: name\n                group\n            }\n            meta {\n                totalCount\n                cursor\n                hasMoreItems\n            }\n            error {\n                code\n                message\n                data\n            }\n        }\n        listContentModelGroups {\n            data {\n                id\n                slug\n                label: name\n            }\n            meta {\n                totalCount\n                cursor\n                hasMoreItems\n            }\n            error {\n                code\n                message\n                data\n            }\n        }\n    }\n`;\n\nexport interface UseCmsDataResponseRecords {\n    models: CmsDataCmsModel<CmsDataCmsGroup>[];\n    groups: CmsDataCmsGroup[];\n}\n\nexport const useCmsData = (): UseCmsDataResponseRecords => {\n    const { data } = useQuery<ListCmsPermissionsResponse>(LIST_DATA);\n\n    const groups = data?.listContentModelGroups.data ?? [];\n\n    return {\n        models: (data?.listContentModels.data ?? [])\n            .filter(model => model.group !== \"hidden\")\n            .map(model => {\n                // `model.group` is a slug. we need to remap it to actual group object.\n                return { ...model, group: groups.find(item => item.slug === model.group)! };\n            }),\n        groups\n    };\n};\n"],"mappings":"AAAA,OAAOA,GAAG,MAAM,aAAa;AAC7B,SAASC,QAAQ;;AAcjB;AACA;AACA;AACA;;AAWA,MAAMC,SAAS,GAAGF,GAAG;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAOD,OAAO,MAAMG,UAAU,GAAGA,CAAA,KAAiC;EACvD,MAAM;IAAEC;EAAK,CAAC,GAAGH,QAAQ,CAA6BC,SAAS,CAAC;EAEhE,MAAMG,MAAM,GAAGD,IAAI,EAAEE,sBAAsB,CAACF,IAAI,IAAI,EAAE;EAEtD,OAAO;IACHG,MAAM,EAAE,CAACH,IAAI,EAAEI,iBAAiB,CAACJ,IAAI,IAAI,EAAE,EACtCK,MAAM,CAACC,KAAK,IAAIA,KAAK,CAACC,KAAK,KAAK,QAAQ,CAAC,CACzCC,GAAG,CAACF,KAAK,IAAI;MACV;MACA,OAAO;QAAE,GAAGA,KAAK;QAAEC,KAAK,EAAEN,MAAM,CAACQ,IAAI,CAACC,IAAI,IAAIA,IAAI,CAACC,IAAI,KAAKL,KAAK,CAACC,KAAK;MAAG,CAAC;IAC/E,CAAC,CAAC;IACNN;EACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/admin/plugins/permissionRenderer/index.d.ts

@@ -1,3 +1,2 @@
-import type { AdminAppPermissionRendererPlugin } from "@webiny/app-admin/types";
-declare const plugin: AdminAppPermissionRendererPlugin;
-export default plugin;
+import React from "react";
+export declare const CmsSecurityPermission: () => React.JSX.Element;

package/admin/plugins/permissionRenderer/index.js

@@ -1,22 +1,16 @@
 import React from "react";
-import { Accordion } from "@webiny/admin-ui";
+import { AdminConfig } from "@webiny/app-admin";
 import { ReactComponent as PermissionsIcon } from "@webiny/icons/devices_other.svg";
-import { CMSPermissions } from "./CmsPermissions";
-const plugin = {
-  type: "admin-app-permissions-renderer",
-  name: "admin-app-permissions-renderer-cms",
-  render(props) {
-    return /*#__PURE__*/React.createElement(Accordion.Item, {
-      icon: /*#__PURE__*/React.createElement(Accordion.Item.Icon, {
-        icon: /*#__PURE__*/React.createElement(PermissionsIcon, null),
-        label: "Headless CMS Permissions"
-      }),
-      title: "Headless CMS",
-      description: "Manage Headless CMS app access permissions.",
-      "data-testid": "permission.cms"
-    }, /*#__PURE__*/React.createElement(CMSPermissions, props));
-  }
-};
-export default plugin;
+import { CMSPermissions } from "./CmsPermissions.js";
+const {
+  Security
+} = AdminConfig;
+export const CmsSecurityPermission = () => /*#__PURE__*/React.createElement(AdminConfig, null, /*#__PURE__*/React.createElement(Security.Permissions, {
+  name: "cms",
+  title: "Headless CMS",
+  description: "Manage Headless CMS permissions.",
+  icon: /*#__PURE__*/React.createElement(PermissionsIcon, null),
+  element: /*#__PURE__*/React.createElement(CMSPermissions, null)
+}));
 
 //# sourceMappingURL=index.js.map

package/admin/plugins/permissionRenderer/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Accordion","ReactComponent","PermissionsIcon","CMSPermissions","plugin","type","name","render","props","createElement","Item","icon","Icon","label","title","description"],"sources":["index.tsx"],"sourcesContent":["import React from \"react\";\nimport { Accordion } from \"@webiny/admin-ui\";\nimport type { AdminAppPermissionRendererPlugin } from \"@webiny/app-admin/types\";\nimport { ReactComponent as PermissionsIcon } from \"@webiny/icons/devices_other.svg\";\nimport { CMSPermissions } from \"./CmsPermissions\";\n\nconst plugin: AdminAppPermissionRendererPlugin = {\n    type: \"admin-app-permissions-renderer\",\n    name: \"admin-app-permissions-renderer-cms\",\n    render(props) {\n        return (\n            <Accordion.Item\n                icon={\n                    <Accordion.Item.Icon\n                        icon={<PermissionsIcon />}\n                        label={\"Headless CMS Permissions\"}\n                    />\n                }\n                title={\"Headless CMS\"}\n                description={\"Manage Headless CMS app access permissions.\"}\n                data-testid={\"permission.cms\"}\n            >\n                <CMSPermissions {...props} />\n            </Accordion.Item>\n        );\n    }\n};\nexport default plugin;\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,SAAS,QAAQ,kBAAkB;AAE5C,SAASC,cAAc,IAAIC,eAAe,QAAQ,iCAAiC;AACnF,SAASC,cAAc;AAEvB,MAAMC,MAAwC,GAAG;EAC7CC,IAAI,EAAE,gCAAgC;EACtCC,IAAI,EAAE,oCAAoC;EAC1CC,MAAMA,CAACC,KAAK,EAAE;IACV,oBACIT,KAAA,CAAAU,aAAA,CAACT,SAAS,CAACU,IAAI;MACXC,IAAI,eACAZ,KAAA,CAAAU,aAAA,CAACT,SAAS,CAACU,IAAI,CAACE,IAAI;QAChBD,IAAI,eAAEZ,KAAA,CAAAU,aAAA,CAACP,eAAe,MAAE,CAAE;QAC1BW,KAAK,EAAE;MAA2B,CACrC,CACJ;MACDC,KAAK,EAAE,cAAe;MACtBC,WAAW,EAAE,6CAA8C;MAC3D,eAAa;IAAiB,gBAE9BhB,KAAA,CAAAU,aAAA,CAACN,cAAc,EAAKK,KAAQ,CAChB,CAAC;EAEzB;AACJ,CAAC;AACD,eAAeJ,MAAM","ignoreList":[]}
+{"version":3,"names":["React","AdminConfig","ReactComponent","PermissionsIcon","CMSPermissions","Security","CmsSecurityPermission","createElement","Permissions","name","title","description","icon","element"],"sources":["index.tsx"],"sourcesContent":["import React from \"react\";\nimport { AdminConfig } from \"@webiny/app-admin\";\nimport { ReactComponent as PermissionsIcon } from \"@webiny/icons/devices_other.svg\";\nimport { CMSPermissions } from \"./CmsPermissions.js\";\n\nconst { Security } = AdminConfig;\n\nexport const CmsSecurityPermission = () => (\n    <AdminConfig>\n        <Security.Permissions\n            name=\"cms\"\n            title=\"Headless CMS\"\n            description=\"Manage Headless CMS permissions.\"\n            icon={<PermissionsIcon />}\n            element={<CMSPermissions />}\n        />\n    </AdminConfig>\n);\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,WAAW,QAAQ,mBAAmB;AAC/C,SAASC,cAAc,IAAIC,eAAe,QAAQ,iCAAiC;AACnF,SAASC,cAAc;AAEvB,MAAM;EAAEC;AAAS,CAAC,GAAGJ,WAAW;AAEhC,OAAO,MAAMK,qBAAqB,GAAGA,CAAA,kBACjCN,KAAA,CAAAO,aAAA,CAACN,WAAW,qBACRD,KAAA,CAAAO,aAAA,CAACF,QAAQ,CAACG,WAAW;EACjBC,IAAI,EAAC,KAAK;EACVC,KAAK,EAAC,cAAc;EACpBC,WAAW,EAAC,kCAAkC;EAC9CC,IAAI,eAAEZ,KAAA,CAAAO,aAAA,CAACJ,eAAe,MAAE,CAAE;EAC1BU,OAAO,eAAEb,KAAA,CAAAO,aAAA,CAACH,cAAc,MAAE;AAAE,CAC/B,CACQ,CAChB","ignoreList":[]}

package/admin/plugins/transformers/dateTransformer.d.ts

@@ -1,2 +1,2 @@
-import type { CmsFieldValueTransformer } from "../../../types";
+import type { CmsFieldValueTransformer } from "../../../types.js";
 export declare const createDateTransformer: () => CmsFieldValueTransformer;

package/admin/plugins/transformers/dateTransformer.js

@@ -57,7 +57,7 @@ const dateTimeWithTimezone = value => {
   try {
     const dateObj = new Date(initialDate);
     date = dateObj.toISOString().slice(0, 10);
-  } catch (ex) {
+  } catch {
     throw new WebinyError("Could not transform received date into Date object.", "DATE_TRANSFORM_ERROR", {
       value,
       date: initialDate,

package/admin/plugins/transformers/dateTransformer.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","dateOnly","value","date","Date","toISOString","slice","error","type","extractTimeZone","result","includes","split","length","extractTime","def","dateTimeWithTimezone","initialDate","initialTimeZone","dateObj","ex","time","initialTime","replace","dateTimeWithoutTimezone","transformers","createDateTransformer","name","fieldType","transform","field","settings","String"],"sources":["dateTransformer.ts"],"sourcesContent":["import type { CmsFieldValueTransformer } from \"~/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface TransformerCallable<T> {\n    (value?: T): string | null;\n}\nconst dateOnly: TransformerCallable<string> = value => {\n    if (!value) {\n        return null;\n    }\n    try {\n        const date = new Date(value).toISOString();\n        return date.slice(0, 10);\n    } catch (error) {\n        throw new WebinyError(`Could not transform value to a date.`, \"TRANSFORM_ERROR\", {\n            error,\n            type: \"date\",\n            value\n        });\n    }\n};\n\nconst extractTimeZone = (value?: string): [string, string] => {\n    let result: string[];\n    if (!value) {\n        return [new Date().toISOString(), \"00:00\"];\n    } else if (value.includes(\"+\")) {\n        result = value.split(\"+\");\n    } else {\n        result = value.split(\"-\");\n    }\n    if (!result || result.length !== 2) {\n        throw new WebinyError(\n            `Could not determine time and timezone out of given value.`,\n            \"TIME_ZONE_ERROR\",\n            {\n                value\n            }\n        );\n    }\n    return result as [string, string];\n};\n\nconst extractTime = (value?: string, def: string | null = null): string | null => {\n    if (!value) {\n        return null;\n    } else if (value.includes(\":\") === false) {\n        throw new WebinyError(\"Time value is missing : separators.\", \"TIME_ERROR\", {\n            value\n        });\n    }\n    const result = value.split(\":\");\n    if (result.length === 3) {\n        return value;\n    } else if (result.length === 2) {\n        return `${value}:00`;\n    }\n    return def;\n};\n\nconst dateTimeWithTimezone: TransformerCallable<string> = value => {\n    if (!value) {\n        return null;\n    } else if (value.includes(\"T\") === false) {\n        return value;\n    }\n\n    const [initialDate, initialTimeZone] = value.split(\"T\");\n\n    let date: string;\n\n    try {\n        const dateObj = new Date(initialDate);\n        date = dateObj.toISOString().slice(0, 10);\n    } catch (ex) {\n        throw new WebinyError(\n            \"Could not transform received date into Date object.\",\n            \"DATE_TRANSFORM_ERROR\",\n            {\n                value,\n                date: initialDate,\n                time: initialTimeZone\n            }\n        );\n    }\n    const [initialTime] = extractTimeZone(initialTimeZone);\n\n    const time = extractTime(initialTime, \"00:00:00\") as string;\n\n    return value.replace(initialDate, date).replace(initialTime, time);\n};\n\nconst dateTimeWithoutTimezone: TransformerCallable<string> = (value): string | null => {\n    if (!value) {\n        return null;\n    } else if (value.includes(\" \") === false) {\n        return value;\n    }\n    try {\n        return new Date(`${value.replace(\" \", \"T\")}.000Z`).toISOString();\n    } catch (error) {\n        throw new WebinyError(`Could not transform value to a date.`, \"TRANSFORM_ERROR\", {\n            error,\n            type: \"dateTimeWithoutTimezone\",\n            value\n        });\n    }\n};\n\nconst time: TransformerCallable<string> = value => {\n    if (!value) {\n        return null;\n    }\n    return extractTime(value);\n};\n\nconst transformers: Record<string, TransformerCallable<string>> = {\n    time,\n    date: dateOnly,\n    dateTimeWithoutTimezone,\n    dateTimeWithTimezone\n};\n\nexport const createDateTransformer = (): CmsFieldValueTransformer => ({\n    type: \"cms-field-value-transformer\",\n    name: \"cms-field-value-transformer-date\",\n    fieldType: \"datetime\",\n    transform: (value: any, field) => {\n        // check types in packages/app-headless-cms/src/admin/plugins/fieldRenderers/dateTime/dateTimeField.tsx\n        const type = field.settings && field.settings.type ? String(field.settings.type) : null;\n        if (!type) {\n            return value;\n        }\n        const transform = transformers[type];\n\n        if (!transform) {\n            return value;\n        }\n\n        return transform(value);\n    }\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","dateOnly","value","date","Date","toISOString","slice","error","type","extractTimeZone","result","includes","split","length","extractTime","def","dateTimeWithTimezone","initialDate","initialTimeZone","dateObj","time","initialTime","replace","dateTimeWithoutTimezone","transformers","createDateTransformer","name","fieldType","transform","field","settings","String"],"sources":["dateTransformer.ts"],"sourcesContent":["import type { CmsFieldValueTransformer } from \"~/types.js\";\nimport WebinyError from \"@webiny/error\";\n\ninterface TransformerCallable<T> {\n    (value?: T): string | null;\n}\nconst dateOnly: TransformerCallable<string> = value => {\n    if (!value) {\n        return null;\n    }\n    try {\n        const date = new Date(value).toISOString();\n        return date.slice(0, 10);\n    } catch (error) {\n        throw new WebinyError(`Could not transform value to a date.`, \"TRANSFORM_ERROR\", {\n            error,\n            type: \"date\",\n            value\n        });\n    }\n};\n\nconst extractTimeZone = (value?: string): [string, string] => {\n    let result: string[];\n    if (!value) {\n        return [new Date().toISOString(), \"00:00\"];\n    } else if (value.includes(\"+\")) {\n        result = value.split(\"+\");\n    } else {\n        result = value.split(\"-\");\n    }\n    if (!result || result.length !== 2) {\n        throw new WebinyError(\n            `Could not determine time and timezone out of given value.`,\n            \"TIME_ZONE_ERROR\",\n            {\n                value\n            }\n        );\n    }\n    return result as [string, string];\n};\n\nconst extractTime = (value?: string, def: string | null = null): string | null => {\n    if (!value) {\n        return null;\n    } else if (value.includes(\":\") === false) {\n        throw new WebinyError(\"Time value is missing : separators.\", \"TIME_ERROR\", {\n            value\n        });\n    }\n    const result = value.split(\":\");\n    if (result.length === 3) {\n        return value;\n    } else if (result.length === 2) {\n        return `${value}:00`;\n    }\n    return def;\n};\n\nconst dateTimeWithTimezone: TransformerCallable<string> = value => {\n    if (!value) {\n        return null;\n    } else if (value.includes(\"T\") === false) {\n        return value;\n    }\n\n    const [initialDate, initialTimeZone] = value.split(\"T\");\n\n    let date: string;\n\n    try {\n        const dateObj = new Date(initialDate);\n        date = dateObj.toISOString().slice(0, 10);\n    } catch {\n        throw new WebinyError(\n            \"Could not transform received date into Date object.\",\n            \"DATE_TRANSFORM_ERROR\",\n            {\n                value,\n                date: initialDate,\n                time: initialTimeZone\n            }\n        );\n    }\n    const [initialTime] = extractTimeZone(initialTimeZone);\n\n    const time = extractTime(initialTime, \"00:00:00\") as string;\n\n    return value.replace(initialDate, date).replace(initialTime, time);\n};\n\nconst dateTimeWithoutTimezone: TransformerCallable<string> = (value): string | null => {\n    if (!value) {\n        return null;\n    } else if (value.includes(\" \") === false) {\n        return value;\n    }\n    try {\n        return new Date(`${value.replace(\" \", \"T\")}.000Z`).toISOString();\n    } catch (error) {\n        throw new WebinyError(`Could not transform value to a date.`, \"TRANSFORM_ERROR\", {\n            error,\n            type: \"dateTimeWithoutTimezone\",\n            value\n        });\n    }\n};\n\nconst time: TransformerCallable<string> = value => {\n    if (!value) {\n        return null;\n    }\n    return extractTime(value);\n};\n\nconst transformers: Record<string, TransformerCallable<string>> = {\n    time,\n    date: dateOnly,\n    dateTimeWithoutTimezone,\n    dateTimeWithTimezone\n};\n\nexport const createDateTransformer = (): CmsFieldValueTransformer => ({\n    type: \"cms-field-value-transformer\",\n    name: \"cms-field-value-transformer-date\",\n    fieldType: \"datetime\",\n    transform: (value: any, field) => {\n        // check types in packages/app-headless-cms/src/admin/plugins/fieldRenderers/dateTime/dateTimeField.tsx\n        const type = field.settings && field.settings.type ? String(field.settings.type) : null;\n        if (!type) {\n            return value;\n        }\n        const transform = transformers[type];\n\n        if (!transform) {\n            return value;\n        }\n\n        return transform(value);\n    }\n});\n"],"mappings":"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","ignoreList":[]}

package/admin/plugins/transformers/dynamicZoneTransformer.d.ts

@@ -1,2 +1,2 @@
-import type { CmsFieldValueTransformer } from "../../../types";
+import type { CmsFieldValueTransformer } from "../../../types.js";
 export declare const createDynamicZoneTransformer: () => CmsFieldValueTransformer;

package/admin/plugins/transformers/dynamicZoneTransformer.js.map

@@ -1 +1 @@
-{"version":3,"names":["prepareFormData","convertToGraphQLInput","_templateId","value","templates","template","find","tpl","id","undefined","gqlTypeName","fields","createDynamicZoneTransformer","type","name","fieldType","transform","field","settings"],"sources":["dynamicZoneTransformer.ts"],"sourcesContent":["import type { CmsDynamicZoneTemplate, CmsFieldValueTransformer } from \"~/types\";\nimport { prepareFormData } from \"@webiny/app-headless-cms-common\";\n\ninterface TemplateValueFromForm {\n    _templateId: string;\n    [key: string]: any;\n}\n\nconst convertToGraphQLInput = (\n    { _templateId, ...value }: TemplateValueFromForm,\n    templates: CmsDynamicZoneTemplate[]\n) => {\n    const template = templates.find(tpl => _templateId === tpl.id);\n    if (!template) {\n        return undefined;\n    }\n\n    return {\n        [template.gqlTypeName]: prepareFormData(value, template.fields)\n    };\n};\n\nexport const createDynamicZoneTransformer = (): CmsFieldValueTransformer => ({\n    type: \"cms-field-value-transformer\",\n    name: \"cms-field-value-transformer-dynamic-zone\",\n    fieldType: \"dynamicZone\",\n    transform: (value, field) => {\n        const templates = field.settings?.templates || [];\n\n        return value ? convertToGraphQLInput(value, templates) : undefined;\n    }\n});\n"],"mappings":"AACA,SAASA,eAAe,QAAQ,iCAAiC;AAOjE,MAAMC,qBAAqB,GAAGA,CAC1B;EAAEC,WAAW;EAAE,GAAGC;AAA6B,CAAC,EAChDC,SAAmC,KAClC;EACD,MAAMC,QAAQ,GAAGD,SAAS,CAACE,IAAI,CAACC,GAAG,IAAIL,WAAW,KAAKK,GAAG,CAACC,EAAE,CAAC;EAC9D,IAAI,CAACH,QAAQ,EAAE;IACX,OAAOI,SAAS;EACpB;EAEA,OAAO;IACH,CAACJ,QAAQ,CAACK,WAAW,GAAGV,eAAe,CAACG,KAAK,EAAEE,QAAQ,CAACM,MAAM;EAClE,CAAC;AACL,CAAC;AAED,OAAO,MAAMC,4BAA4B,GAAGA,CAAA,MAAiC;EACzEC,IAAI,EAAE,6BAA6B;EACnCC,IAAI,EAAE,0CAA0C;EAChDC,SAAS,EAAE,aAAa;EACxBC,SAAS,EAAEA,CAACb,KAAK,EAAEc,KAAK,KAAK;IACzB,MAAMb,SAAS,GAAGa,KAAK,CAACC,QAAQ,EAAEd,SAAS,IAAI,EAAE;IAEjD,OAAOD,KAAK,GAAGF,qBAAqB,CAACE,KAAK,EAAEC,SAAS,CAAC,GAAGK,SAAS;EACtE;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["prepareFormData","convertToGraphQLInput","_templateId","value","templates","template","find","tpl","id","undefined","gqlTypeName","fields","createDynamicZoneTransformer","type","name","fieldType","transform","field","settings"],"sources":["dynamicZoneTransformer.ts"],"sourcesContent":["import type { CmsDynamicZoneTemplate, CmsFieldValueTransformer } from \"~/types.js\";\nimport { prepareFormData } from \"@webiny/app-headless-cms-common\";\n\ninterface TemplateValueFromForm {\n    _templateId: string;\n    [key: string]: any;\n}\n\nconst convertToGraphQLInput = (\n    { _templateId, ...value }: TemplateValueFromForm,\n    templates: CmsDynamicZoneTemplate[]\n) => {\n    const template = templates.find(tpl => _templateId === tpl.id);\n    if (!template) {\n        return undefined;\n    }\n\n    return {\n        [template.gqlTypeName]: prepareFormData(value, template.fields)\n    };\n};\n\nexport const createDynamicZoneTransformer = (): CmsFieldValueTransformer => ({\n    type: \"cms-field-value-transformer\",\n    name: \"cms-field-value-transformer-dynamic-zone\",\n    fieldType: \"dynamicZone\",\n    transform: (value, field) => {\n        const templates = field.settings?.templates || [];\n\n        return value ? convertToGraphQLInput(value, templates) : undefined;\n    }\n});\n"],"mappings":"AACA,SAASA,eAAe,QAAQ,iCAAiC;AAOjE,MAAMC,qBAAqB,GAAGA,CAC1B;EAAEC,WAAW;EAAE,GAAGC;AAA6B,CAAC,EAChDC,SAAmC,KAClC;EACD,MAAMC,QAAQ,GAAGD,SAAS,CAACE,IAAI,CAACC,GAAG,IAAIL,WAAW,KAAKK,GAAG,CAACC,EAAE,CAAC;EAC9D,IAAI,CAACH,QAAQ,EAAE;IACX,OAAOI,SAAS;EACpB;EAEA,OAAO;IACH,CAACJ,QAAQ,CAACK,WAAW,GAAGV,eAAe,CAACG,KAAK,EAAEE,QAAQ,CAACM,MAAM;EAClE,CAAC;AACL,CAAC;AAED,OAAO,MAAMC,4BAA4B,GAAGA,CAAA,MAAiC;EACzEC,IAAI,EAAE,6BAA6B;EACnCC,IAAI,EAAE,0CAA0C;EAChDC,SAAS,EAAE,aAAa;EACxBC,SAAS,EAAEA,CAACb,KAAK,EAAEc,KAAK,KAAK;IACzB,MAAMb,SAAS,GAAGa,KAAK,CAACC,QAAQ,EAAEd,SAAS,IAAI,EAAE;IAEjD,OAAOD,KAAK,GAAGF,qBAAqB,CAACE,KAAK,EAAEC,SAAS,CAAC,GAAGK,SAAS;EACtE;AACJ,CAAC,CAAC","ignoreList":[]}

package/admin/plugins/transformers/index.d.ts

@@ -1,3 +1,3 @@
-import type { CmsFieldValueTransformer } from "../../../types";
+import type { CmsFieldValueTransformer } from "../../../types.js";
 declare const _default: () => CmsFieldValueTransformer[];
 export default _default;

package/admin/plugins/transformers/index.js

@@ -1,7 +1,7 @@
-import { createDateTransformer } from "./dateTransformer";
-import { createNumberTransformer } from "./numberTransformer";
-import { createDynamicZoneTransformer } from "./dynamicZoneTransformer";
-import { createObjectTransformer } from "./objectTransformer";
+import { createDateTransformer } from "./dateTransformer.js";
+import { createNumberTransformer } from "./numberTransformer.js";
+import { createDynamicZoneTransformer } from "./dynamicZoneTransformer.js";
+import { createObjectTransformer } from "./objectTransformer.js";
 export default () => [createDateTransformer(), createNumberTransformer(), createDynamicZoneTransformer(), createObjectTransformer()];
 
 //# sourceMappingURL=index.js.map

package/admin/plugins/transformers/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createDateTransformer","createNumberTransformer","createDynamicZoneTransformer","createObjectTransformer"],"sources":["index.ts"],"sourcesContent":["import { createDateTransformer } from \"./dateTransformer\";\nimport { createNumberTransformer } from \"./numberTransformer\";\nimport { createDynamicZoneTransformer } from \"./dynamicZoneTransformer\";\nimport { createObjectTransformer } from \"./objectTransformer\";\nimport type { CmsFieldValueTransformer } from \"~/types\";\n\nexport default (): CmsFieldValueTransformer[] => [\n    createDateTransformer(),\n    createNumberTransformer(),\n    createDynamicZoneTransformer(),\n    createObjectTransformer()\n];\n"],"mappings":"AAAA,SAASA,qBAAqB;AAC9B,SAASC,uBAAuB;AAChC,SAASC,4BAA4B;AACrC,SAASC,uBAAuB;AAGhC,eAAe,MAAkC,CAC7CH,qBAAqB,CAAC,CAAC,EACvBC,uBAAuB,CAAC,CAAC,EACzBC,4BAA4B,CAAC,CAAC,EAC9BC,uBAAuB,CAAC,CAAC,CAC5B","ignoreList":[]}
+{"version":3,"names":["createDateTransformer","createNumberTransformer","createDynamicZoneTransformer","createObjectTransformer"],"sources":["index.ts"],"sourcesContent":["import { createDateTransformer } from \"./dateTransformer.js\";\nimport { createNumberTransformer } from \"./numberTransformer.js\";\nimport { createDynamicZoneTransformer } from \"./dynamicZoneTransformer.js\";\nimport { createObjectTransformer } from \"./objectTransformer.js\";\nimport type { CmsFieldValueTransformer } from \"~/types.js\";\n\nexport default (): CmsFieldValueTransformer[] => [\n    createDateTransformer(),\n    createNumberTransformer(),\n    createDynamicZoneTransformer(),\n    createObjectTransformer()\n];\n"],"mappings":"AAAA,SAASA,qBAAqB;AAC9B,SAASC,uBAAuB;AAChC,SAASC,4BAA4B;AACrC,SAASC,uBAAuB;AAGhC,eAAe,MAAkC,CAC7CH,qBAAqB,CAAC,CAAC,EACvBC,uBAAuB,CAAC,CAAC,EACzBC,4BAA4B,CAAC,CAAC,EAC9BC,uBAAuB,CAAC,CAAC,CAC5B","ignoreList":[]}

package/admin/plugins/transformers/numberTransformer.d.ts

@@ -1,2 +1,2 @@
-import type { CmsFieldValueTransformer } from "../../../types";
+import type { CmsFieldValueTransformer } from "../../../types.js";
 export declare const createNumberTransformer: () => CmsFieldValueTransformer;

package/admin/plugins/transformers/numberTransformer.js.map

@@ -1 +1 @@
-{"version":3,"names":["createNumberTransformer","type","name","fieldType","transform","value","Array","isArray","map","v","undefined","Number"],"sources":["numberTransformer.ts"],"sourcesContent":["import type { CmsFieldValueTransformer } from \"~/types\";\n\nexport const createNumberTransformer = (): CmsFieldValueTransformer => ({\n    type: \"cms-field-value-transformer\",\n    name: \"cms-field-value-transformer-number\",\n    fieldType: \"number\",\n    transform: value => {\n        if (Array.isArray(value) === true) {\n            return (value as string[]).map(v => {\n                if (v === null || v === undefined || v === \"\") {\n                    return null;\n                }\n                return Number(v);\n            });\n        } else if (value === null || value === undefined || value === \"\") {\n            return null;\n        }\n        return Number(value as string);\n    }\n});\n"],"mappings":"AAEA,OAAO,MAAMA,uBAAuB,GAAGA,CAAA,MAAiC;EACpEC,IAAI,EAAE,6BAA6B;EACnCC,IAAI,EAAE,oCAAoC;EAC1CC,SAAS,EAAE,QAAQ;EACnBC,SAAS,EAAEC,KAAK,IAAI;IAChB,IAAIC,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC,KAAK,IAAI,EAAE;MAC/B,OAAQA,KAAK,CAAcG,GAAG,CAACC,CAAC,IAAI;QAChC,IAAIA,CAAC,KAAK,IAAI,IAAIA,CAAC,KAAKC,SAAS,IAAID,CAAC,KAAK,EAAE,EAAE;UAC3C,OAAO,IAAI;QACf;QACA,OAAOE,MAAM,CAACF,CAAC,CAAC;MACpB,CAAC,CAAC;IACN,CAAC,MAAM,IAAIJ,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAKK,SAAS,IAAIL,KAAK,KAAK,EAAE,EAAE;MAC9D,OAAO,IAAI;IACf;IACA,OAAOM,MAAM,CAACN,KAAe,CAAC;EAClC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["createNumberTransformer","type","name","fieldType","transform","value","Array","isArray","map","v","undefined","Number"],"sources":["numberTransformer.ts"],"sourcesContent":["import type { CmsFieldValueTransformer } from \"~/types.js\";\n\nexport const createNumberTransformer = (): CmsFieldValueTransformer => ({\n    type: \"cms-field-value-transformer\",\n    name: \"cms-field-value-transformer-number\",\n    fieldType: \"number\",\n    transform: value => {\n        if (Array.isArray(value) === true) {\n            return (value as string[]).map(v => {\n                if (v === null || v === undefined || v === \"\") {\n                    return null;\n                }\n                return Number(v);\n            });\n        } else if (value === null || value === undefined || value === \"\") {\n            return null;\n        }\n        return Number(value as string);\n    }\n});\n"],"mappings":"AAEA,OAAO,MAAMA,uBAAuB,GAAGA,CAAA,MAAiC;EACpEC,IAAI,EAAE,6BAA6B;EACnCC,IAAI,EAAE,oCAAoC;EAC1CC,SAAS,EAAE,QAAQ;EACnBC,SAAS,EAAEC,KAAK,IAAI;IAChB,IAAIC,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC,KAAK,IAAI,EAAE;MAC/B,OAAQA,KAAK,CAAcG,GAAG,CAACC,CAAC,IAAI;QAChC,IAAIA,CAAC,KAAK,IAAI,IAAIA,CAAC,KAAKC,SAAS,IAAID,CAAC,KAAK,EAAE,EAAE;UAC3C,OAAO,IAAI;QACf;QACA,OAAOE,MAAM,CAACF,CAAC,CAAC;MACpB,CAAC,CAAC;IACN,CAAC,MAAM,IAAIJ,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAKK,SAAS,IAAIL,KAAK,KAAK,EAAE,EAAE;MAC9D,OAAO,IAAI;IACf;IACA,OAAOM,MAAM,CAACN,KAAe,CAAC;EAClC;AACJ,CAAC,CAAC","ignoreList":[]}

package/admin/plugins/transformers/objectTransformer.d.ts

@@ -1,2 +1,2 @@
-import type { CmsFieldValueTransformer } from "../../../types";
+import type { CmsFieldValueTransformer } from "../../../types.js";
 export declare const createObjectTransformer: () => CmsFieldValueTransformer;

package/admin/plugins/transformers/objectTransformer.js.map

@@ -1 +1 @@
-{"version":3,"names":["prepareFormData","createObjectTransformer","type","name","fieldType","transform","value","field","childFields","settings","fields","length"],"sources":["objectTransformer.ts"],"sourcesContent":["import type { CmsFieldValueTransformer } from \"~/types\";\nimport { prepareFormData } from \"@webiny/app-headless-cms-common\";\n\nexport const createObjectTransformer = (): CmsFieldValueTransformer => ({\n    type: \"cms-field-value-transformer\",\n    name: \"cms-field-value-transformer-object\",\n    fieldType: \"object\",\n    transform: (value, field) => {\n        const childFields = field.settings?.fields || [];\n\n        if (!value || childFields.length === 0) {\n            return value;\n        }\n\n        return prepareFormData(value, childFields);\n    }\n});\n"],"mappings":"AACA,SAASA,eAAe,QAAQ,iCAAiC;AAEjE,OAAO,MAAMC,uBAAuB,GAAGA,CAAA,MAAiC;EACpEC,IAAI,EAAE,6BAA6B;EACnCC,IAAI,EAAE,oCAAoC;EAC1CC,SAAS,EAAE,QAAQ;EACnBC,SAAS,EAAEA,CAACC,KAAK,EAAEC,KAAK,KAAK;IACzB,MAAMC,WAAW,GAAGD,KAAK,CAACE,QAAQ,EAAEC,MAAM,IAAI,EAAE;IAEhD,IAAI,CAACJ,KAAK,IAAIE,WAAW,CAACG,MAAM,KAAK,CAAC,EAAE;MACpC,OAAOL,KAAK;IAChB;IAEA,OAAON,eAAe,CAACM,KAAK,EAAEE,WAAW,CAAC;EAC9C;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["prepareFormData","createObjectTransformer","type","name","fieldType","transform","value","field","childFields","settings","fields","length"],"sources":["objectTransformer.ts"],"sourcesContent":["import type { CmsFieldValueTransformer } from \"~/types.js\";\nimport { prepareFormData } from \"@webiny/app-headless-cms-common\";\n\nexport const createObjectTransformer = (): CmsFieldValueTransformer => ({\n    type: \"cms-field-value-transformer\",\n    name: \"cms-field-value-transformer-object\",\n    fieldType: \"object\",\n    transform: (value, field) => {\n        const childFields = field.settings?.fields || [];\n\n        if (!value || childFields.length === 0) {\n            return value;\n        }\n\n        return prepareFormData(value, childFields);\n    }\n});\n"],"mappings":"AACA,SAASA,eAAe,QAAQ,iCAAiC;AAEjE,OAAO,MAAMC,uBAAuB,GAAGA,CAAA,MAAiC;EACpEC,IAAI,EAAE,6BAA6B;EACnCC,IAAI,EAAE,oCAAoC;EAC1CC,SAAS,EAAE,QAAQ;EACnBC,SAAS,EAAEA,CAACC,KAAK,EAAEC,KAAK,KAAK;IACzB,MAAMC,WAAW,GAAGD,KAAK,CAACE,QAAQ,EAAEC,MAAM,IAAI,EAAE;IAEhD,IAAI,CAACJ,KAAK,IAAIE,WAAW,CAACG,MAAM,KAAK,CAAC,EAAE;MACpC,OAAOL,KAAK;IAChB;IAEA,OAAON,eAAe,CAACM,KAAK,EAAEE,WAAW,CAAC;EAC9C;AACJ,CAAC,CAAC","ignoreList":[]}

package/admin/views/contentEntries/ContentEntries.js

@@ -1,12 +1,10 @@
 import React from "react";
 import { DialogsProvider, makeDecoratable } from "@webiny/app-admin";
-import { AcoWithConfig } from "@webiny/app-aco";
-import { Table as CmsAcoTable } from "./Table";
-import { useModel } from "../../components/ModelProvider";
-import { ContentEntryEditorWithConfig, ContentEntryListWithConfig } from "../../config/contentEntries";
-import { ContentEntriesProvider } from "./ContentEntriesContext";
-import { ContentEntriesDebounceRenderer } from "./ContentEntriesDebounceRender";
-import { ModelIsBeingDeletedError } from "../../components/ContentModelEditor/ModelIsBeingDeletedError";
+import { Table as CmsAcoTable } from "./Table/index.js";
+import { useModel } from "../../components/ModelProvider/index.js";
+import { ContentEntryEditorWithConfig, ContentEntryListWithConfig } from "../../config/contentEntries/index.js";
+import { ContentEntriesProvider } from "./ContentEntriesContext.js";
+import { ModelIsBeingDeletedError } from "../../components/ContentModelEditor/ModelIsBeingDeletedError/index.js";
 export const ContentEntries = makeDecoratable("ContentEntries", () => {
   const {
     model
@@ -19,7 +17,7 @@ export const ContentEntries = makeDecoratable("ContentEntries", () => {
   return /*#__PURE__*/React.createElement(ContentEntriesProvider, {
     contentModel: model,
     key: model.modelId
-  }, /*#__PURE__*/React.createElement(ContentEntryListWithConfig, null, /*#__PURE__*/React.createElement(ContentEntryEditorWithConfig, null, /*#__PURE__*/React.createElement(AcoWithConfig, null, /*#__PURE__*/React.createElement(DialogsProvider, null, /*#__PURE__*/React.createElement(ContentEntriesDebounceRenderer, null, /*#__PURE__*/React.createElement(CmsAcoTable, null)))))));
+  }, /*#__PURE__*/React.createElement(ContentEntryListWithConfig, null, /*#__PURE__*/React.createElement(ContentEntryEditorWithConfig, null, /*#__PURE__*/React.createElement(DialogsProvider, null, /*#__PURE__*/React.createElement(CmsAcoTable, null)))));
 });
 
 //# sourceMappingURL=ContentEntries.js.map

package/admin/views/contentEntries/ContentEntries.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","DialogsProvider","makeDecoratable","AcoWithConfig","Table","CmsAcoTable","useModel","ContentEntryEditorWithConfig","ContentEntryListWithConfig","ContentEntriesProvider","ContentEntriesDebounceRenderer","ModelIsBeingDeletedError","ContentEntries","model","isBeingDeleted","createElement","contentModel","key","modelId"],"sources":["ContentEntries.tsx"],"sourcesContent":["import React from \"react\";\nimport { DialogsProvider, makeDecoratable } from \"@webiny/app-admin\";\nimport { AcoWithConfig } from \"@webiny/app-aco\";\nimport { Table as CmsAcoTable } from \"./Table\";\nimport { useModel } from \"~/admin/components/ModelProvider\";\nimport {\n    ContentEntryEditorWithConfig,\n    ContentEntryListWithConfig\n} from \"~/admin/config/contentEntries\";\nimport { ContentEntriesProvider } from \"~/admin/views/contentEntries/ContentEntriesContext\";\nimport { ContentEntriesDebounceRenderer } from \"~/admin/views/contentEntries/ContentEntriesDebounceRender\";\nimport { ModelIsBeingDeletedError } from \"~/admin/components/ContentModelEditor/ModelIsBeingDeletedError\";\n\nexport const ContentEntries = makeDecoratable(\"ContentEntries\", () => {\n    const { model } = useModel();\n\n    if (model.isBeingDeleted) {\n        return <ModelIsBeingDeletedError model={model} />;\n    }\n\n    return (\n        <ContentEntriesProvider contentModel={model} key={model.modelId}>\n            <ContentEntryListWithConfig>\n                <ContentEntryEditorWithConfig>\n                    <AcoWithConfig>\n                        <DialogsProvider>\n                            <ContentEntriesDebounceRenderer>\n                                <CmsAcoTable />\n                            </ContentEntriesDebounceRenderer>\n                        </DialogsProvider>\n                    </AcoWithConfig>\n                </ContentEntryEditorWithConfig>\n            </ContentEntryListWithConfig>\n        </ContentEntriesProvider>\n    );\n});\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,eAAe,EAAEC,eAAe,QAAQ,mBAAmB;AACpE,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,SAASC,KAAK,IAAIC,WAAW;AAC7B,SAASC,QAAQ;AACjB,SACIC,4BAA4B,EAC5BC,0BAA0B;AAE9B,SAASC,sBAAsB;AAC/B,SAASC,8BAA8B;AACvC,SAASC,wBAAwB;AAEjC,OAAO,MAAMC,cAAc,GAAGV,eAAe,CAAC,gBAAgB,EAAE,MAAM;EAClE,MAAM;IAAEW;EAAM,CAAC,GAAGP,QAAQ,CAAC,CAAC;EAE5B,IAAIO,KAAK,CAACC,cAAc,EAAE;IACtB,oBAAOd,KAAA,CAAAe,aAAA,CAACJ,wBAAwB;MAACE,KAAK,EAAEA;IAAM,CAAE,CAAC;EACrD;EAEA,oBACIb,KAAA,CAAAe,aAAA,CAACN,sBAAsB;IAACO,YAAY,EAAEH,KAAM;IAACI,GAAG,EAAEJ,KAAK,CAACK;EAAQ,gBAC5DlB,KAAA,CAAAe,aAAA,CAACP,0BAA0B,qBACvBR,KAAA,CAAAe,aAAA,CAACR,4BAA4B,qBACzBP,KAAA,CAAAe,aAAA,CAACZ,aAAa,qBACVH,KAAA,CAAAe,aAAA,CAACd,eAAe,qBACZD,KAAA,CAAAe,aAAA,CAACL,8BAA8B,qBAC3BV,KAAA,CAAAe,aAAA,CAACV,WAAW,MAAE,CACc,CACnB,CACN,CACW,CACN,CACR,CAAC;AAEjC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","DialogsProvider","makeDecoratable","Table","CmsAcoTable","useModel","ContentEntryEditorWithConfig","ContentEntryListWithConfig","ContentEntriesProvider","ModelIsBeingDeletedError","ContentEntries","model","isBeingDeleted","createElement","contentModel","key","modelId"],"sources":["ContentEntries.tsx"],"sourcesContent":["import React from \"react\";\nimport { DialogsProvider, makeDecoratable } from \"@webiny/app-admin\";\nimport { Table as CmsAcoTable } from \"./Table/index.js\";\nimport { useModel } from \"~/admin/components/ModelProvider/index.js\";\nimport {\n    ContentEntryEditorWithConfig,\n    ContentEntryListWithConfig\n} from \"~/admin/config/contentEntries/index.js\";\nimport { ContentEntriesProvider } from \"~/admin/views/contentEntries/ContentEntriesContext.js\";\nimport { ModelIsBeingDeletedError } from \"~/admin/components/ContentModelEditor/ModelIsBeingDeletedError/index.js\";\n\nexport const ContentEntries = makeDecoratable(\"ContentEntries\", () => {\n    const { model } = useModel();\n\n    if (model.isBeingDeleted) {\n        return <ModelIsBeingDeletedError model={model} />;\n    }\n\n    return (\n        <ContentEntriesProvider contentModel={model} key={model.modelId}>\n            <ContentEntryListWithConfig>\n                <ContentEntryEditorWithConfig>\n                    <DialogsProvider>\n                        <CmsAcoTable />\n                    </DialogsProvider>\n                </ContentEntryEditorWithConfig>\n            </ContentEntryListWithConfig>\n        </ContentEntriesProvider>\n    );\n});\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,eAAe,EAAEC,eAAe,QAAQ,mBAAmB;AACpE,SAASC,KAAK,IAAIC,WAAW;AAC7B,SAASC,QAAQ;AACjB,SACIC,4BAA4B,EAC5BC,0BAA0B;AAE9B,SAASC,sBAAsB;AAC/B,SAASC,wBAAwB;AAEjC,OAAO,MAAMC,cAAc,GAAGR,eAAe,CAAC,gBAAgB,EAAE,MAAM;EAClE,MAAM;IAAES;EAAM,CAAC,GAAGN,QAAQ,CAAC,CAAC;EAE5B,IAAIM,KAAK,CAACC,cAAc,EAAE;IACtB,oBAAOZ,KAAA,CAAAa,aAAA,CAACJ,wBAAwB;MAACE,KAAK,EAAEA;IAAM,CAAE,CAAC;EACrD;EAEA,oBACIX,KAAA,CAAAa,aAAA,CAACL,sBAAsB;IAACM,YAAY,EAAEH,KAAM;IAACI,GAAG,EAAEJ,KAAK,CAACK;EAAQ,gBAC5DhB,KAAA,CAAAa,aAAA,CAACN,0BAA0B,qBACvBP,KAAA,CAAAa,aAAA,CAACP,4BAA4B,qBACzBN,KAAA,CAAAa,aAAA,CAACZ,eAAe,qBACZD,KAAA,CAAAa,aAAA,CAACT,WAAW,MAAE,CACD,CACS,CACN,CACR,CAAC;AAEjC,CAAC,CAAC","ignoreList":[]}

package/admin/views/contentEntries/ContentEntriesContainer.js

@@ -1,24 +1,26 @@
 import React, { useState } from "react";
-import get from "lodash/get";
-import { useRouter } from "@webiny/react-router";
-import { useSnackbar } from "@webiny/app-admin/hooks/useSnackbar";
-import { i18n } from "@webiny/app/i18n";
-import { GET_CONTENT_MODEL } from "../../graphql/contentModels";
-import { useQuery } from "../../hooks";
-import { ModelProvider } from "../../components/ModelProvider";
-import { LoadingContentModel } from "../../components/ContentEntries/LoadingContentModel";
+import get from "lodash/get.js";
+import { useRoute, useRouter, useSnackbar } from "@webiny/app-admin";
+import { i18n } from "@webiny/app/i18n/index.js";
+import { GET_CONTENT_MODEL } from "../../graphql/contentModels.js";
+import { useQuery } from "../../hooks/index.js";
+import { ModelProvider } from "../../components/ModelProvider/index.js";
+import { LoadingContentModel } from "../../components/ContentEntries/LoadingContentModel/index.js";
+import { Routes } from "../../../routes.js";
 const t = i18n.ns("app-headless-cms/admin/content-entries");
 export const ContentEntriesContainer = ({
   children
 }) => {
   const {
-    params
+    goToRoute
   } = useRouter();
-  const modelId = params?.modelId;
-  const [contentModel, setContentModel] = useState(null);
   const {
-    history
-  } = useRouter();
+    route
+  } = useRoute(Routes.ContentEntries.List);
+  const {
+    modelId
+  } = route.params;
+  const [contentModel, setContentModel] = useState(null);
   const {
     showSnackbar
   } = useSnackbar();
@@ -35,7 +37,7 @@ export const ContentEntriesContainer = ({
       if (contentModel) {
         return setContentModel(contentModel);
       }
-      history.push("/cms/content-models");
+      goToRoute(Routes.ContentModels.List);
       showSnackbar(t`Could not load model "{modelId}". Redirecting...`({
         modelId
       }));

package/admin/views/contentEntries/ContentEntriesContainer.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useState","get","useRouter","useSnackbar","i18n","GET_CONTENT_MODEL","useQuery","ModelProvider","LoadingContentModel","t","ns","ContentEntriesContainer","children","params","modelId","contentModel","setContentModel","history","showSnackbar","loading","error","skip","variables","onCompleted","data","push","createElement","message","model"],"sources":["ContentEntriesContainer.tsx"],"sourcesContent":["import React, { useState } from \"react\";\nimport get from \"lodash/get\";\nimport { useRouter } from \"@webiny/react-router\";\nimport { useSnackbar } from \"@webiny/app-admin/hooks/useSnackbar\";\nimport { i18n } from \"@webiny/app/i18n\";\nimport type {\n    GetCmsModelQueryResponse,\n    GetCmsModelQueryVariables\n} from \"~/admin/graphql/contentModels\";\nimport { GET_CONTENT_MODEL } from \"~/admin/graphql/contentModels\";\nimport { useQuery } from \"../../hooks\";\nimport type { CmsModel } from \"~/types\";\nimport { ModelProvider } from \"~/admin/components/ModelProvider\";\nimport { LoadingContentModel } from \"~/admin/components/ContentEntries/LoadingContentModel\";\n\nconst t = i18n.ns(\"app-headless-cms/admin/content-entries\");\n\ninterface ContentEntriesContainerProps {\n    children: React.ReactNode;\n}\n\nexport const ContentEntriesContainer = ({ children }: ContentEntriesContainerProps) => {\n    const { params } = useRouter();\n    const modelId = params?.modelId;\n    const [contentModel, setContentModel] = useState<CmsModel | null>(null);\n    const { history } = useRouter();\n    const { showSnackbar } = useSnackbar();\n\n    const { loading, error } = useQuery<GetCmsModelQueryResponse, GetCmsModelQueryVariables>(\n        GET_CONTENT_MODEL,\n        {\n            skip: !modelId,\n            variables: {\n                modelId: modelId as string\n            },\n            onCompleted: data => {\n                const contentModel = get(data, \"getContentModel.data\", null);\n                if (contentModel) {\n                    return setContentModel(contentModel);\n                }\n\n                history.push(\"/cms/content-models\");\n                showSnackbar(\n                    t`Could not load model \"{modelId}\". Redirecting...`({\n                        modelId\n                    })\n                );\n            }\n        }\n    );\n\n    if (!contentModel || loading) {\n        return <LoadingContentModel />;\n    } else if (error) {\n        showSnackbar(error.message);\n        return null;\n    }\n\n    return <ModelProvider model={contentModel}>{children}</ModelProvider>;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,QAAQ,QAAQ,OAAO;AACvC,OAAOC,GAAG,MAAM,YAAY;AAC5B,SAASC,SAAS,QAAQ,sBAAsB;AAChD,SAASC,WAAW,QAAQ,qCAAqC;AACjE,SAASC,IAAI,QAAQ,kBAAkB;AAKvC,SAASC,iBAAiB;AAC1B,SAASC,QAAQ;AAEjB,SAASC,aAAa;AACtB,SAASC,mBAAmB;AAE5B,MAAMC,CAAC,GAAGL,IAAI,CAACM,EAAE,CAAC,wCAAwC,CAAC;AAM3D,OAAO,MAAMC,uBAAuB,GAAGA,CAAC;EAAEC;AAAuC,CAAC,KAAK;EACnF,MAAM;IAAEC;EAAO,CAAC,GAAGX,SAAS,CAAC,CAAC;EAC9B,MAAMY,OAAO,GAAGD,MAAM,EAAEC,OAAO;EAC/B,MAAM,CAACC,YAAY,EAAEC,eAAe,CAAC,GAAGhB,QAAQ,CAAkB,IAAI,CAAC;EACvE,MAAM;IAAEiB;EAAQ,CAAC,GAAGf,SAAS,CAAC,CAAC;EAC/B,MAAM;IAAEgB;EAAa,CAAC,GAAGf,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEgB,OAAO;IAAEC;EAAM,CAAC,GAAGd,QAAQ,CAC/BD,iBAAiB,EACjB;IACIgB,IAAI,EAAE,CAACP,OAAO;IACdQ,SAAS,EAAE;MACPR,OAAO,EAAEA;IACb,CAAC;IACDS,WAAW,EAAEC,IAAI,IAAI;MACjB,MAAMT,YAAY,GAAGd,GAAG,CAACuB,IAAI,EAAE,sBAAsB,EAAE,IAAI,CAAC;MAC5D,IAAIT,YAAY,EAAE;QACd,OAAOC,eAAe,CAACD,YAAY,CAAC;MACxC;MAEAE,OAAO,CAACQ,IAAI,CAAC,qBAAqB,CAAC;MACnCP,YAAY,CACRT,CAAC,kDAAkD,CAAC;QAChDK;MACJ,CAAC,CACL,CAAC;IACL;EACJ,CACJ,CAAC;EAED,IAAI,CAACC,YAAY,IAAII,OAAO,EAAE;IAC1B,oBAAOpB,KAAA,CAAA2B,aAAA,CAAClB,mBAAmB,MAAE,CAAC;EAClC,CAAC,MAAM,IAAIY,KAAK,EAAE;IACdF,YAAY,CAACE,KAAK,CAACO,OAAO,CAAC;IAC3B,OAAO,IAAI;EACf;EAEA,oBAAO5B,KAAA,CAAA2B,aAAA,CAACnB,aAAa;IAACqB,KAAK,EAAEb;EAAa,GAAEH,QAAwB,CAAC;AACzE,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useState","get","useRoute","useRouter","useSnackbar","i18n","GET_CONTENT_MODEL","useQuery","ModelProvider","LoadingContentModel","Routes","t","ns","ContentEntriesContainer","children","goToRoute","route","ContentEntries","List","modelId","params","contentModel","setContentModel","showSnackbar","loading","error","skip","variables","onCompleted","data","ContentModels","createElement","message","model"],"sources":["ContentEntriesContainer.tsx"],"sourcesContent":["import React, { useState } from \"react\";\nimport get from \"lodash/get.js\";\nimport { useRoute, useRouter, useSnackbar } from \"@webiny/app-admin\";\nimport { i18n } from \"@webiny/app/i18n/index.js\";\nimport type {\n    GetCmsModelQueryResponse,\n    GetCmsModelQueryVariables\n} from \"~/admin/graphql/contentModels.js\";\nimport { GET_CONTENT_MODEL } from \"~/admin/graphql/contentModels.js\";\nimport { useQuery } from \"../../hooks/index.js\";\nimport type { CmsModel } from \"~/types.js\";\nimport { ModelProvider } from \"~/admin/components/ModelProvider/index.js\";\nimport { LoadingContentModel } from \"~/admin/components/ContentEntries/LoadingContentModel/index.js\";\nimport { Routes } from \"~/routes.js\";\n\nconst t = i18n.ns(\"app-headless-cms/admin/content-entries\");\n\ninterface ContentEntriesContainerProps {\n    children: React.ReactNode;\n}\n\nexport const ContentEntriesContainer = ({ children }: ContentEntriesContainerProps) => {\n    const { goToRoute } = useRouter();\n    const { route } = useRoute(Routes.ContentEntries.List);\n    const { modelId } = route.params;\n    const [contentModel, setContentModel] = useState<CmsModel | null>(null);\n    const { showSnackbar } = useSnackbar();\n\n    const { loading, error } = useQuery<GetCmsModelQueryResponse, GetCmsModelQueryVariables>(\n        GET_CONTENT_MODEL,\n        {\n            skip: !modelId,\n            variables: {\n                modelId: modelId as string\n            },\n            onCompleted: data => {\n                const contentModel = get(data, \"getContentModel.data\", null);\n                if (contentModel) {\n                    return setContentModel(contentModel);\n                }\n\n                goToRoute(Routes.ContentModels.List);\n                showSnackbar(\n                    t`Could not load model \"{modelId}\". Redirecting...`({\n                        modelId\n                    })\n                );\n            }\n        }\n    );\n\n    if (!contentModel || loading) {\n        return <LoadingContentModel />;\n    } else if (error) {\n        showSnackbar(error.message);\n        return null;\n    }\n\n    return <ModelProvider model={contentModel}>{children}</ModelProvider>;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,QAAQ,QAAQ,OAAO;AACvC,OAAOC,GAAG,MAAM,eAAe;AAC/B,SAASC,QAAQ,EAAEC,SAAS,EAAEC,WAAW,QAAQ,mBAAmB;AACpE,SAASC,IAAI,QAAQ,2BAA2B;AAKhD,SAASC,iBAAiB;AAC1B,SAASC,QAAQ;AAEjB,SAASC,aAAa;AACtB,SAASC,mBAAmB;AAC5B,SAASC,MAAM;AAEf,MAAMC,CAAC,GAAGN,IAAI,CAACO,EAAE,CAAC,wCAAwC,CAAC;AAM3D,OAAO,MAAMC,uBAAuB,GAAGA,CAAC;EAAEC;AAAuC,CAAC,KAAK;EACnF,MAAM;IAAEC;EAAU,CAAC,GAAGZ,SAAS,CAAC,CAAC;EACjC,MAAM;IAAEa;EAAM,CAAC,GAAGd,QAAQ,CAACQ,MAAM,CAACO,cAAc,CAACC,IAAI,CAAC;EACtD,MAAM;IAAEC;EAAQ,CAAC,GAAGH,KAAK,CAACI,MAAM;EAChC,MAAM,CAACC,YAAY,EAAEC,eAAe,CAAC,GAAGtB,QAAQ,CAAkB,IAAI,CAAC;EACvE,MAAM;IAAEuB;EAAa,CAAC,GAAGnB,WAAW,CAAC,CAAC;EAEtC,MAAM;IAAEoB,OAAO;IAAEC;EAAM,CAAC,GAAGlB,QAAQ,CAC/BD,iBAAiB,EACjB;IACIoB,IAAI,EAAE,CAACP,OAAO;IACdQ,SAAS,EAAE;MACPR,OAAO,EAAEA;IACb,CAAC;IACDS,WAAW,EAAEC,IAAI,IAAI;MACjB,MAAMR,YAAY,GAAGpB,GAAG,CAAC4B,IAAI,EAAE,sBAAsB,EAAE,IAAI,CAAC;MAC5D,IAAIR,YAAY,EAAE;QACd,OAAOC,eAAe,CAACD,YAAY,CAAC;MACxC;MAEAN,SAAS,CAACL,MAAM,CAACoB,aAAa,CAACZ,IAAI,CAAC;MACpCK,YAAY,CACRZ,CAAC,kDAAkD,CAAC;QAChDQ;MACJ,CAAC,CACL,CAAC;IACL;EACJ,CACJ,CAAC;EAED,IAAI,CAACE,YAAY,IAAIG,OAAO,EAAE;IAC1B,oBAAOzB,KAAA,CAAAgC,aAAA,CAACtB,mBAAmB,MAAE,CAAC;EAClC,CAAC,MAAM,IAAIgB,KAAK,EAAE;IACdF,YAAY,CAACE,KAAK,CAACO,OAAO,CAAC;IAC3B,OAAO,IAAI;EACf;EAEA,oBAAOjC,KAAA,CAAAgC,aAAA,CAACvB,aAAa;IAACyB,KAAK,EAAEZ;EAAa,GAAEP,QAAwB,CAAC;AACzE,CAAC","ignoreList":[]}

package/admin/views/contentEntries/ContentEntriesContext.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { CmsModel } from "../../../types";
+import type { CmsModel } from "../../../types.js";
 export interface ContentEntriesContext {
     contentModel: CmsModel;
     canCreate: boolean;

package/admin/views/contentEntries/ContentEntriesContext.js

@@ -1,5 +1,5 @@
 import React, { useMemo } from "react";
-import { useSecurity } from "@webiny/app-security";
+import { useSecurity } from "@webiny/app-admin";
 export const ContentEntriesContext = /*#__PURE__*/React.createContext(undefined);
 export const ContentEntriesProvider = ({
   contentModel,

package/admin/views/contentEntries/ContentEntriesContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","useSecurity","ContentEntriesContext","createContext","undefined","ContentEntriesProvider","contentModel","children","insideDialog","identity","getPermission","canCreate","permission","rwd","includes","value","createElement","Provider","displayName"],"sources":["ContentEntriesContext.tsx"],"sourcesContent":["import React, { useMemo } from \"react\";\nimport { useSecurity } from \"@webiny/app-security\";\nimport type { CmsModel, CmsSecurityPermission } from \"~/types\";\n\nexport interface ContentEntriesContext {\n    contentModel: CmsModel;\n    canCreate: boolean;\n    insideDialog?: boolean;\n}\n\nexport const ContentEntriesContext = React.createContext<ContentEntriesContext | undefined>(\n    undefined\n);\n\nexport interface ContentEntriesContextProviderProps {\n    contentModel: CmsModel;\n    children: React.ReactNode;\n    insideDialog?: boolean;\n}\n\nexport const ContentEntriesProvider = ({\n    contentModel,\n    children,\n    insideDialog\n}: ContentEntriesContextProviderProps) => {\n    const { identity, getPermission } = useSecurity();\n\n    const canCreate = useMemo((): boolean => {\n        const permission = getPermission<CmsSecurityPermission>(\"cms.contentEntry\");\n        if (!permission) {\n            return false;\n        }\n\n        if (typeof permission.rwd !== \"string\") {\n            return true;\n        }\n\n        return permission.rwd.includes(\"w\");\n    }, [identity]);\n\n    const value = {\n        insideDialog,\n        contentModel,\n        canCreate\n    };\n\n    return (\n        <ContentEntriesContext.Provider value={value}>{children}</ContentEntriesContext.Provider>\n    );\n};\n\nContentEntriesProvider.displayName = \"ContentEntriesProvider\";\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,SAASC,WAAW,QAAQ,sBAAsB;AASlD,OAAO,MAAMC,qBAAqB,gBAAGH,KAAK,CAACI,aAAa,CACpDC,SACJ,CAAC;AAQD,OAAO,MAAMC,sBAAsB,GAAGA,CAAC;EACnCC,YAAY;EACZC,QAAQ;EACRC;AACgC,CAAC,KAAK;EACtC,MAAM;IAAEC,QAAQ;IAAEC;EAAc,CAAC,GAAGT,WAAW,CAAC,CAAC;EAEjD,MAAMU,SAAS,GAAGX,OAAO,CAAC,MAAe;IACrC,MAAMY,UAAU,GAAGF,aAAa,CAAwB,kBAAkB,CAAC;IAC3E,IAAI,CAACE,UAAU,EAAE;MACb,OAAO,KAAK;IAChB;IAEA,IAAI,OAAOA,UAAU,CAACC,GAAG,KAAK,QAAQ,EAAE;MACpC,OAAO,IAAI;IACf;IAEA,OAAOD,UAAU,CAACC,GAAG,CAACC,QAAQ,CAAC,GAAG,CAAC;EACvC,CAAC,EAAE,CAACL,QAAQ,CAAC,CAAC;EAEd,MAAMM,KAAK,GAAG;IACVP,YAAY;IACZF,YAAY;IACZK;EACJ,CAAC;EAED,oBACIZ,KAAA,CAAAiB,aAAA,CAACd,qBAAqB,CAACe,QAAQ;IAACF,KAAK,EAAEA;EAAM,GAAER,QAAyC,CAAC;AAEjG,CAAC;AAEDF,sBAAsB,CAACa,WAAW,GAAG,wBAAwB","ignoreList":[]}
+{"version":3,"names":["React","useMemo","useSecurity","ContentEntriesContext","createContext","undefined","ContentEntriesProvider","contentModel","children","insideDialog","identity","getPermission","canCreate","permission","rwd","includes","value","createElement","Provider","displayName"],"sources":["ContentEntriesContext.tsx"],"sourcesContent":["import React, { useMemo } from \"react\";\nimport { useSecurity } from \"@webiny/app-admin\";\nimport type { CmsModel, CmsSecurityPermission } from \"~/types.js\";\n\nexport interface ContentEntriesContext {\n    contentModel: CmsModel;\n    canCreate: boolean;\n    insideDialog?: boolean;\n}\n\nexport const ContentEntriesContext = React.createContext<ContentEntriesContext | undefined>(\n    undefined\n);\n\nexport interface ContentEntriesContextProviderProps {\n    contentModel: CmsModel;\n    children: React.ReactNode;\n    insideDialog?: boolean;\n}\n\nexport const ContentEntriesProvider = ({\n    contentModel,\n    children,\n    insideDialog\n}: ContentEntriesContextProviderProps) => {\n    const { identity, getPermission } = useSecurity();\n\n    const canCreate = useMemo((): boolean => {\n        const permission = getPermission<CmsSecurityPermission>(\"cms.contentEntry\");\n        if (!permission) {\n            return false;\n        }\n\n        if (typeof permission.rwd !== \"string\") {\n            return true;\n        }\n\n        return permission.rwd.includes(\"w\");\n    }, [identity]);\n\n    const value = {\n        insideDialog,\n        contentModel,\n        canCreate\n    };\n\n    return (\n        <ContentEntriesContext.Provider value={value}>{children}</ContentEntriesContext.Provider>\n    );\n};\n\nContentEntriesProvider.displayName = \"ContentEntriesProvider\";\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,SAASC,WAAW,QAAQ,mBAAmB;AAS/C,OAAO,MAAMC,qBAAqB,gBAAGH,KAAK,CAACI,aAAa,CACpDC,SACJ,CAAC;AAQD,OAAO,MAAMC,sBAAsB,GAAGA,CAAC;EACnCC,YAAY;EACZC,QAAQ;EACRC;AACgC,CAAC,KAAK;EACtC,MAAM;IAAEC,QAAQ;IAAEC;EAAc,CAAC,GAAGT,WAAW,CAAC,CAAC;EAEjD,MAAMU,SAAS,GAAGX,OAAO,CAAC,MAAe;IACrC,MAAMY,UAAU,GAAGF,aAAa,CAAwB,kBAAkB,CAAC;IAC3E,IAAI,CAACE,UAAU,EAAE;MACb,OAAO,KAAK;IAChB;IAEA,IAAI,OAAOA,UAAU,CAACC,GAAG,KAAK,QAAQ,EAAE;MACpC,OAAO,IAAI;IACf;IAEA,OAAOD,UAAU,CAACC,GAAG,CAACC,QAAQ,CAAC,GAAG,CAAC;EACvC,CAAC,EAAE,CAACL,QAAQ,CAAC,CAAC;EAEd,MAAMM,KAAK,GAAG;IACVP,YAAY;IACZF,YAAY;IACZK;EACJ,CAAC;EAED,oBACIZ,KAAA,CAAAiB,aAAA,CAACd,qBAAqB,CAACe,QAAQ;IAACF,KAAK,EAAEA;EAAM,GAAER,QAAyC,CAAC;AAEjG,CAAC;AAEDF,sBAAsB,CAACa,WAAW,GAAG,wBAAwB","ignoreList":[]}