@webiny/api-headless-cms 5.32.0 → 5.33.0-beta.0

package/crud/contentModel/fieldIdValidation.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.validateFieldId = void 0;
+
+var _validation = require("@webiny/validation");
+
+var _systemFields = require("./systemFields");
+
+const validateFieldId = async input => {
+  await _validation.validation.validate(input, "required,maxLength:100");
+  const value = String(input || "").trim();
+
+  if (!value.charAt(0).match(/^[a-zA-Z]/)) {
+    throw new Error(`Provided ${value} is not valid - must not start with a number.`);
+  } else if (value.match(/^([a-zA-Z0-9]+)$/) === null) {
+    throw new Error(`Provided ${value} is not valid - must be alphanumeric string.`);
+  } else if (_systemFields.fieldSystemFields.includes(value)) {
+    throw new Error(`Provided ${value} is not valid - "${value}" is an auto-generated field.`);
+  }
+};
+
+exports.validateFieldId = validateFieldId;

package/crud/contentModel/fieldIdValidation.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["validateFieldId","input","validation","validate","value","String","trim","charAt","match","Error","fieldSystemFields","includes"],"sources":["fieldIdValidation.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { fieldSystemFields } from \"~/crud/contentModel/systemFields\";\n\nexport const validateFieldId = async (input: string): Promise<void> => {\n    await validation.validate(input, \"required,maxLength:100\");\n\n    const value = String(input || \"\").trim();\n\n    if (!value.charAt(0).match(/^[a-zA-Z]/)) {\n        throw new Error(`Provided ${value} is not valid - must not start with a number.`);\n    } else if (value.match(/^([a-zA-Z0-9]+)$/) === null) {\n        throw new Error(`Provided ${value} is not valid - must be alphanumeric string.`);\n    } else if (fieldSystemFields.includes(value)) {\n        throw new Error(`Provided ${value} is not valid - \"${value}\" is an auto-generated field.`);\n    }\n};\n"],"mappings":";;;;;;;AAAA;;AACA;;AAEO,MAAMA,eAAe,GAAG,MAAOC,KAAP,IAAwC;EACnE,MAAMC,sBAAA,CAAWC,QAAX,CAAoBF,KAApB,EAA2B,wBAA3B,CAAN;EAEA,MAAMG,KAAK,GAAGC,MAAM,CAACJ,KAAK,IAAI,EAAV,CAAN,CAAoBK,IAApB,EAAd;;EAEA,IAAI,CAACF,KAAK,CAACG,MAAN,CAAa,CAAb,EAAgBC,KAAhB,CAAsB,WAAtB,CAAL,EAAyC;IACrC,MAAM,IAAIC,KAAJ,CAAW,YAAWL,KAAM,+CAA5B,CAAN;EACH,CAFD,MAEO,IAAIA,KAAK,CAACI,KAAN,CAAY,kBAAZ,MAAoC,IAAxC,EAA8C;IACjD,MAAM,IAAIC,KAAJ,CAAW,YAAWL,KAAM,8CAA5B,CAAN;EACH,CAFM,MAEA,IAAIM,+BAAA,CAAkBC,QAAlB,CAA2BP,KAA3B,CAAJ,EAAuC;IAC1C,MAAM,IAAIK,KAAJ,CAAW,YAAWL,KAAM,oBAAmBA,KAAM,+BAArD,CAAN;EACH;AACJ,CAZM"}

package/crud/contentModel/models.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,13 +7,11 @@ exports.UpdateContentModelModel = exports.CreateContentModelModelFrom = exports.
 
 var _validation = require("@webiny/validation");
 
-var _flow = _interopRequireDefault(require("lodash/flow"));
-
 var _commodoFieldsObject = require("commodo-fields-object");
 
 var _fields = require("@commodo/fields");
 
