@webiny/api-headless-cms 0.0.0-unstable.5e7233243f → 0.0.0-unstable.60e968001a

package/crud/contentModel/beforeCreate.js

@@ -1,11 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.assignBeforeModelCreate = void 0;
+exports.assignModelBeforeCreate = void 0;
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
@@ -107,7 +107,7 @@ const getModelId = model => {
   });
 };
 
-const createOnBeforeCb = ({
+const createOnModelBeforeCb = ({
   plugins,
   storageOperations
 }) => {
@@ -149,14 +149,14 @@ const createOnBeforeCb = ({
  * We attach both on before create and createFrom events here.
  * Callables are identical.
  */
-const assignBeforeModelCreate = params => {
+const assignModelBeforeCreate = params => {
   const {
-    onBeforeModelCreate,
-    onBeforeModelCreateFrom,
+    onModelBeforeCreate,
+    onModelBeforeCreateFrom,
     storageOperations,
     plugins
   } = params;
-  onBeforeModelCreate.subscribe(async ({
+  onModelBeforeCreate.subscribe(async ({
     model,
     input
   }) => {
@@ -168,7 +168,7 @@ const assignBeforeModelCreate = params => {
      * then we run the shared create/createFrom methods.
      */
 
-    const cb = createOnBeforeCb({
+    const cb = createOnModelBeforeCb({
       storageOperations,
       plugins
     });
@@ -185,10 +185,10 @@ const assignBeforeModelCreate = params => {
       plugins
     });
   });
-  onBeforeModelCreateFrom.subscribe(createOnBeforeCb({
+  onModelBeforeCreateFrom.subscribe(createOnModelBeforeCb({
     storageOperations,
     plugins
   }));
 };
 
-exports.assignBeforeModelCreate = assignBeforeModelCreate;
+exports.assignModelBeforeCreate = assignModelBeforeCreate;

package/crud/contentModel/beforeCreate.js.map

@@ -1 +1 @@
-{"version":3,"names":["disallowedModelIdList","disallowedModelIdEndingList","checkModelIdUniqueness","modelIdList","modelId","includes","WebinyError","pluralizedModelIdCamelCase","pluralize","plural","singularizedModelIdCamelCase","singular","checkModelIdAllowed","checkModelIdEndingAllowed","ending","re","RegExp","matched","match","getModelId","model","name","camelCase","trim","createOnBeforeCb","plugins","storageOperations","params","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","models","list","where","tenant","locale","map","m","assignBeforeModelCreate","onBeforeModelCreate","onBeforeModelCreateFrom","subscribe","input","validateLayout","layout","fields","cb","validateModel"],"sources":["beforeCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport camelCase from \"lodash/camelCase\";\nimport pluralize from \"pluralize\";\nimport {\n    BeforeModelCreateFromTopicParams,\n    BeforeModelCreateTopicParams,\n    CmsModel,\n    HeadlessCmsStorageOperations\n} from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { validateModel } from \"./validateModel\";\nimport { validateLayout } from \"./validateLayout\";\n\nconst disallowedModelIdList: string[] = [\n    \"contentModel\",\n    \"contentModels\",\n    \"contentModelGroup\",\n    \"contentModelGroups\"\n];\n/**\n * This list is to disallow creating models that might interfere with GraphQL schema creation.\n * Add more if required.\n */\nconst disallowedModelIdEndingList: string[] = [\n    \"Response\",\n    \"List\",\n    \"Meta\",\n    \"Input\",\n    \"Sorter\",\n    \"RefType\"\n];\n\n/**\n * Checks for the uniqueness of provided modelId, against the provided list of models.\n * It also takes plural / singular forms of the provided modelId into account.\n */\nconst checkModelIdUniqueness = (modelIdList: string[], modelId: string) => {\n    if (modelIdList.includes(modelId) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" already exists.`,\n            \"MODEL_ID_EXISTS\",\n            {\n                modelId\n            }\n        );\n    }\n    /**\n     * Additionally, check if the plural form of the received modelId exists too. This prevents users\n     * from creating, for example, \"event\" and \"events\" models, which would break the GraphQL schema.\n     * 1. First check if user wants to create the \"event\" model, but the \"events\" model already exists.\n     */\n    const pluralizedModelIdCamelCase = pluralize(modelId);\n    if (modelIdList.includes(pluralizedModelIdCamelCase) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" does not exist, but a model with modelId \"${pluralizedModelIdCamelCase}\" does.`,\n            \"MODEL_ID_PLURAL_ERROR\",\n            {\n                modelId,\n                plural: pluralizedModelIdCamelCase\n            }\n        );\n    }\n\n    /**\n     * 2. Then check if user wants to create the \"events\" model, but the \"event\" model already exists.\n     */\n    const singularizedModelIdCamelCase = pluralize.singular(modelId);\n    if (modelIdList.includes(singularizedModelIdCamelCase) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" does not exist, but a model with modelId \"${singularizedModelIdCamelCase}\" does.`,\n            \"MODEL_ID_SINGULAR_ERROR\",\n            {\n                modelId,\n                singular: singularizedModelIdCamelCase\n            }\n        );\n    }\n};\n\nconst checkModelIdAllowed = (modelId: string): void => {\n    if (disallowedModelIdList.includes(modelId) === false) {\n        return;\n    }\n    throw new WebinyError(`Provided model ID \"${modelId}\" is not allowed.`);\n};\n\nconst checkModelIdEndingAllowed = (modelId: string): void => {\n    for (const ending of disallowedModelIdEndingList) {\n        const re = new RegExp(`${ending}$`, \"i\");\n        const matched = modelId.match(re);\n        if (matched === null) {\n            continue;\n        }\n        throw new WebinyError(\n            `ModelId that ends with \"${ending}\" is not allowed.`,\n            \"MODEL_ID_NOT_ALLOWED\",\n            {\n                modelId\n            }\n        );\n    }\n};\n\nconst getModelId = (model: CmsModel): string => {\n    const { modelId, name } = model;\n    if (!!modelId) {\n        return camelCase(modelId.trim());\n    } else if (name) {\n        return camelCase(name.trim());\n    }\n    throw new WebinyError(\n        `There is no \"modelId\" or \"name\" passed into the create model method.`,\n        \"MISSING_MODEL_DATA\",\n        {\n            model\n        }\n    );\n};\n\ninterface CreateOnBeforeCreateCbParams {\n    plugins: PluginsContainer;\n    storageOperations: HeadlessCmsStorageOperations;\n}\nconst createOnBeforeCb = ({ plugins, storageOperations }: CreateOnBeforeCreateCbParams) => {\n    return async (params: BeforeModelCreateTopicParams | BeforeModelCreateFromTopicParams) => {\n        const { model } = params;\n\n        const modelId = getModelId(model);\n\n        const modelPlugin = plugins\n            .byType<CmsModelPlugin>(CmsModelPlugin.type)\n            .find((item: CmsModelPlugin) => item.contentModel.modelId === modelId);\n\n        if (modelPlugin) {\n            throw new WebinyError(\n                `Cannot create \"${model.modelId}\" content model because one is already registered via a plugin.`,\n                \"CONTENT_MODEL_CREATE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        const models = await storageOperations.models.list({\n            where: {\n                tenant: model.tenant,\n                locale: model.locale\n            }\n        });\n        const modelIdList = models.map(m => m.modelId);\n\n        /**\n         * We need to check for:\n         *  - is that exact modelId allowed\n         *  - is modelId unique\n         *  - is model ending allowed\n         */\n        checkModelIdAllowed(modelId);\n        checkModelIdEndingAllowed(modelId);\n        checkModelIdUniqueness(modelIdList, modelId);\n        model.modelId = modelId;\n    };\n};\n\ninterface AssignBeforeModelCreateParams {\n    onBeforeModelCreate: Topic<BeforeModelCreateTopicParams>;\n    onBeforeModelCreateFrom: Topic<BeforeModelCreateFromTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\n\n/**\n * We attach both on before create and createFrom events here.\n * Callables are identical.\n */\nexport const assignBeforeModelCreate = (params: AssignBeforeModelCreateParams) => {\n    const { onBeforeModelCreate, onBeforeModelCreateFrom, storageOperations, plugins } = params;\n\n    onBeforeModelCreate.subscribe(async ({ model, input }) => {\n        /**\n         * First the layout...\n         */\n        validateLayout(model.layout, model.fields);\n        /**\n         * then we run the shared create/createFrom methods.\n         */\n        const cb = createOnBeforeCb({\n            storageOperations,\n            plugins\n        });\n        await cb({\n            model,\n            input\n        });\n\n        /**\n         * and then we move onto model and fields...\n         */\n        await validateModel({\n            model,\n            plugins\n        });\n    });\n\n    onBeforeModelCreateFrom.subscribe(\n        createOnBeforeCb({\n            storageOperations,\n            plugins\n        })\n    );\n};\n"],"mappings":"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"}
+{"version":3,"names":["disallowedModelIdList","disallowedModelIdEndingList","checkModelIdUniqueness","modelIdList","modelId","includes","WebinyError","pluralizedModelIdCamelCase","pluralize","plural","singularizedModelIdCamelCase","singular","checkModelIdAllowed","checkModelIdEndingAllowed","ending","re","RegExp","matched","match","getModelId","model","name","camelCase","trim","createOnModelBeforeCb","plugins","storageOperations","params","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","models","list","where","tenant","locale","map","m","assignModelBeforeCreate","onModelBeforeCreate","onModelBeforeCreateFrom","subscribe","input","validateLayout","layout","fields","cb","validateModel"],"sources":["beforeCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport camelCase from \"lodash/camelCase\";\nimport pluralize from \"pluralize\";\nimport {\n    OnModelBeforeCreateFromTopicParams,\n    OnModelBeforeCreateTopicParams,\n    CmsModel,\n    HeadlessCmsStorageOperations\n} from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { validateModel } from \"./validateModel\";\nimport { validateLayout } from \"./validateLayout\";\n\nconst disallowedModelIdList: string[] = [\n    \"contentModel\",\n    \"contentModels\",\n    \"contentModelGroup\",\n    \"contentModelGroups\"\n];\n/**\n * This list is to disallow creating models that might interfere with GraphQL schema creation.\n * Add more if required.\n */\nconst disallowedModelIdEndingList: string[] = [\n    \"Response\",\n    \"List\",\n    \"Meta\",\n    \"Input\",\n    \"Sorter\",\n    \"RefType\"\n];\n\n/**\n * Checks for the uniqueness of provided modelId, against the provided list of models.\n * It also takes plural / singular forms of the provided modelId into account.\n */\nconst checkModelIdUniqueness = (modelIdList: string[], modelId: string) => {\n    if (modelIdList.includes(modelId) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" already exists.`,\n            \"MODEL_ID_EXISTS\",\n            {\n                modelId\n            }\n        );\n    }\n    /**\n     * Additionally, check if the plural form of the received modelId exists too. This prevents users\n     * from creating, for example, \"event\" and \"events\" models, which would break the GraphQL schema.\n     * 1. First check if user wants to create the \"event\" model, but the \"events\" model already exists.\n     */\n    const pluralizedModelIdCamelCase = pluralize(modelId);\n    if (modelIdList.includes(pluralizedModelIdCamelCase) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" does not exist, but a model with modelId \"${pluralizedModelIdCamelCase}\" does.`,\n            \"MODEL_ID_PLURAL_ERROR\",\n            {\n                modelId,\n                plural: pluralizedModelIdCamelCase\n            }\n        );\n    }\n\n    /**\n     * 2. Then check if user wants to create the \"events\" model, but the \"event\" model already exists.\n     */\n    const singularizedModelIdCamelCase = pluralize.singular(modelId);\n    if (modelIdList.includes(singularizedModelIdCamelCase) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" does not exist, but a model with modelId \"${singularizedModelIdCamelCase}\" does.`,\n            \"MODEL_ID_SINGULAR_ERROR\",\n            {\n                modelId,\n                singular: singularizedModelIdCamelCase\n            }\n        );\n    }\n};\n\nconst checkModelIdAllowed = (modelId: string): void => {\n    if (disallowedModelIdList.includes(modelId) === false) {\n        return;\n    }\n    throw new WebinyError(`Provided model ID \"${modelId}\" is not allowed.`);\n};\n\nconst checkModelIdEndingAllowed = (modelId: string): void => {\n    for (const ending of disallowedModelIdEndingList) {\n        const re = new RegExp(`${ending}$`, \"i\");\n        const matched = modelId.match(re);\n        if (matched === null) {\n            continue;\n        }\n        throw new WebinyError(\n            `ModelId that ends with \"${ending}\" is not allowed.`,\n            \"MODEL_ID_NOT_ALLOWED\",\n            {\n                modelId\n            }\n        );\n    }\n};\n\nconst getModelId = (model: CmsModel): string => {\n    const { modelId, name } = model;\n    if (!!modelId) {\n        return camelCase(modelId.trim());\n    } else if (name) {\n        return camelCase(name.trim());\n    }\n    throw new WebinyError(\n        `There is no \"modelId\" or \"name\" passed into the create model method.`,\n        \"MISSING_MODEL_DATA\",\n        {\n            model\n        }\n    );\n};\n\ninterface CreateOnModelBeforeCreateCbParams {\n    plugins: PluginsContainer;\n    storageOperations: HeadlessCmsStorageOperations;\n}\nconst createOnModelBeforeCb = ({\n    plugins,\n    storageOperations\n}: CreateOnModelBeforeCreateCbParams) => {\n    return async (params: OnModelBeforeCreateTopicParams | OnModelBeforeCreateFromTopicParams) => {\n        const { model } = params;\n\n        const modelId = getModelId(model);\n\n        const modelPlugin = plugins\n            .byType<CmsModelPlugin>(CmsModelPlugin.type)\n            .find((item: CmsModelPlugin) => item.contentModel.modelId === modelId);\n\n        if (modelPlugin) {\n            throw new WebinyError(\n                `Cannot create \"${model.modelId}\" content model because one is already registered via a plugin.`,\n                \"CONTENT_MODEL_CREATE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        const models = await storageOperations.models.list({\n            where: {\n                tenant: model.tenant,\n                locale: model.locale\n            }\n        });\n        const modelIdList = models.map(m => m.modelId);\n\n        /**\n         * We need to check for:\n         *  - is that exact modelId allowed\n         *  - is modelId unique\n         *  - is model ending allowed\n         */\n        checkModelIdAllowed(modelId);\n        checkModelIdEndingAllowed(modelId);\n        checkModelIdUniqueness(modelIdList, modelId);\n        model.modelId = modelId;\n    };\n};\n\ninterface AssignBeforeModelCreateParams {\n    onModelBeforeCreate: Topic<OnModelBeforeCreateTopicParams>;\n    onModelBeforeCreateFrom: Topic<OnModelBeforeCreateFromTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\n\n/**\n * We attach both on before create and createFrom events here.\n * Callables are identical.\n */\nexport const assignModelBeforeCreate = (params: AssignBeforeModelCreateParams) => {\n    const { onModelBeforeCreate, onModelBeforeCreateFrom, storageOperations, plugins } = params;\n\n    onModelBeforeCreate.subscribe(async ({ model, input }) => {\n        /**\n         * First the layout...\n         */\n        validateLayout(model.layout, model.fields);\n        /**\n         * then we run the shared create/createFrom methods.\n         */\n        const cb = createOnModelBeforeCb({\n            storageOperations,\n            plugins\n        });\n        await cb({\n            model,\n            input\n        });\n\n        /**\n         * and then we move onto model and fields...\n         */\n        await validateModel({\n            model,\n            plugins\n        });\n    });\n\n    onModelBeforeCreateFrom.subscribe(\n        createOnModelBeforeCb({\n            storageOperations,\n            plugins\n        })\n    );\n};\n"],"mappings":"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"}

package/crud/contentModel/beforeDelete.d.ts

@@ -1,10 +1,10 @@
 import { Topic } from "@webiny/pubsub/types";
-import { BeforeModelDeleteTopicParams, HeadlessCmsStorageOperations } from "../../types";
+import { OnModelBeforeDeleteTopicParams, HeadlessCmsStorageOperations } from "../../types";
 import { PluginsContainer } from "@webiny/plugins";
 interface AssignBeforeModelDeleteParams {
-    onBeforeModelDelete: Topic<BeforeModelDeleteTopicParams>;
+    onModelBeforeDelete: Topic<OnModelBeforeDeleteTopicParams>;
     storageOperations: HeadlessCmsStorageOperations;
     plugins: PluginsContainer;
 }
-export declare const assignBeforeModelDelete: (params: AssignBeforeModelDeleteParams) => void;
+export declare const assignModelBeforeDelete: (params: AssignBeforeModelDeleteParams) => void;
 export {};

package/crud/contentModel/beforeDelete.js

@@ -1,11 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.assignBeforeModelDelete = void 0;
+exports.assignModelBeforeDelete = void 0;
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
@@ -13,13 +13,13 @@ var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
 
 var _valueKeyStorageConverter = require("../../utils/converters/valueKeyStorageConverter");
 
-const assignBeforeModelDelete = params => {
+const assignModelBeforeDelete = params => {
   const {
-    onBeforeModelDelete,
+    onModelBeforeDelete,
     storageOperations,
     plugins
   } = params;
-  onBeforeModelDelete.subscribe(async params => {
+  onModelBeforeDelete.subscribe(async params => {
     const {
       model
     } = params;
@@ -57,4 +57,4 @@ const assignBeforeModelDelete = params => {
   });
 };
 
-exports.assignBeforeModelDelete = assignBeforeModelDelete;
+exports.assignModelBeforeDelete = assignModelBeforeDelete;

package/crud/contentModel/beforeDelete.js.map

@@ -1 +1 @@
-{"version":3,"names":["assignBeforeModelDelete","params","onBeforeModelDelete","storageOperations","plugins","subscribe","model","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","entries","result","list","attachCmsModelFieldConverters","where","latest","limit","items","ex","error","length"],"sources":["beforeDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { BeforeModelDeleteTopicParams, HeadlessCmsStorageOperations } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { attachCmsModelFieldConverters } from \"~/utils/converters/valueKeyStorageConverter\";\n\ninterface AssignBeforeModelDeleteParams {\n    onBeforeModelDelete: Topic<BeforeModelDeleteTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\nexport const assignBeforeModelDelete = (params: AssignBeforeModelDeleteParams) => {\n    const { onBeforeModelDelete, storageOperations, plugins } = params;\n\n    onBeforeModelDelete.subscribe(async params => {\n        const { model } = params;\n\n        const modelPlugin = plugins\n            .byType<CmsModelPlugin>(CmsModelPlugin.type)\n            .find(item => item.contentModel.modelId === model.modelId);\n\n        if (modelPlugin) {\n            throw new WebinyError(\n                \"Content models defined via plugins cannot be deleted.\",\n                \"CONTENT_MODEL_DELETE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        let entries = [];\n        try {\n            const result = await storageOperations.entries.list(\n                attachCmsModelFieldConverters({\n                    model,\n                    plugins\n                }),\n                {\n                    where: {\n                        latest: true\n                    },\n                    limit: 1\n                }\n            );\n            entries = result.items;\n        } catch (ex) {\n            throw new WebinyError(\n                \"Could not retrieve a list of content entries from the model.\",\n                \"ENTRIES_ERROR\",\n                {\n                    error: ex,\n                    model\n                }\n            );\n        }\n        if (entries.length > 0) {\n            throw new WebinyError(\n                `Cannot delete content model \"${model.modelId}\" because there are existing entries.`,\n                \"CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED\"\n            );\n        }\n    });\n};\n"],"mappings":";;;;;;;;;AAGA;;AACA;;AACA;;AAOO,MAAMA,uBAAuB,GAAIC,MAAD,IAA2C;EAC9E,MAAM;IAAEC,mBAAF;IAAuBC,iBAAvB;IAA0CC;EAA1C,IAAsDH,MAA5D;EAEAC,mBAAmB,CAACG,SAApB,CAA8B,MAAMJ,MAAN,IAAgB;IAC1C,MAAM;MAAEK;IAAF,IAAYL,MAAlB;IAEA,MAAMM,WAAW,GAAGH,OAAO,CACtBI,MADe,CACQC,8BAAA,CAAeC,IADvB,EAEfC,IAFe,CAEVC,IAAI,IAAIA,IAAI,CAACC,YAAL,CAAkBC,OAAlB,KAA8BR,KAAK,CAACQ,OAFlC,CAApB;;IAIA,IAAIP,WAAJ,EAAiB;MACb,MAAM,IAAIQ,cAAJ,CACF,uDADE,EAEF,4BAFE,EAGF;QACID,OAAO,EAAER,KAAK,CAACQ;MADnB,CAHE,CAAN;IAOH;;IAED,IAAIE,OAAO,GAAG,EAAd;;IACA,IAAI;MACA,MAAMC,MAAM,GAAG,MAAMd,iBAAiB,CAACa,OAAlB,CAA0BE,IAA1B,CACjB,IAAAC,uDAAA,EAA8B;QAC1Bb,KAD0B;QAE1BF;MAF0B,CAA9B,CADiB,EAKjB;QACIgB,KAAK,EAAE;UACHC,MAAM,EAAE;QADL,CADX;QAIIC,KAAK,EAAE;MAJX,CALiB,CAArB;MAYAN,OAAO,GAAGC,MAAM,CAACM,KAAjB;IACH,CAdD,CAcE,OAAOC,EAAP,EAAW;MACT,MAAM,IAAIT,cAAJ,CACF,8DADE,EAEF,eAFE,EAGF;QACIU,KAAK,EAAED,EADX;QAEIlB;MAFJ,CAHE,CAAN;IAQH;;IACD,IAAIU,OAAO,CAACU,MAAR,GAAiB,CAArB,EAAwB;MACpB,MAAM,IAAIX,cAAJ,CACD,gCAA+BT,KAAK,CAACQ,OAAQ,uCAD5C,EAEF,yCAFE,CAAN;IAIH;EACJ,CAhDD;AAiDH,CApDM"}
+{"version":3,"names":["assignModelBeforeDelete","params","onModelBeforeDelete","storageOperations","plugins","subscribe","model","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","entries","result","list","attachCmsModelFieldConverters","where","latest","limit","items","ex","error","length"],"sources":["beforeDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnModelBeforeDeleteTopicParams, HeadlessCmsStorageOperations } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { attachCmsModelFieldConverters } from \"~/utils/converters/valueKeyStorageConverter\";\n\ninterface AssignBeforeModelDeleteParams {\n    onModelBeforeDelete: Topic<OnModelBeforeDeleteTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\nexport const assignModelBeforeDelete = (params: AssignBeforeModelDeleteParams) => {\n    const { onModelBeforeDelete, storageOperations, plugins } = params;\n\n    onModelBeforeDelete.subscribe(async params => {\n        const { model } = params;\n\n        const modelPlugin = plugins\n            .byType<CmsModelPlugin>(CmsModelPlugin.type)\n            .find(item => item.contentModel.modelId === model.modelId);\n\n        if (modelPlugin) {\n            throw new WebinyError(\n                \"Content models defined via plugins cannot be deleted.\",\n                \"CONTENT_MODEL_DELETE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        let entries = [];\n        try {\n            const result = await storageOperations.entries.list(\n                attachCmsModelFieldConverters({\n                    model,\n                    plugins\n                }),\n                {\n                    where: {\n                        latest: true\n                    },\n                    limit: 1\n                }\n            );\n            entries = result.items;\n        } catch (ex) {\n            throw new WebinyError(\n                \"Could not retrieve a list of content entries from the model.\",\n                \"ENTRIES_ERROR\",\n                {\n                    error: ex,\n                    model\n                }\n            );\n        }\n        if (entries.length > 0) {\n            throw new WebinyError(\n                `Cannot delete content model \"${model.modelId}\" because there are existing entries.`,\n                \"CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED\"\n            );\n        }\n    });\n};\n"],"mappings":";;;;;;;;;AAGA;;AACA;;AACA;;AAOO,MAAMA,uBAAuB,GAAIC,MAAD,IAA2C;EAC9E,MAAM;IAAEC,mBAAF;IAAuBC,iBAAvB;IAA0CC;EAA1C,IAAsDH,MAA5D;EAEAC,mBAAmB,CAACG,SAApB,CAA8B,MAAMJ,MAAN,IAAgB;IAC1C,MAAM;MAAEK;IAAF,IAAYL,MAAlB;IAEA,MAAMM,WAAW,GAAGH,OAAO,CACtBI,MADe,CACQC,8BAAA,CAAeC,IADvB,EAEfC,IAFe,CAEVC,IAAI,IAAIA,IAAI,CAACC,YAAL,CAAkBC,OAAlB,KAA8BR,KAAK,CAACQ,OAFlC,CAApB;;IAIA,IAAIP,WAAJ,EAAiB;MACb,MAAM,IAAIQ,cAAJ,CACF,uDADE,EAEF,4BAFE,EAGF;QACID,OAAO,EAAER,KAAK,CAACQ;MADnB,CAHE,CAAN;IAOH;;IAED,IAAIE,OAAO,GAAG,EAAd;;IACA,IAAI;MACA,MAAMC,MAAM,GAAG,MAAMd,iBAAiB,CAACa,OAAlB,CAA0BE,IAA1B,CACjB,IAAAC,uDAAA,EAA8B;QAC1Bb,KAD0B;QAE1BF;MAF0B,CAA9B,CADiB,EAKjB;QACIgB,KAAK,EAAE;UACHC,MAAM,EAAE;QADL,CADX;QAIIC,KAAK,EAAE;MAJX,CALiB,CAArB;MAYAN,OAAO,GAAGC,MAAM,CAACM,KAAjB;IACH,CAdD,CAcE,OAAOC,EAAP,EAAW;MACT,MAAM,IAAIT,cAAJ,CACF,8DADE,EAEF,eAFE,EAGF;QACIU,KAAK,EAAED,EADX;QAEIlB;MAFJ,CAHE,CAAN;IAQH;;IACD,IAAIU,OAAO,CAACU,MAAR,GAAiB,CAArB,EAAwB;MACpB,MAAM,IAAIX,cAAJ,CACD,gCAA+BT,KAAK,CAACQ,OAAQ,uCAD5C,EAEF,yCAFE,CAAN;IAIH;EACJ,CAhDD;AAiDH,CApDM"}

package/crud/contentModel/beforeUpdate.d.ts

@@ -1,10 +1,10 @@
 import { Topic } from "@webiny/pubsub/types";
-import { BeforeModelUpdateTopicParams, HeadlessCmsStorageOperations } from "../../types";
+import { OnModelBeforeUpdateTopicParams, HeadlessCmsStorageOperations } from "../../types";
 import { PluginsContainer } from "@webiny/plugins";
 interface AssignBeforeModelUpdateParams {
-    onBeforeModelUpdate: Topic<BeforeModelUpdateTopicParams>;
+    onModelBeforeUpdate: Topic<OnModelBeforeUpdateTopicParams>;
     storageOperations: HeadlessCmsStorageOperations;
     plugins: PluginsContainer;
 }
-export declare const assignBeforeModelUpdate: (params: AssignBeforeModelUpdateParams) => void;
+export declare const assignModelBeforeUpdate: (params: AssignBeforeModelUpdateParams) => void;
 export {};

package/crud/contentModel/beforeUpdate.js

@@ -3,18 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.assignBeforeModelUpdate = void 0;
+exports.assignModelBeforeUpdate = void 0;
 
 var _validateModel = require("./validateModel");
 
 var _validateLayout = require("./validateLayout");
 
-const assignBeforeModelUpdate = params => {
+const assignModelBeforeUpdate = params => {
   const {
-    onBeforeModelUpdate,
+    onModelBeforeUpdate,
     plugins
   } = params;
-  onBeforeModelUpdate.subscribe(async ({
+  onModelBeforeUpdate.subscribe(async ({
     model,
     original
   }) => {
@@ -34,4 +34,4 @@ const assignBeforeModelUpdate = params => {
   });
 };
 
-exports.assignBeforeModelUpdate = assignBeforeModelUpdate;
+exports.assignModelBeforeUpdate = assignModelBeforeUpdate;

package/crud/contentModel/beforeUpdate.js.map

@@ -1 +1 @@
-{"version":3,"names":["assignBeforeModelUpdate","params","onBeforeModelUpdate","plugins","subscribe","model","original","validateLayout","layout","fields","validateModel"],"sources":["beforeUpdate.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { BeforeModelUpdateTopicParams, HeadlessCmsStorageOperations } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { validateModel } from \"./validateModel\";\nimport { validateLayout } from \"./validateLayout\";\n\ninterface AssignBeforeModelUpdateParams {\n    onBeforeModelUpdate: Topic<BeforeModelUpdateTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\n\nexport const assignBeforeModelUpdate = (params: AssignBeforeModelUpdateParams) => {\n    const { onBeforeModelUpdate, plugins } = params;\n\n    onBeforeModelUpdate.subscribe(async ({ model, original }) => {\n        /**\n         * First we go through the layout...\n         */\n        validateLayout(model.layout, model.fields);\n        /**\n         * then the model and fields...\n         */\n        await validateModel({\n            model,\n            original,\n            plugins\n        });\n    });\n};\n"],"mappings":";;;;;;;AAGA;;AACA;;AAQO,MAAMA,uBAAuB,GAAIC,MAAD,IAA2C;EAC9E,MAAM;IAAEC,mBAAF;IAAuBC;EAAvB,IAAmCF,MAAzC;EAEAC,mBAAmB,CAACE,SAApB,CAA8B,OAAO;IAAEC,KAAF;IAASC;EAAT,CAAP,KAA+B;IACzD;AACR;AACA;IACQ,IAAAC,8BAAA,EAAeF,KAAK,CAACG,MAArB,EAA6BH,KAAK,CAACI,MAAnC;IACA;AACR;AACA;;IACQ,MAAM,IAAAC,4BAAA,EAAc;MAChBL,KADgB;MAEhBC,QAFgB;MAGhBH;IAHgB,CAAd,CAAN;EAKH,CAbD;AAcH,CAjBM"}
+{"version":3,"names":["assignModelBeforeUpdate","params","onModelBeforeUpdate","plugins","subscribe","model","original","validateLayout","layout","fields","validateModel"],"sources":["beforeUpdate.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnModelBeforeUpdateTopicParams, HeadlessCmsStorageOperations } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { validateModel } from \"./validateModel\";\nimport { validateLayout } from \"./validateLayout\";\n\ninterface AssignBeforeModelUpdateParams {\n    onModelBeforeUpdate: Topic<OnModelBeforeUpdateTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\n\nexport const assignModelBeforeUpdate = (params: AssignBeforeModelUpdateParams) => {\n    const { onModelBeforeUpdate, plugins } = params;\n\n    onModelBeforeUpdate.subscribe(async ({ model, original }) => {\n        /**\n         * First we go through the layout...\n         */\n        validateLayout(model.layout, model.fields);\n        /**\n         * then the model and fields...\n         */\n        await validateModel({\n            model,\n            original,\n            plugins\n        });\n    });\n};\n"],"mappings":";;;;;;;AAGA;;AACA;;AAQO,MAAMA,uBAAuB,GAAIC,MAAD,IAA2C;EAC9E,MAAM;IAAEC,mBAAF;IAAuBC;EAAvB,IAAmCF,MAAzC;EAEAC,mBAAmB,CAACE,SAApB,CAA8B,OAAO;IAAEC,KAAF;IAASC;EAAT,CAAP,KAA+B;IACzD;AACR;AACA;IACQ,IAAAC,8BAAA,EAAeF,KAAK,CAACG,MAArB,EAA6BH,KAAK,CAACI,MAAnC;IACA;AACR;AACA;;IACQ,MAAM,IAAAC,4BAAA,EAAc;MAChBL,KADgB;MAEhBC,QAFgB;MAGhBH;IAHgB,CAAd,CAAN;EAKH,CAbD;AAcH,CAjBM"}

package/crud/contentModel/createFieldStorageId.js

@@ -5,12 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createFieldStorageId = void 0;
 
+var _getBaseFieldType = require("../../utils/getBaseFieldType");
+
 const createFieldStorageId = params => {
   const {
     type,
     id
   } = params;
-  return `${type}@${id}`;
+  return `${(0, _getBaseFieldType.getBaseFieldType)({
+    type
+  })}@${id}`;
 };
 
 exports.createFieldStorageId = createFieldStorageId;

package/crud/contentModel/createFieldStorageId.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFieldStorageId","params","type","id"],"sources":["createFieldStorageId.ts"],"sourcesContent":["import { CmsModelField } from \"~/types\";\n\nexport const createFieldStorageId = (params: Pick<CmsModelField, \"id\" | \"type\">): string => {\n    const { type, id } = params;\n    return `${type}@${id}`;\n};\n"],"mappings":";;;;;;;AAEO,MAAMA,oBAAoB,GAAIC,MAAD,IAAwD;EACxF,MAAM;IAAEC,IAAF;IAAQC;EAAR,IAAeF,MAArB;EACA,OAAQ,GAAEC,IAAK,IAAGC,EAAG,EAArB;AACH,CAHM"}
+{"version":3,"names":["createFieldStorageId","params","type","id","getBaseFieldType"],"sources":["createFieldStorageId.ts"],"sourcesContent":["import { CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\nexport const createFieldStorageId = (params: Pick<CmsModelField, \"id\" | \"type\">): string => {\n    const { type, id } = params;\n    return `${getBaseFieldType({ type })}@${id}`;\n};\n"],"mappings":";;;;;;;AACA;;AAEO,MAAMA,oBAAoB,GAAIC,MAAD,IAAwD;EACxF,MAAM;IAAEC,IAAF;IAAQC;EAAR,IAAeF,MAArB;EACA,OAAQ,GAAE,IAAAG,kCAAA,EAAiB;IAAEF;EAAF,CAAjB,CAA2B,IAAGC,EAAG,EAA3C;AACH,CAHM"}

package/crud/contentModel/models.js

@@ -50,6 +50,10 @@ const ContentModelFieldModel = (0, _fields.withFields)({
   type: (0, _fields.setOnce)()((0, _fields.string)({
     validation: requiredShortString
   })),
+  tags: (0, _commodoFieldsObject.object)({
+    value: [],
+    required: false
+  }),
   multipleValues: (0, _fields.boolean)({
     value: false
   }),
@@ -134,6 +138,10 @@ const CreateContentModelModel = (0, _fields.withFields)({
   layout: (0, _commodoFieldsObject.object)({
     value: [],
     required: true
+  }),
+  tags: (0, _commodoFieldsObject.object)({
+    value: [],
+    required: false
   })
 })();
 exports.CreateContentModelModel = CreateContentModelModel;
@@ -175,6 +183,10 @@ const UpdateContentModelModel = (0, _fields.withFields)({
   layout: (0, _commodoFieldsObject.object)({
     value: [],
     required: true
+  }),
+  tags: (0, _commodoFieldsObject.object)({
+    value: [],
+    required: false
   })
 })();
 exports.UpdateContentModelModel = UpdateContentModelModel;

package/crud/contentModel/models.js.map

@@ -1 +1 @@
-{"version":3,"names":["requiredShortString","validation","create","shortString","RendererModel","withFields","name","string","ContentModelFieldModel","id","fieldId","validateFieldId","label","helpText","placeholderText","type","setOnce","multipleValues","boolean","value","predefinedValues","fields","instanceOf","enabled","values","list","selected","renderer","message","settings","object","listValidation","CreateContentModelModel","modelId","description","group","required","layout","CreateContentModelModelFrom","locale","UpdateContentModelModel","titleFieldId"],"sources":["models.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\n/**\n * Package commodo-fields-object does not have types\n */\n// @ts-ignore\nimport { object } from \"commodo-fields-object\";\n/**\n * Package commodo-fields does not have object.\n */\n// @ts-ignore\nimport { withFields, string, setOnce, boolean, fields } from \"@commodo/fields\";\nimport { validateFieldId } from \"./fieldIdValidation\";\n\nconst requiredShortString = validation.create(\"required,maxLength:255\");\nconst shortString = validation.create(\"maxLength:255\");\n\nconst RendererModel = withFields({\n    name: string({ validation: requiredShortString })\n})();\n\nexport const ContentModelFieldModel = withFields({\n    id: string({ validation: requiredShortString }),\n    fieldId: string({\n        validation: validateFieldId\n    }),\n    label: string({ validation: requiredShortString }),\n    helpText: string({ validation: shortString }),\n    placeholderText: string({ validation: shortString }),\n    type: setOnce()(string({ validation: requiredShortString })),\n    multipleValues: boolean({ value: false }),\n    predefinedValues: fields({\n        value: {},\n        instanceOf: withFields({\n            enabled: boolean(),\n            values: fields({\n                value: [],\n                list: true,\n                instanceOf: withFields({\n                    label: string(),\n                    value: string(),\n                    selected: boolean()\n                })()\n            })\n        })()\n    }),\n    renderer: fields({ instanceOf: RendererModel, validation: shortString }),\n    validation: fields({\n        list: true,\n        value: [],\n        instanceOf: withFields({\n            name: string({ validation: requiredShortString }),\n            message: string({ validation: shortString }),\n            settings: object({ value: {} })\n        })()\n    }),\n    listValidation: fields({\n        list: true,\n        value: [],\n        instanceOf: withFields({\n            name: string({ validation: requiredShortString }),\n            message: string({ validation: shortString }),\n            settings: object({ value: {} })\n        })()\n    }),\n    settings: object({ value: {} })\n    /**\n     * By the default, field is not deleted.\n     */\n    // isDeleted: boolean({ value: false })\n})();\n\nexport const CreateContentModelModel = withFields({\n    name: string({ validation: requiredShortString }),\n    modelId: string({ validation: shortString }),\n    description: string({ validation: shortString }),\n    group: string({ validation: requiredShortString }),\n    fields: fields({ instanceOf: ContentModelFieldModel, value: [], list: true, required: true }),\n    layout: object({ value: [], required: true })\n})();\n\nexport const CreateContentModelModelFrom = withFields({\n    name: string({ validation: requiredShortString }),\n    modelId: string({ validation: shortString }),\n    description: string({ validation: shortString }),\n    group: string({ validation: requiredShortString }),\n    locale: string({ validation: shortString })\n})();\n\nexport const UpdateContentModelModel = withFields({\n    name: string({ validation: shortString }),\n    description: string({ validation: shortString }),\n    group: string({ validation: shortString }),\n    titleFieldId: string(),\n    fields: fields({ instanceOf: ContentModelFieldModel, value: [], list: true, required: true }),\n    layout: object({ value: [], required: true })\n})();\n"],"mappings":"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"}
+{"version":3,"names":["requiredShortString","validation","create","shortString","RendererModel","withFields","name","string","ContentModelFieldModel","id","fieldId","validateFieldId","label","helpText","placeholderText","type","setOnce","tags","object","value","required","multipleValues","boolean","predefinedValues","fields","instanceOf","enabled","values","list","selected","renderer","message","settings","listValidation","CreateContentModelModel","modelId","description","group","layout","CreateContentModelModelFrom","locale","UpdateContentModelModel","titleFieldId"],"sources":["models.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\n/**\n * Package commodo-fields-object does not have types\n */\n// @ts-ignore\nimport { object } from \"commodo-fields-object\";\n/**\n * Package commodo-fields does not have object.\n */\n// @ts-ignore\nimport { withFields, string, setOnce, boolean, fields } from \"@commodo/fields\";\nimport { validateFieldId } from \"./fieldIdValidation\";\n\nconst requiredShortString = validation.create(\"required,maxLength:255\");\nconst shortString = validation.create(\"maxLength:255\");\n\nconst RendererModel = withFields({\n    name: string({ validation: requiredShortString })\n})();\n\nexport const ContentModelFieldModel = withFields({\n    id: string({ validation: requiredShortString }),\n    fieldId: string({\n        validation: validateFieldId\n    }),\n    label: string({ validation: requiredShortString }),\n    helpText: string({ validation: shortString }),\n    placeholderText: string({ validation: shortString }),\n    type: setOnce()(string({ validation: requiredShortString })),\n    tags: object({ value: [], required: false }),\n    multipleValues: boolean({ value: false }),\n    predefinedValues: fields({\n        value: {},\n        instanceOf: withFields({\n            enabled: boolean(),\n            values: fields({\n                value: [],\n                list: true,\n                instanceOf: withFields({\n                    label: string(),\n                    value: string(),\n                    selected: boolean()\n                })()\n            })\n        })()\n    }),\n    renderer: fields({ instanceOf: RendererModel, validation: shortString }),\n    validation: fields({\n        list: true,\n        value: [],\n        instanceOf: withFields({\n            name: string({ validation: requiredShortString }),\n            message: string({ validation: shortString }),\n            settings: object({ value: {} })\n        })()\n    }),\n    listValidation: fields({\n        list: true,\n        value: [],\n        instanceOf: withFields({\n            name: string({ validation: requiredShortString }),\n            message: string({ validation: shortString }),\n            settings: object({ value: {} })\n        })()\n    }),\n    settings: object({ value: {} })\n    /**\n     * By the default, field is not deleted.\n     */\n    // isDeleted: boolean({ value: false })\n})();\n\nexport const CreateContentModelModel = withFields({\n    name: string({ validation: requiredShortString }),\n    modelId: string({ validation: shortString }),\n    description: string({ validation: shortString }),\n    group: string({ validation: requiredShortString }),\n    fields: fields({ instanceOf: ContentModelFieldModel, value: [], list: true, required: true }),\n    layout: object({ value: [], required: true }),\n    tags: object({ value: [], required: false })\n})();\n\nexport const CreateContentModelModelFrom = withFields({\n    name: string({ validation: requiredShortString }),\n    modelId: string({ validation: shortString }),\n    description: string({ validation: shortString }),\n    group: string({ validation: requiredShortString }),\n    locale: string({ validation: shortString })\n})();\n\nexport const UpdateContentModelModel = withFields({\n    name: string({ validation: shortString }),\n    description: string({ validation: shortString }),\n    group: string({ validation: shortString }),\n    titleFieldId: string(),\n    fields: fields({ instanceOf: ContentModelFieldModel, value: [], list: true, required: true }),\n    layout: object({ value: [], required: true }),\n    tags: object({ value: [], required: false })\n})();\n"],"mappings":"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"}

package/crud/contentModel/validateModel.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true

package/crud/contentModel/validateModelFields.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.validateModelFields = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
@@ -17,9 +17,9 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 
 var _createFieldStorageId = require("./createFieldStorageId");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+var _getBaseFieldType = require("../../utils/getBaseFieldType");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var _plugins = require("../../plugins");
 
 const defaultTitleFieldId = "id";
 const allowedTitleFieldTypes = ["text", "number"];
@@ -40,7 +40,7 @@ const getContentModelTitleFieldId = (fields, titleFieldId) => {
 
   if (!titleFieldId || titleFieldId === defaultTitleFieldId) {
     const titleField = fields.find(field => {
-      return field.type === "text" && !field.multipleValues;
+      return (0, _getBaseFieldType.getBaseFieldType)(field) === "text" && !field.multipleValues;
     });
     return (titleField === null || titleField === void 0 ? void 0 : titleField.fieldId) || defaultTitleFieldId;
   }
@@ -133,6 +133,24 @@ const extractInvalidField = (model, err) => {
   };
 };
 
+const createValidateChildFields = plugins => {
+  return ({
+    fields,
+    originalFields
+  }) => {
+    if (fields.length === 0) {
+      return;
+    }
+
+    validateFields({
+      fields,
+      originalFields,
+      plugins,
+      lockedFields: []
+    });
+  };
+};
+
 const validateFields = params => {
   const {
     plugins,
@@ -142,14 +160,14 @@ const validateFields = params => {
   } = params;
   const fieldIdList = [];
   const storageIdList = [];
+  const validateChildFields = createValidateChildFields(plugins);
 
   for (const field of fields) {
-    var _field$settings, _originalField$settin;
-
-    const plugin = plugins.find(item => item.fieldType === field.type);
+    const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+    const plugin = plugins.find(plugin => plugin.fieldType === baseType);
 
     if (!plugin) {
-      throw new Error(`Cannot update content model because of the unknown "${field.type}" field.`);
+      throw new Error(`Cannot update content model because of the unknown "${baseType}" field.`);
     }
 
     const originalField = originalFields.find(f => f.id === field.id);
@@ -227,31 +245,18 @@ const validateFields = params => {
 
     storageIdList.push(field.storageId);
     /**
-     * TODO maybe make this part pluginable?
-     * We need to check the object field child fields.
-     * It must be recursive.
+     * There might be some plugins which allow child fields.
+     * We use this method to validate them as well.
      */
 
-    if (field.type !== "object") {
+    if (!plugin.validateChildFields) {
       continue;
     }
 
-    const childFields = ((_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.fields) || [];
-    const originalChildFields = (originalField === null || originalField === void 0 ? void 0 : (_originalField$settin = originalField.settings) === null || _originalField$settin === void 0 ? void 0 : _originalField$settin.fields) || [];
-    /**
-     * No point in going further if there are no child fields.
-     * Code will break if child fields were removed but used in the entries.
-     */
-
-    if (childFields.length === 0) {
-      continue;
-    }
-
-    validateFields({
-      fields: childFields,
-      originalFields: originalChildFields,
-      plugins,
-      lockedFields: []
+    plugin.validateChildFields({
+      field,
+      originalField,
+      validate: validateChildFields
     });
   }
 };
@@ -279,6 +284,7 @@ const validateModelFields = params => {
    */
 
   const fieldTypePlugins = plugins.byType("cms-model-field-to-graphql");
+  const sorterPlugins = plugins.byType(_plugins.CmsGraphQLSchemaSorterPlugin.type);
   validateFields({
     fields,
     originalFields: (original === null || original === void 0 ? void 0 : original.fields) || [],
@@ -292,9 +298,10 @@ const validateModelFields = params => {
      */
     const schema = (0, _createManageSDL.createManageSDL)({
       model,
-      fieldTypePlugins: fieldTypePlugins.reduce((acc, pl) => _objectSpread(_objectSpread({}, acc), {}, {
+      fieldTypePlugins: fieldTypePlugins.reduce((acc, pl) => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, acc), {}, {
         [pl.fieldType]: pl
-      }), {})
+      }), {}),
+      sorterPlugins
     });
 
     try {
@@ -319,25 +326,23 @@ const validateModelFields = params => {
      */
 
     if (!existingField) {
-      continue; // throw new WebinyError(
-      //     `Cannot remove the field "${lockedField.fieldId}" because it's already in use in created content.`,
-      //     "ENTRY_FIELD_USED",
-      //     {
-      //         lockedField,
-      //         fields
-      //     }
-      // );
+      continue;
     }
 
     if (lockedField.multipleValues !== existingField.multipleValues) {
       throw new _error.default(`Cannot change "multipleValues" for the "${lockedField.fieldId}" field because it's already in use in created content.`, "ENTRY_FIELD_USED", {
+        reason: `"multipleValues" changed`,
         field: existingField
       });
     }
 
-    if (lockedField.type !== existingField.type) {
+    const fieldType = (0, _getBaseFieldType.getBaseFieldType)(existingField);
+
+    if (lockedField.type !== fieldType) {
       throw new _error.default(`Cannot change field type for the "${lockedField.fieldId}" field because it's already in use in created content.`, "ENTRY_FIELD_USED", {
-        field: existingField
+        reason: `"type" changed`,
+        lockedFieldType: lockedField.type,
+        existingFieldType: fieldType
       });
     }
     /**
@@ -345,7 +350,7 @@ const validateModelFields = params => {
      */
 
 
-    const lockedFieldsByType = cmsLockedFieldPlugins.filter(pl => pl.fieldType === lockedField.type);
+    const lockedFieldsByType = cmsLockedFieldPlugins.filter(pl => pl.fieldType === (0, _getBaseFieldType.getBaseFieldType)(lockedField));
 
     for (const plugin of lockedFieldsByType) {
       if (typeof plugin.checkLockedField !== "function") {