-var _idValidation = require("./idValidation");
+var _fieldIdValidation = require("./fieldIdValidation");
 
 /**
  * Package commodo-fields-object does not have types
@@ -39,9 +35,9 @@ const ContentModelFieldModel = (0, _fields.withFields)({
   id: (0, _fields.string)({
     validation: requiredShortString
   }),
-  fieldId: (0, _flow.default)((0, _fields.onSet)(value => value && value.trim()), (0, _fields.setOnce)())((0, _fields.string)({
-    validation: _idValidation.validateId
-  })),
+  fieldId: (0, _fields.string)({
+    validation: _fieldIdValidation.validateFieldId
+  }),
   label: (0, _fields.string)({
     validation: requiredShortString
   }),
@@ -109,6 +105,11 @@ const ContentModelFieldModel = (0, _fields.withFields)({
   settings: (0, _commodoFieldsObject.object)({
     value: {}
   })
+  /**
+   * By the default, field is not deleted.
+   */
+  // isDeleted: boolean({ value: false })
+
 })();
 exports.ContentModelFieldModel = ContentModelFieldModel;
 const CreateContentModelModel = (0, _fields.withFields)({

package/crud/contentModel/models.js.map

@@ -1 +1 @@
-{"version":3,"names":["requiredShortString","validation","create","shortString","RendererModel","withFields","name","string","ContentModelFieldModel","id","fieldId","flow","onSet","value","trim","setOnce","validateId","label","helpText","placeholderText","type","multipleValues","boolean","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\";\nimport flow from \"lodash/flow\";\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, onSet, boolean, fields } from \"@commodo/fields\";\nimport { validateId } from \"./idValidation\";\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: flow(\n        onSet((value?: string) => value && value.trim()),\n        setOnce()\n    )(string({ validation: validateId })),\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\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","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":";;;;;;;AAAA;;AAKA;;AAKA;;AACA;;AAVA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AAIA,MAAMA,mBAAmB,GAAGC,sBAAA,CAAWC,MAAX,CAAkB,wBAAlB,CAA5B;;AACA,MAAMC,WAAW,GAAGF,sBAAA,CAAWC,MAAX,CAAkB,eAAlB,CAApB;;AAEA,MAAME,aAAa,GAAG,IAAAC,kBAAA,EAAW;EAC7BC,IAAI,EAAE,IAAAC,cAAA,EAAO;IAAEN,UAAU,EAAED;EAAd,CAAP;AADuB,CAAX,GAAtB;AAIO,MAAMQ,sBAAsB,GAAG,IAAAH,kBAAA,EAAW;EAC7CI,EAAE,EAAE,IAAAF,cAAA,EAAO;IAAEN,UAAU,EAAED;EAAd,CAAP,CADyC;EAE7CU,OAAO,EAAE,IAAAH,cAAA,EAAO;IACZN,UAAU,EAAEU;EADA,CAAP,CAFoC;EAK7CC,KAAK,EAAE,IAAAL,cAAA,EAAO;IAAEN,UAAU,EAAED;EAAd,CAAP,CALsC;EAM7Ca,QAAQ,EAAE,IAAAN,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CANmC;EAO7CW,eAAe,EAAE,IAAAP,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CAP4B;EAQ7CY,IAAI,EAAE,IAAAC,eAAA,IAAU,IAAAT,cAAA,EAAO;IAAEN,UAAU,EAAED;EAAd,CAAP,CAAV,CARuC;EAS7CiB,cAAc,EAAE,IAAAC,eAAA,EAAQ;IAAEC,KAAK,EAAE;EAAT,CAAR,CAT6B;EAU7CC,gBAAgB,EAAE,IAAAC,cAAA,EAAO;IACrBF,KAAK,EAAE,EADc;IAErBG,UAAU,EAAE,IAAAjB,kBAAA,EAAW;MACnBkB,OAAO,EAAE,IAAAL,eAAA,GADU;MAEnBM,MAAM,EAAE,IAAAH,cAAA,EAAO;QACXF,KAAK,EAAE,EADI;QAEXM,IAAI,EAAE,IAFK;QAGXH,UAAU,EAAE,IAAAjB,kBAAA,EAAW;UACnBO,KAAK,EAAE,IAAAL,cAAA,GADY;UAEnBY,KAAK,EAAE,IAAAZ,cAAA,GAFY;UAGnBmB,QAAQ,EAAE,IAAAR,eAAA;QAHS,CAAX;MAHD,CAAP;IAFW,CAAX;EAFS,CAAP,CAV2B;EAyB7CS,QAAQ,EAAE,IAAAN,cAAA,EAAO;IAAEC,UAAU,EAAElB,aAAd;IAA6BH,UAAU,EAAEE;EAAzC,CAAP,CAzBmC;EA0B7CF,UAAU,EAAE,IAAAoB,cAAA,EAAO;IACfI,IAAI,EAAE,IADS;IAEfN,KAAK,EAAE,EAFQ;IAGfG,UAAU,EAAE,IAAAjB,kBAAA,EAAW;MACnBC,IAAI,EAAE,IAAAC,cAAA,EAAO;QAAEN,UAAU,EAAED;MAAd,CAAP,CADa;MAEnB4B,OAAO,EAAE,IAAArB,cAAA,EAAO;QAAEN,UAAU,EAAEE;MAAd,CAAP,CAFU;MAGnB0B,QAAQ,EAAE,IAAAC,2BAAA,EAAO;QAAEX,KAAK,EAAE;MAAT,CAAP;IAHS,CAAX;EAHG,CAAP,CA1BiC;EAmC7CY,cAAc,EAAE,IAAAV,cAAA,EAAO;IACnBI,IAAI,EAAE,IADa;IAEnBN,KAAK,EAAE,EAFY;IAGnBG,UAAU,EAAE,IAAAjB,kBAAA,EAAW;MACnBC,IAAI,EAAE,IAAAC,cAAA,EAAO;QAAEN,UAAU,EAAED;MAAd,CAAP,CADa;MAEnB4B,OAAO,EAAE,IAAArB,cAAA,EAAO;QAAEN,UAAU,EAAEE;MAAd,CAAP,CAFU;MAGnB0B,QAAQ,EAAE,IAAAC,2BAAA,EAAO;QAAEX,KAAK,EAAE;MAAT,CAAP;IAHS,CAAX;EAHO,CAAP,CAnC6B;EA4C7CU,QAAQ,EAAE,IAAAC,2BAAA,EAAO;IAAEX,KAAK,EAAE;EAAT,CAAP;EACV;AACJ;AACA;EACI;;AAhD6C,CAAX,GAA/B;;AAmDA,MAAMa,uBAAuB,GAAG,IAAA3B,kBAAA,EAAW;EAC9CC,IAAI,EAAE,IAAAC,cAAA,EAAO;IAAEN,UAAU,EAAED;EAAd,CAAP,CADwC;EAE9CiC,OAAO,EAAE,IAAA1B,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CAFqC;EAG9C+B,WAAW,EAAE,IAAA3B,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CAHiC;EAI9CgC,KAAK,EAAE,IAAA5B,cAAA,EAAO;IAAEN,UAAU,EAAED;EAAd,CAAP,CAJuC;EAK9CqB,MAAM,EAAE,IAAAA,cAAA,EAAO;IAAEC,UAAU,EAAEd,sBAAd;IAAsCW,KAAK,EAAE,EAA7C;IAAiDM,IAAI,EAAE,IAAvD;IAA6DW,QAAQ,EAAE;EAAvE,CAAP,CALsC;EAM9CC,MAAM,EAAE,IAAAP,2BAAA,EAAO;IAAEX,KAAK,EAAE,EAAT;IAAaiB,QAAQ,EAAE;EAAvB,CAAP;AANsC,CAAX,GAAhC;;AASA,MAAME,2BAA2B,GAAG,IAAAjC,kBAAA,EAAW;EAClDC,IAAI,EAAE,IAAAC,cAAA,EAAO;IAAEN,UAAU,EAAED;EAAd,CAAP,CAD4C;EAElDiC,OAAO,EAAE,IAAA1B,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CAFyC;EAGlD+B,WAAW,EAAE,IAAA3B,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CAHqC;EAIlDgC,KAAK,EAAE,IAAA5B,cAAA,EAAO;IAAEN,UAAU,EAAED;EAAd,CAAP,CAJ2C;EAKlDuC,MAAM,EAAE,IAAAhC,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP;AAL0C,CAAX,GAApC;;AAQA,MAAMqC,uBAAuB,GAAG,IAAAnC,kBAAA,EAAW;EAC9CC,IAAI,EAAE,IAAAC,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CADwC;EAE9C+B,WAAW,EAAE,IAAA3B,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CAFiC;EAG9CgC,KAAK,EAAE,IAAA5B,cAAA,EAAO;IAAEN,UAAU,EAAEE;EAAd,CAAP,CAHuC;EAI9CsC,YAAY,EAAE,IAAAlC,cAAA,GAJgC;EAK9Cc,MAAM,EAAE,IAAAA,cAAA,EAAO;IAAEC,UAAU,EAAEd,sBAAd;IAAsCW,KAAK,EAAE,EAA7C;IAAiDM,IAAI,EAAE,IAAvD;IAA6DW,QAAQ,EAAE;EAAvE,CAAP,CALsC;EAM9CC,MAAM,EAAE,IAAAP,2BAAA,EAAO;IAAEX,KAAK,EAAE,EAAT;IAAaiB,QAAQ,EAAE;EAAvB,CAAP;AANsC,CAAX,GAAhC"}

package/crud/contentModel/systemFields.d.ts

@@ -0,0 +1 @@
+export declare const fieldSystemFields: string[];

package/crud/contentModel/systemFields.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fieldSystemFields = void 0;
+const fieldSystemFields = ["id", "fieldId", "storageId", "label", "helpText", "placeholderText", "type", "multipleValues", "predefinedValues", "renderer", "validation", "listValidation", "settings"];
+exports.fieldSystemFields = fieldSystemFields;

package/crud/contentModel/systemFields.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["fieldSystemFields"],"sources":["systemFields.ts"],"sourcesContent":["export const fieldSystemFields: string[] = [\n    \"id\",\n    \"fieldId\",\n    \"storageId\",\n    \"label\",\n    \"helpText\",\n    \"placeholderText\",\n    \"type\",\n    \"multipleValues\",\n    \"predefinedValues\",\n    \"renderer\",\n    \"validation\",\n    \"listValidation\",\n    \"settings\"\n];\n"],"mappings":";;;;;;AAAO,MAAMA,iBAA2B,GAAG,CACvC,IADuC,EAEvC,SAFuC,EAGvC,WAHuC,EAIvC,OAJuC,EAKvC,UALuC,EAMvC,iBANuC,EAOvC,MAPuC,EAQvC,gBARuC,EASvC,kBATuC,EAUvC,UAVuC,EAWvC,YAXuC,EAYvC,gBAZuC,EAavC,UAbuC,CAApC"}

package/crud/contentModel/validateLayout.d.ts

@@ -1,2 +1,2 @@
 import { CmsModelField, CmsModel } from "../../types";
-export declare const validateLayout: (model: CmsModel, fields?: CmsModelField[]) => void;
+export declare const validateLayout: (layout: CmsModel["layout"], fields?: CmsModelField[]) => void;

package/crud/contentModel/validateLayout.js

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.validateLayout = void 0;
 
-const validateLayout = (model, fields = []) => {
-  const layout = model.layout || [];
+const validateLayout = (layout, fields = []) => {
   const flatLayoutIdList = layout.reduce((acc, id) => {
     return acc.concat(Array.isArray(id) ? id : [id]);
   }, []);

package/crud/contentModel/validateLayout.js.map

@@ -1 +1 @@
-{"version":3,"names":["validateLayout","model","fields","layout","flatLayoutIdList","reduce","acc","id","concat","Array","isArray","length","Error","field","includes","fieldFound","some","f"],"sources":["validateLayout.ts"],"sourcesContent":["import { CmsModelField, CmsModel } from \"~/types\";\n\nexport const validateLayout = (model: CmsModel, fields: CmsModelField[] = []): void => {\n    const layout = model.layout || [];\n    const flatLayoutIdList = layout.reduce((acc, id) => {\n        return acc.concat(Array.isArray(id) ? id : [id]);\n    }, []);\n    if (flatLayoutIdList.length !== fields.length) {\n        throw new Error(\n            `There are ${flatLayoutIdList.length} IDs in the layout and ${fields.length} in fields, which cannot be - numbers must be the same.`\n        );\n    }\n    for (const field of fields) {\n        if (flatLayoutIdList.includes(field.id)) {\n            continue;\n        }\n        throw new Error(`Field \"${field.id}\" is not defined in layout.`);\n    }\n    for (const id of flatLayoutIdList) {\n        const fieldFound = fields.some(f => f.id === id);\n        if (fieldFound) {\n            continue;\n        }\n        throw new Error(`Field id \"${id}\" is in layout but not in fields.`);\n    }\n};\n"],"mappings":";;;;;;;AAEO,MAAMA,cAAc,GAAG,CAACC,KAAD,EAAkBC,MAAuB,GAAG,EAA5C,KAAyD;EACnF,MAAMC,MAAM,GAAGF,KAAK,CAACE,MAAN,IAAgB,EAA/B;EACA,MAAMC,gBAAgB,GAAGD,MAAM,CAACE,MAAP,CAAc,CAACC,GAAD,EAAMC,EAAN,KAAa;IAChD,OAAOD,GAAG,CAACE,MAAJ,CAAWC,KAAK,CAACC,OAAN,CAAcH,EAAd,IAAoBA,EAApB,GAAyB,CAACA,EAAD,CAApC,CAAP;EACH,CAFwB,EAEtB,EAFsB,CAAzB;;EAGA,IAAIH,gBAAgB,CAACO,MAAjB,KAA4BT,MAAM,CAACS,MAAvC,EAA+C;IAC3C,MAAM,IAAIC,KAAJ,CACD,aAAYR,gBAAgB,CAACO,MAAO,0BAAyBT,MAAM,CAACS,MAAO,yDAD1E,CAAN;EAGH;;EACD,KAAK,MAAME,KAAX,IAAoBX,MAApB,EAA4B;IACxB,IAAIE,gBAAgB,CAACU,QAAjB,CAA0BD,KAAK,CAACN,EAAhC,CAAJ,EAAyC;MACrC;IACH;;IACD,MAAM,IAAIK,KAAJ,CAAW,UAASC,KAAK,CAACN,EAAG,6BAA7B,CAAN;EACH;;EACD,KAAK,MAAMA,EAAX,IAAiBH,gBAAjB,EAAmC;IAC/B,MAAMW,UAAU,GAAGb,MAAM,CAACc,IAAP,CAAYC,CAAC,IAAIA,CAAC,CAACV,EAAF,KAASA,EAA1B,CAAnB;;IACA,IAAIQ,UAAJ,EAAgB;MACZ;IACH;;IACD,MAAM,IAAIH,KAAJ,CAAW,aAAYL,EAAG,mCAA1B,CAAN;EACH;AACJ,CAvBM"}
+{"version":3,"names":["validateLayout","layout","fields","flatLayoutIdList","reduce","acc","id","concat","Array","isArray","length","Error","field","includes","fieldFound","some","f"],"sources":["validateLayout.ts"],"sourcesContent":["import { CmsModelField, CmsModel } from \"~/types\";\n\nexport const validateLayout = (layout: CmsModel[\"layout\"], fields: CmsModelField[] = []): void => {\n    const flatLayoutIdList = layout.reduce((acc, id) => {\n        return acc.concat(Array.isArray(id) ? id : [id]);\n    }, []);\n    if (flatLayoutIdList.length !== fields.length) {\n        throw new Error(\n            `There are ${flatLayoutIdList.length} IDs in the layout and ${fields.length} in fields, which cannot be - numbers must be the same.`\n        );\n    }\n    for (const field of fields) {\n        if (flatLayoutIdList.includes(field.id)) {\n            continue;\n        }\n        throw new Error(`Field \"${field.id}\" is not defined in layout.`);\n    }\n    for (const id of flatLayoutIdList) {\n        const fieldFound = fields.some(f => f.id === id);\n        if (fieldFound) {\n            continue;\n        }\n        throw new Error(`Field id \"${id}\" is in layout but not in fields.`);\n    }\n};\n"],"mappings":";;;;;;;AAEO,MAAMA,cAAc,GAAG,CAACC,MAAD,EAA6BC,MAAuB,GAAG,EAAvD,KAAoE;EAC9F,MAAMC,gBAAgB,GAAGF,MAAM,CAACG,MAAP,CAAc,CAACC,GAAD,EAAMC,EAAN,KAAa;IAChD,OAAOD,GAAG,CAACE,MAAJ,CAAWC,KAAK,CAACC,OAAN,CAAcH,EAAd,IAAoBA,EAApB,GAAyB,CAACA,EAAD,CAApC,CAAP;EACH,CAFwB,EAEtB,EAFsB,CAAzB;;EAGA,IAAIH,gBAAgB,CAACO,MAAjB,KAA4BR,MAAM,CAACQ,MAAvC,EAA+C;IAC3C,MAAM,IAAIC,KAAJ,CACD,aAAYR,gBAAgB,CAACO,MAAO,0BAAyBR,MAAM,CAACQ,MAAO,yDAD1E,CAAN;EAGH;;EACD,KAAK,MAAME,KAAX,IAAoBV,MAApB,EAA4B;IACxB,IAAIC,gBAAgB,CAACU,QAAjB,CAA0BD,KAAK,CAACN,EAAhC,CAAJ,EAAyC;MACrC;IACH;;IACD,MAAM,IAAIK,KAAJ,CAAW,UAASC,KAAK,CAACN,EAAG,6BAA7B,CAAN;EACH;;EACD,KAAK,MAAMA,EAAX,IAAiBH,gBAAjB,EAAmC;IAC/B,MAAMW,UAAU,GAAGZ,MAAM,CAACa,IAAP,CAAYC,CAAC,IAAIA,CAAC,CAACV,EAAF,KAASA,EAA1B,CAAnB;;IACA,IAAIQ,UAAJ,EAAgB;MACZ;IACH;;IACD,MAAM,IAAIH,KAAJ,CAAW,aAAYL,EAAG,mCAA1B,CAAN;EACH;AACJ,CAtBM"}

package/crud/contentModel/validateModel.d.ts

@@ -0,0 +1,9 @@
+import { CmsModel } from "../../types";
+import { PluginsContainer } from "@webiny/plugins";
+interface ValidateModelParams {
+    model: CmsModel;
+    original?: CmsModel;
+    plugins: PluginsContainer;
+}
+export declare const validateModel: (params: ValidateModelParams) => void;
+export {};

package/crud/contentModel/validateModel.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.validateModel = void 0;
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
+
+var _validateModelFields = require("./validateModelFields");
+
+const validateModel = params => {
+  const {
+    model,
+    plugins
+  } = params;
+  const modelPlugin = plugins.byType(_CmsModelPlugin.CmsModelPlugin.type).find(item => item.contentModel.modelId === model.modelId);
+
+  if (modelPlugin) {
+    throw new _error.default("Content models defined via plugins cannot be updated.", "CONTENT_MODEL_UPDATE_ERROR", {
+      modelId: model.modelId
+    });
+  }
+
+  (0, _validateModelFields.validateModelFields)(params);
+};
+
+exports.validateModel = validateModel;

package/crud/contentModel/validateModel.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["validateModel","params","model","plugins","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","validateModelFields"],"sources":["validateModel.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { CmsModel } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { validateModelFields } from \"~/crud/contentModel/validateModelFields\";\n\ninterface ValidateModelParams {\n    model: CmsModel;\n    original?: CmsModel;\n    plugins: PluginsContainer;\n}\n\nexport const validateModel = (params: ValidateModelParams) => {\n    const { model, plugins } = 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 updated.\",\n            \"CONTENT_MODEL_UPDATE_ERROR\",\n            {\n                modelId: model.modelId\n            }\n        );\n    }\n\n    validateModelFields(params);\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AAGA;;AAQO,MAAMA,aAAa,GAAIC,MAAD,IAAiC;EAC1D,MAAM;IAAEC,KAAF;IAASC;EAAT,IAAqBF,MAA3B;EAEA,MAAMG,WAAW,GAAGD,OAAO,CACtBE,MADe,CACQC,8BAAA,CAAeC,IADvB,EAEfC,IAFe,CAEVC,IAAI,IAAIA,IAAI,CAACC,YAAL,CAAkBC,OAAlB,KAA8BT,KAAK,CAACS,OAFlC,CAApB;;EAIA,IAAIP,WAAJ,EAAiB;IACb,MAAM,IAAIQ,cAAJ,CACF,uDADE,EAEF,4BAFE,EAGF;MACID,OAAO,EAAET,KAAK,CAACS;IADnB,CAHE,CAAN;EAOH;;EAED,IAAAE,wCAAA,EAAoBZ,MAApB;AACH,CAlBM"}

package/crud/contentModel/validateModelFields.d.ts

@@ -1,8 +1,9 @@
 import { CmsModel } from "../../types";
 import { PluginsContainer } from "@webiny/plugins";
-interface ValidateModelParams {
+interface ValidateModelFieldsParams {
     model: CmsModel;
+    original?: CmsModel;
     plugins: PluginsContainer;
 }
-export declare const validateModelFields: (params: ValidateModelParams) => Promise<void>;
+export declare const validateModelFields: (params: ValidateModelFieldsParams) => void;
 export {};

package/crud/contentModel/validateModelFields.js

@@ -9,14 +9,14 @@ exports.validateModelFields = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
 
-var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
-
 var _createManageSDL = require("../../graphql/schema/createManageSDL");
 
+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; }
 
 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; }
@@ -25,23 +25,36 @@ const defaultTitleFieldId = "id";
 const allowedTitleFieldTypes = ["text", "number"];
 
 const getContentModelTitleFieldId = (fields, titleFieldId) => {
-  // if there is no title field defined either in input data or existing content model data
-  // we will take first text field that has no multiple values enabled
-  // or if initial titleFieldId is the default one also try to find first available text field
+  /**
+   * If there are no fields defined, we will return the default field
+   */
+  if (fields.length === 0) {
+    return defaultTitleFieldId;
+  }
+  /**
+   * if there is no title field defined either in input data or existing content model data
+   * we will take first text field that has no multiple values enabled
+   * or if initial titleFieldId is the default one also try to find first available text field
+   */
+
+
   if (!titleFieldId || titleFieldId === defaultTitleFieldId) {
     const titleField = fields.find(field => {
       return field.type === "text" && !field.multipleValues;
     });
-    return titleField ? titleField.fieldId : defaultTitleFieldId;
-  } // check existing titleFieldId for existence in the model
-  // for correct type
-  // and that it is not multiple values field
+    return (titleField === null || titleField === void 0 ? void 0 : titleField.fieldId) || defaultTitleFieldId;
+  }
+  /**
+   * check existing titleFieldId for existence in the model
+   * for correct type
+   * and that it is not multiple values field
+   */
 
 
   const target = fields.find(f => f.fieldId === titleFieldId);
 
   if (!target) {
-    throw new _error.default(`Field does not exist in the model.`, "VALIDATION_ERROR", {
+    throw new _error.default(`Field selected for the title field does not exist in the model.`, "VALIDATION_ERROR", {
       fieldId: titleFieldId,
       fields
     });
@@ -49,6 +62,7 @@ const getContentModelTitleFieldId = (fields, titleFieldId) => {
 
   if (allowedTitleFieldTypes.includes(target.type) === false) {
     throw new _error.default(`Only ${allowedTitleFieldTypes.join(", ")} and id fields can be used as an entry title.`, "ENTRY_TITLE_FIELD_TYPE", {
+      storageId: target.storageId,
       fieldId: target.fieldId,
       type: target.type
     });
@@ -56,6 +70,7 @@ const getContentModelTitleFieldId = (fields, titleFieldId) => {
 
   if (target.multipleValues) {
     throw new _error.default(`Fields that accept multiple values cannot be used as the entry title.`, "ENTRY_TITLE_FIELD_TYPE", {
+      storageId: target.storageId,
       fieldId: target.fieldId,
       type: target.type
     });
@@ -67,7 +82,10 @@ const getContentModelTitleFieldId = (fields, titleFieldId) => {
 const extractInvalidField = (model, err) => {
   var _err$source;
 
-  const sdl = ((_err$source = err.source) === null || _err$source === void 0 ? void 0 : _err$source.body) || ""; // Find the invalid type
+  const sdl = ((_err$source = err.source) === null || _err$source === void 0 ? void 0 : _err$source.body) || "";
+  /**
+   * Find the invalid type
+   */
 
   const {
     line: lineNumber
@@ -115,41 +133,163 @@ const extractInvalidField = (model, err) => {
   };
 };
 
-const validateModelFields = async params => {
+const validateFields = params => {
   const {
-    model,
-    plugins
+    plugins,
+    fields,
+    originalFields,
+    lockedFields
   } = params;
-  const modelPlugin = plugins.byType(_CmsModelPlugin.CmsModelPlugin.type).find(item => item.contentModel.modelId === model.modelId);
+  const fieldIdList = [];
+  const storageIdList = [];
+
+  for (const field of fields) {
+    var _field$settings, _originalField$settin;
+
+    const plugin = plugins.find(item => item.fieldType === field.type);
+
+    if (!plugin) {
+      throw new Error(`Cannot update content model because of the unknown "${field.type}" field.`);
+    }
+
+    const originalField = originalFields.find(f => f.id === field.id);
+    /**
+     * Field MUST have an fieldId defined.
+     */
+
+    if (!field.fieldId) {
+      throw new _error.default(`Field does not have an "fieldId" defined.`, "MISSING_FIELD_ID", {
+        field
+      });
+    }
+    /**
+     * If storageId does not match a certain pattern, add that pattern, but only if field is not locked (used) already.
+     * This is to avoid errors in the already installed systems.
+     *
+     * Why are we using the @?
+     *
+     * It is not part of special characters for the query syntax in the Lucene.
+     *
+     * Relevant links:
+     * https://lucene.apache.org/core/3_4_0/queryparsersyntax.html
+     * https://discuss.elastic.co/t/special-characters-in-field-names/10658/3
+     * https://discuss.elastic.co/t/illegal-characters-in-elasticsearch-field-names/17196/2
+     */
+
+
+    const isLocked = lockedFields.some(lockedField => {
+      return lockedField.fieldId === field.storageId;
+    });
+
+    if (!field.storageId) {
+      /**
+       * In case field is locked, we must set the storageId to the fieldId value.
+       * This should not happen, because we upgrade all the fields in 5.33.0, but let's have a check just in case of some upgrade miss.
+       */
+      //
+      if (isLocked) {
+        field.storageId = field.fieldId;
+      }
+      /**
+       * When having original field, just set the storageId to value from the originalField
+       */
+      //
+      else if (originalField) {
+        field.storageId = originalField.storageId;
+      }
+      /**
+       * The last case is when no original field and not locked - so this is a completely new field.
+       */
+      //
+      else {
+        field.storageId = (0, _createFieldStorageId.createFieldStorageId)(field);
+      }
+    }
+    /**
+     * Check the field's fieldId against existing ones.
+     * There cannot be two fields with the same fieldId - outside world identifier.
+     */
 
-  if (modelPlugin) {
-    throw new _error.default("Content models defined via plugins cannot be updated.", "CONTENT_MODEL_UPDATE_ERROR", {
-      modelId: model.modelId
+
+    if (fieldIdList.includes(field.fieldId)) {
+      throw new _error.default(`Cannot update content model because field "${field.storageId}" has fieldId "${field.fieldId}", which is already used.`);
+    }
+
+    fieldIdList.push(field.fieldId);
+    /**
+     * Check the field's storageId against the existing ones.
+     * There cannot be two fields with the same storageId.
+     */
+
+    if (storageIdList.includes(field.storageId)) {
+      throw new _error.default(`Cannot update content model because field "${field.label}" has storageId "${field.storageId}", which is already used.`);
+    }
+
+    storageIdList.push(field.storageId);
+    /**
+     * TODO maybe make this part pluginable?
+     * We need to check the object field child fields.
+     * It must be recursive.
+     */
+
+    if (field.type !== "object") {
+      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: []
     });
   }
+};
 
+const validateModelFields = params => {
+  const {
+    model,
+    original,
+    plugins
+  } = params;
   const {
     titleFieldId
-  } = model; // There should be fields/locked fields in either model or data to be updated.
+  } = model;
+  /**
+   * There should be fields/locked fields in either model or data to be updated.
+   */
 
   const {
     fields = [],
     lockedFields = []
-  } = model; // Let's inspect the fields of the received content model. We prevent saving of a content model if it
-  // contains a field for which a "cms-model-field-to-graphql" plugin does not exist on the backend.
+  } = model;
+  /**
+   * Let's inspect the fields of the received content model. We prevent saving of a content model if it
+   * contains a field for which a "cms-model-field-to-graphql" plugin does not exist on the backend.
+   */
 
   const fieldTypePlugins = plugins.byType("cms-model-field-to-graphql");
-
-  for (let i = 0; i < fields.length; i++) {
-    const field = fields[i];
-
-    if (!fieldTypePlugins.find(item => item.fieldType === field.type)) {
-      throw new Error(`Cannot update content model because of the unknown "${field.type}" field.`);
-    }
-  }
+  validateFields({
+    fields,
+    originalFields: (original === null || original === void 0 ? void 0 : original.fields) || [],
+    lockedFields,
+    plugins: fieldTypePlugins
+  });
 
   if (fields.length) {
-    // Make sure that this model can be safely converted to a GraphQL SDL
+    /**
+     * Make sure that this model can be safely converted to a GraphQL SDL
+     */
     const schema = (0, _createManageSDL.createManageSDL)({
       model,
       fieldTypePlugins: fieldTypePlugins.reduce((acc, pl) => _objectSpread(_objectSpread({}, acc), {}, {
@@ -165,22 +305,44 @@ const validateModelFields = async params => {
   }
 
   model.titleFieldId = getContentModelTitleFieldId(fields, titleFieldId);
-  const cmsLockedFieldPlugins = plugins.byType("cms-model-locked-field"); // We must not allow removal or changes in fields that are already in use in content entries.
+  const cmsLockedFieldPlugins = plugins.byType("cms-model-locked-field");
+  /**
+   * We must not allow removal or changes in fields that are already in use in content entries.
+   * Locked fields still have fieldId (should be storageId) because of the old existing locked fields in the models.
+   */
 
   for (const lockedField of lockedFields) {
-    const existingField = fields.find(item => item.fieldId === lockedField.fieldId);
+    const existingField = fields.find(item => item.storageId === lockedField.fieldId);
+    /**
+     * Starting with 5.33.0 fields can be deleted.
+     * Our UI gives a warning upon locked field deletion, but if user is managing fields through API directly - we cannot do anything.
+     */
 
     if (!existingField) {
-      throw new _error.default(`Cannot remove the field "${lockedField.fieldId}" because it's already in use in created content.`, "ENTRY_FIELD_USED");
+      continue; // throw new WebinyError(
+      //     `Cannot remove the field "${lockedField.fieldId}" because it's already in use in created content.`,
+      //     "ENTRY_FIELD_USED",
+      //     {
+      //         lockedField,
+      //         fields
+      //     }
+      // );
     }
 
     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");
+      throw new _error.default(`Cannot change "multipleValues" for the "${lockedField.fieldId}" field because it's already in use in created content.`, "ENTRY_FIELD_USED", {
+        field: existingField
+      });
     }
 
     if (lockedField.type !== existingField.type) {
-      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");
-    } // Check `lockedField` invariant for specific field
+      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
+      });
+    }
+    /**
+     * Check `lockedField` invariant for specific field
+     */
 
 
     const lockedFieldsByType = cmsLockedFieldPlugins.filter(pl => pl.fieldType === lockedField.type);