@webiny/api-headless-cms 0.0.0-mt-3 → 0.0.0-unstable.2af142b57e

package/context.d.ts

@@ -0,0 +1,6 @@
+import { CmsContext, HeadlessCmsStorageOperations } from "./types";
+import { ContextPlugin } from "@webiny/api";
+export interface CrudParams {
+    storageOperations: HeadlessCmsStorageOperations;
+}
+export declare const createContextPlugin: ({ storageOperations }: CrudParams) => ContextPlugin<CmsContext>;

package/context.js

@@ -0,0 +1,94 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createContextPlugin = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _error = _interopRequireDefault(require("@webiny/error"));
+var _api = require("@webiny/api");
+var _CmsParametersPlugin = require("./plugins/CmsParametersPlugin");
+var _system = require("./crud/system.crud");
+var _settings = require("./crud/settings.crud");
+var _contentModelGroup = require("./crud/contentModelGroup.crud");
+var _contentModel = require("./crud/contentModel.crud");
+var _contentEntry = require("./crud/contentEntry.crud");
+const getParameters = async context => {
+  const plugins = context.plugins.byType(_CmsParametersPlugin.CmsParametersPlugin.type);
+  for (const plugin of plugins) {
+    const result = await plugin.getParameters(context);
+    if (result !== null) {
+      return result;
+    }
+  }
+  throw new _error.default("Could not determine locale and/or type of the CMS.", "CMS_LOCALE_AND_TYPE_ERROR");
+};
+const createContextPlugin = ({
+  storageOperations
+}) => {
+  return new _api.ContextPlugin(async context => {
+    const {
+      type,
+      locale
+    } = await getParameters(context);
+    const getLocale = () => {
+      const systemLocale = context.i18n.getLocale(locale);
+      if (!systemLocale) {
+        throw new _error.default(`There is no locale "${locale}" in the system.`);
+      }
+      return systemLocale;
+    };
+    const getIdentity = () => {
+      return context.security.getIdentity();
+    };
+    const getTenant = () => {
+      return context.tenancy.getCurrentTenant();
+    };
+    if (storageOperations.beforeInit) {
+      await storageOperations.beforeInit(context);
+    }
+    context.cms = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+      type,
+      locale,
+      getLocale,
+      READ: type === "read",
+      PREVIEW: type === "preview",
+      MANAGE: type === "manage",
+      storageOperations
+    }, (0, _system.createSystemCrud)({
+      context,
+      getTenant,
+      getLocale,
+      getIdentity,
+      storageOperations
+    })), (0, _settings.createSettingsCrud)({
+      context,
+      getTenant,
+      getLocale,
+      storageOperations
+    })), (0, _contentModelGroup.createModelGroupsCrud)({
+      context,
+      getTenant,
+      getLocale,
+      getIdentity,
+      storageOperations
+    })), (0, _contentModel.createModelsCrud)({
+      context,
+      getLocale,
+      getTenant,
+      getIdentity,
+      storageOperations
+    })), (0, _contentEntry.createContentEntryCrud)({
+      context,
+      getIdentity,
+      getTenant,
+      storageOperations
+    }));
+    if (!storageOperations.init) {
+      return;
+    }
+    await storageOperations.init(context);
+  });
+};
+exports.createContextPlugin = createContextPlugin;

package/context.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getParameters","context","plugins","byType","CmsParametersPlugin","type","plugin","result","WebinyError","createContextPlugin","storageOperations","ContextPlugin","locale","getLocale","systemLocale","i18n","getIdentity","security","getTenant","tenancy","getCurrentTenant","beforeInit","cms","READ","PREVIEW","MANAGE","createSystemCrud","createSettingsCrud","createModelGroupsCrud","createModelsCrud","createContentEntryCrud","init"],"sources":["context.ts"],"sourcesContent":["import { CmsContext, HeadlessCmsStorageOperations } from \"~/types\";\nimport WebinyError from \"@webiny/error\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { CmsParametersPlugin, CmsParametersPluginResponse } from \"~/plugins/CmsParametersPlugin\";\nimport { createSystemCrud } from \"~/crud/system.crud\";\nimport { createSettingsCrud } from \"~/crud/settings.crud\";\nimport { createModelGroupsCrud } from \"~/crud/contentModelGroup.crud\";\nimport { createModelsCrud } from \"~/crud/contentModel.crud\";\nimport { createContentEntryCrud } from \"~/crud/contentEntry.crud\";\n\nconst getParameters = async (context: CmsContext): Promise<CmsParametersPluginResponse> => {\n    const plugins = context.plugins.byType<CmsParametersPlugin>(CmsParametersPlugin.type);\n\n    for (const plugin of plugins) {\n        const result = await plugin.getParameters(context);\n        if (result !== null) {\n            return result;\n        }\n    }\n    throw new WebinyError(\n        \"Could not determine locale and/or type of the CMS.\",\n        \"CMS_LOCALE_AND_TYPE_ERROR\"\n    );\n};\n\nexport interface CrudParams {\n    storageOperations: HeadlessCmsStorageOperations;\n}\n\nexport const createContextPlugin = ({ storageOperations }: CrudParams) => {\n    return new ContextPlugin<CmsContext>(async context => {\n        const { type, locale } = await getParameters(context);\n\n        const getLocale = () => {\n            const systemLocale = context.i18n.getLocale(locale);\n            if (!systemLocale) {\n                throw new WebinyError(`There is no locale \"${locale}\" in the system.`);\n            }\n            return systemLocale;\n        };\n\n        const getIdentity = () => {\n            return context.security.getIdentity();\n        };\n\n        const getTenant = () => {\n            return context.tenancy.getCurrentTenant();\n        };\n\n        if (storageOperations.beforeInit) {\n            await storageOperations.beforeInit(context);\n        }\n\n        context.cms = {\n            type,\n            locale,\n            getLocale,\n            READ: type === \"read\",\n            PREVIEW: type === \"preview\",\n            MANAGE: type === \"manage\",\n            storageOperations,\n            ...createSystemCrud({\n                context,\n                getTenant,\n                getLocale,\n                getIdentity,\n                storageOperations\n            }),\n            ...createSettingsCrud({\n                context,\n                getTenant,\n                getLocale,\n                storageOperations\n            }),\n            ...createModelGroupsCrud({\n                context,\n                getTenant,\n                getLocale,\n                getIdentity,\n                storageOperations\n            }),\n            ...createModelsCrud({\n                context,\n                getLocale,\n                getTenant,\n                getIdentity,\n                storageOperations\n            }),\n            ...createContentEntryCrud({\n                context,\n                getIdentity,\n                getTenant,\n                storageOperations\n            })\n        };\n\n        if (!storageOperations.init) {\n            return;\n        }\n        await storageOperations.init(context);\n    });\n};\n"],"mappings":";;;;;;;;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA,MAAMA,aAAa,GAAG,MAAOC,OAAmB,IAA2C;EACvF,MAAMC,OAAO,GAAGD,OAAO,CAACC,OAAO,CAACC,MAAM,CAAsBC,wCAAmB,CAACC,IAAI,CAAC;EAErF,KAAK,MAAMC,MAAM,IAAIJ,OAAO,EAAE;IAC1B,MAAMK,MAAM,GAAG,MAAMD,MAAM,CAACN,aAAa,CAACC,OAAO,CAAC;IAClD,IAAIM,MAAM,KAAK,IAAI,EAAE;MACjB,OAAOA,MAAM;IACjB;EACJ;EACA,MAAM,IAAIC,cAAW,CACjB,oDAAoD,EACpD,2BAA2B,CAC9B;AACL,CAAC;AAMM,MAAMC,mBAAmB,GAAG,CAAC;EAAEC;AAA8B,CAAC,KAAK;EACtE,OAAO,IAAIC,kBAAa,CAAa,MAAMV,OAAO,IAAI;IAClD,MAAM;MAAEI,IAAI;MAAEO;IAAO,CAAC,GAAG,MAAMZ,aAAa,CAACC,OAAO,CAAC;IAErD,MAAMY,SAAS,GAAG,MAAM;MACpB,MAAMC,YAAY,GAAGb,OAAO,CAACc,IAAI,CAACF,SAAS,CAACD,MAAM,CAAC;MACnD,IAAI,CAACE,YAAY,EAAE;QACf,MAAM,IAAIN,cAAW,CAAE,uBAAsBI,MAAO,kBAAiB,CAAC;MAC1E;MACA,OAAOE,YAAY;IACvB,CAAC;IAED,MAAME,WAAW,GAAG,MAAM;MACtB,OAAOf,OAAO,CAACgB,QAAQ,CAACD,WAAW,EAAE;IACzC,CAAC;IAED,MAAME,SAAS,GAAG,MAAM;MACpB,OAAOjB,OAAO,CAACkB,OAAO,CAACC,gBAAgB,EAAE;IAC7C,CAAC;IAED,IAAIV,iBAAiB,CAACW,UAAU,EAAE;MAC9B,MAAMX,iBAAiB,CAACW,UAAU,CAACpB,OAAO,CAAC;IAC/C;IAEAA,OAAO,CAACqB,GAAG;MACPjB,IAAI;MACJO,MAAM;MACNC,SAAS;MACTU,IAAI,EAAElB,IAAI,KAAK,MAAM;MACrBmB,OAAO,EAAEnB,IAAI,KAAK,SAAS;MAC3BoB,MAAM,EAAEpB,IAAI,KAAK,QAAQ;MACzBK;IAAiB,GACd,IAAAgB,wBAAgB,EAAC;MAChBzB,OAAO;MACPiB,SAAS;MACTL,SAAS;MACTG,WAAW;MACXN;IACJ,CAAC,CAAC,GACC,IAAAiB,4BAAkB,EAAC;MAClB1B,OAAO;MACPiB,SAAS;MACTL,SAAS;MACTH;IACJ,CAAC,CAAC,GACC,IAAAkB,wCAAqB,EAAC;MACrB3B,OAAO;MACPiB,SAAS;MACTL,SAAS;MACTG,WAAW;MACXN;IACJ,CAAC,CAAC,GACC,IAAAmB,8BAAgB,EAAC;MAChB5B,OAAO;MACPY,SAAS;MACTK,SAAS;MACTF,WAAW;MACXN;IACJ,CAAC,CAAC,GACC,IAAAoB,oCAAsB,EAAC;MACtB7B,OAAO;MACPe,WAAW;MACXE,SAAS;MACTR;IACJ,CAAC,CAAC,CACL;IAED,IAAI,CAACA,iBAAiB,CAACqB,IAAI,EAAE;MACzB;IACJ;IACA,MAAMrB,iBAAiB,CAACqB,IAAI,CAAC9B,OAAO,CAAC;EACzC,CAAC,CAAC;AACN,CAAC;AAAC"}

package/crud/contentEntry/afterDelete.d.ts

@@ -0,0 +1,8 @@
+import { Topic } from "@webiny/pubsub/types";
+import { OnEntryAfterDeleteTopicParams, CmsContext } from "../../types";
+interface AssignAfterEntryDeleteParams {
+    context: CmsContext;
+    onEntryAfterDelete: Topic<OnEntryAfterDeleteTopicParams>;
+}
+export declare const assignAfterEntryDelete: (params: AssignAfterEntryDeleteParams) => void;
+export {};

package/{content/plugins/crud → crud}/contentEntry/afterDelete.js

@@ -4,15 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assignAfterEntryDelete = void 0;
-
 var _markLockedFields = require("./markLockedFields");
-
 const assignAfterEntryDelete = params => {
   const {
     context,
-    onAfterDelete
+    onEntryAfterDelete
   } = params;
-  onAfterDelete.subscribe(async params => {
+  onEntryAfterDelete.subscribe(async params => {
     const {
       entry,
       model
@@ -26,16 +24,13 @@ const assignAfterEntryDelete = params => {
       },
       limit: 1
     });
-
     if (items.length > 0) {
       return;
     }
-
     await (0, _markLockedFields.markUnlockedFields)({
       context,
       model
     });
   });
 };
-
 exports.assignAfterEntryDelete = assignAfterEntryDelete;

package/crud/contentEntry/afterDelete.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["assignAfterEntryDelete","params","context","onEntryAfterDelete","subscribe","entry","model","items","cms","storageOperations","entries","list","where","entryId_not","entryId","latest","limit","length","markUnlockedFields"],"sources":["afterDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnEntryAfterDeleteTopicParams, CmsContext } from \"~/types\";\nimport { markUnlockedFields } from \"./markLockedFields\";\n\ninterface AssignAfterEntryDeleteParams {\n    context: CmsContext;\n    onEntryAfterDelete: Topic<OnEntryAfterDeleteTopicParams>;\n}\nexport const assignAfterEntryDelete = (params: AssignAfterEntryDeleteParams) => {\n    const { context, onEntryAfterDelete } = params;\n\n    onEntryAfterDelete.subscribe(async params => {\n        const { entry, model } = params;\n\n        const { items } = await context.cms.storageOperations.entries.list(model, {\n            where: {\n                entryId_not: entry.entryId,\n                latest: true\n            },\n            limit: 1\n        });\n        if (items.length > 0) {\n            return;\n        }\n        await markUnlockedFields({\n            context,\n            model\n        });\n    });\n};\n"],"mappings":";;;;;;AAEA;AAMO,MAAMA,sBAAsB,GAAIC,MAAoC,IAAK;EAC5E,MAAM;IAAEC,OAAO;IAAEC;EAAmB,CAAC,GAAGF,MAAM;EAE9CE,kBAAkB,CAACC,SAAS,CAAC,MAAMH,MAAM,IAAI;IACzC,MAAM;MAAEI,KAAK;MAAEC;IAAM,CAAC,GAAGL,MAAM;IAE/B,MAAM;MAAEM;IAAM,CAAC,GAAG,MAAML,OAAO,CAACM,GAAG,CAACC,iBAAiB,CAACC,OAAO,CAACC,IAAI,CAACL,KAAK,EAAE;MACtEM,KAAK,EAAE;QACHC,WAAW,EAAER,KAAK,CAACS,OAAO;QAC1BC,MAAM,EAAE;MACZ,CAAC;MACDC,KAAK,EAAE;IACX,CAAC,CAAC;IACF,IAAIT,KAAK,CAACU,MAAM,GAAG,CAAC,EAAE;MAClB;IACJ;IACA,MAAM,IAAAC,oCAAkB,EAAC;MACrBhB,OAAO;MACPI;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC;AAAC"}

package/crud/contentEntry/beforeCreate.d.ts

@@ -0,0 +1,8 @@
+import { Topic } from "@webiny/pubsub/types";
+import { OnEntryBeforeCreateTopicParams, CmsContext } from "../../types";
+interface AssignBeforeEntryCreateParams {
+    context: CmsContext;
+    onEntryBeforeCreate: Topic<OnEntryBeforeCreateTopicParams>;
+}
+export declare const assignBeforeEntryCreate: (params: AssignBeforeEntryCreateParams) => void;
+export {};

package/{content/plugins/crud → crud}/contentEntry/beforeCreate.js

@@ -4,15 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assignBeforeEntryCreate = void 0;
-
 var _markLockedFields = require("./markLockedFields");
-
 const assignBeforeEntryCreate = params => {
   const {
     context,
-    onBeforeCreate
+    onEntryBeforeCreate
   } = params;
-  onBeforeCreate.subscribe(async params => {
+  onEntryBeforeCreate.subscribe(async params => {
     const {
       entry,
       model
@@ -24,5 +22,4 @@ const assignBeforeEntryCreate = params => {
     });
   });
 };
-
 exports.assignBeforeEntryCreate = assignBeforeEntryCreate;

package/crud/contentEntry/beforeCreate.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["assignBeforeEntryCreate","params","context","onEntryBeforeCreate","subscribe","entry","model","markLockedFields"],"sources":["beforeCreate.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnEntryBeforeCreateTopicParams, CmsContext } from \"~/types\";\nimport { markLockedFields } from \"./markLockedFields\";\n\ninterface AssignBeforeEntryCreateParams {\n    context: CmsContext;\n    onEntryBeforeCreate: Topic<OnEntryBeforeCreateTopicParams>;\n}\nexport const assignBeforeEntryCreate = (params: AssignBeforeEntryCreateParams) => {\n    const { context, onEntryBeforeCreate } = params;\n\n    onEntryBeforeCreate.subscribe(async params => {\n        const { entry, model } = params;\n\n        await markLockedFields({\n            model,\n            entry,\n            context\n        });\n    });\n};\n"],"mappings":";;;;;;AAEA;AAMO,MAAMA,uBAAuB,GAAIC,MAAqC,IAAK;EAC9E,MAAM;IAAEC,OAAO;IAAEC;EAAoB,CAAC,GAAGF,MAAM;EAE/CE,mBAAmB,CAACC,SAAS,CAAC,MAAMH,MAAM,IAAI;IAC1C,MAAM;MAAEI,KAAK;MAAEC;IAAM,CAAC,GAAGL,MAAM;IAE/B,MAAM,IAAAM,kCAAgB,EAAC;MACnBD,KAAK;MACLD,KAAK;MACLH;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC;AAAC"}

package/crud/contentEntry/beforeUpdate.d.ts

@@ -0,0 +1,8 @@
+import { Topic } from "@webiny/pubsub/types";
+import { OnEntryBeforeUpdateTopicParams, CmsContext } from "../../types";
+interface AssignBeforeEntryUpdateParams {
+    context: CmsContext;
+    onEntryBeforeUpdate: Topic<OnEntryBeforeUpdateTopicParams>;
+}
+export declare const assignBeforeEntryUpdate: (params: AssignBeforeEntryUpdateParams) => void;
+export {};

package/{content/plugins/crud → crud}/contentEntry/beforeUpdate.js

@@ -4,15 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assignBeforeEntryUpdate = void 0;
-
 var _markLockedFields = require("./markLockedFields");
-
 const assignBeforeEntryUpdate = params => {
   const {
     context,
-    onBeforeUpdate
+    onEntryBeforeUpdate
   } = params;
-  onBeforeUpdate.subscribe(async params => {
+  onEntryBeforeUpdate.subscribe(async params => {
     const {
       entry,
       model
@@ -24,5 +22,4 @@ const assignBeforeEntryUpdate = params => {
     });
   });
 };
-
 exports.assignBeforeEntryUpdate = assignBeforeEntryUpdate;

package/crud/contentEntry/beforeUpdate.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["assignBeforeEntryUpdate","params","context","onEntryBeforeUpdate","subscribe","entry","model","markLockedFields"],"sources":["beforeUpdate.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnEntryBeforeUpdateTopicParams, CmsContext } from \"~/types\";\nimport { markLockedFields } from \"./markLockedFields\";\n\ninterface AssignBeforeEntryUpdateParams {\n    context: CmsContext;\n    onEntryBeforeUpdate: Topic<OnEntryBeforeUpdateTopicParams>;\n}\nexport const assignBeforeEntryUpdate = (params: AssignBeforeEntryUpdateParams) => {\n    const { context, onEntryBeforeUpdate } = params;\n\n    onEntryBeforeUpdate.subscribe(async params => {\n        const { entry, model } = params;\n\n        await markLockedFields({\n            model,\n            entry,\n            context\n        });\n    });\n};\n"],"mappings":";;;;;;AAEA;AAMO,MAAMA,uBAAuB,GAAIC,MAAqC,IAAK;EAC9E,MAAM;IAAEC,OAAO;IAAEC;EAAoB,CAAC,GAAGF,MAAM;EAE/CE,mBAAmB,CAACC,SAAS,CAAC,MAAMH,MAAM,IAAI;IAC1C,MAAM;MAAEI,KAAK;MAAEC;IAAM,CAAC,GAAGL,MAAM;IAE/B,MAAM,IAAAM,kCAAgB,EAAC;MACnBD,KAAK;MACLD,KAAK;MACLH;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC;AAAC"}

package/crud/contentEntry/entryDataValidation.d.ts

@@ -0,0 +1,10 @@
+import { CmsModel, CmsContext, CmsEntry } from "../../types";
+declare type InputData = Record<string, any>;
+export interface ValidateModelEntryDataParams {
+    context: CmsContext;
+    model: CmsModel;
+    data: InputData;
+    entry?: CmsEntry;
+}
+export declare const validateModelEntryData: (params: ValidateModelEntryDataParams) => Promise<void>;
+export {};

package/{content/plugins/crud → crud}/contentEntry/entryDataValidation.js

@@ -1,44 +1,39 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.validateModelEntryData = void 0;
-
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 const validateValue = async (args, fieldValidators, value) => {
   if (!fieldValidators) {
     return null;
   }
-
   const {
     validatorList,
     context,
     field,
-    contentModel
+    model,
+    entry
   } = args;
-
   try {
     for (const fieldValidator of fieldValidators) {
       const name = fieldValidator.name;
       const validations = validatorList[name];
-
       if (!validations || validations.length === 0) {
         return `There are no "${name}" validators defined.`;
       }
-
       for (const validate of validations) {
         const result = await validate({
           value,
           context,
           validator: fieldValidator,
           field,
-          contentModel
+          model,
+          entry
         });
-
         if (!result) {
           return fieldValidator.message;
         }
@@ -47,142 +42,120 @@ const validateValue = async (args, fieldValidators, value) => {
   } catch (ex) {
     return ex.message;
   }
-
   return null;
 };
-
 const validatePredefinedValue = (field, value) => {
   const {
     enabled = false,
     values: predefinedValues = []
   } = field.predefinedValues || {};
-
   if (!enabled) {
     return null;
   } else if (Array.isArray(predefinedValues) === false || predefinedValues.length === 0) {
     return "Missing predefined values to validate against.";
   }
-
   for (const predefinedValue of predefinedValues) {
-    // console.log(field.fieldId, predefinedValue.value, value, predefinedValue.value == value);
     if (predefinedValue.value == value) {
       return null;
     }
   }
-
   return "Value sent does not match any of the available predefined values.";
 };
 /**
  * When multiple values is selected we must run validations on the array containing the values
  * And then on each value in the array
  */
-
-
 const runFieldMultipleValuesValidations = async args => {
   const {
     field,
     data
   } = args;
-  const values = data[field.fieldId];
-
+  const values = data[field.fieldId] || [];
   if (Array.isArray(values) === false) {
     return `Value of the field "${field.fieldId}" is not an array.`;
   }
-
   const valuesError = await validateValue(args, field.listValidation || [], values);
-
   if (valuesError) {
     return valuesError;
   }
-
   for (const value of values) {
     const valueError = await validateValue(args, field.validation || [], value);
-
     if (valueError) {
       return valueError;
     }
-
     const predefinedValueError = validatePredefinedValue(field, value);
-
     if (predefinedValueError) {
       return predefinedValueError;
     }
   }
-
   return null;
 };
 /**
  * Runs validation on given value.
  */
-
-
 const runFieldValueValidations = async args => {
   const {
     data,
     field
   } = args;
   const value = data[field.fieldId];
-  const error = await validateValue(args, field.validation, value);
-
+  const error = await validateValue(args, field.validation || [], value);
   if (error) {
     return error;
   }
-
   return validatePredefinedValue(field, value);
 };
-
 const execValidation = async args => {
   if (args.field.multipleValues) {
     return await runFieldMultipleValuesValidations(args);
   }
-
   return await runFieldValueValidations(args);
 };
-
-const validateModelEntryData = async (context, contentModel, data) => {
+const validateModelEntryData = async params => {
+  const {
+    context,
+    model,
+    entry,
+    data
+  } = params;
   /**
    * To later simplify searching for the validations we map them to a name.
    * @see CmsModelFieldValidatorPlugin.validator.validate
    */
   const validatorList = context.plugins.byType("cms-model-field-validator").reduce((acc, plugin) => {
     const name = plugin.validator.name;
-
     if (!acc[name]) {
       acc[name] = [];
     }
-
     acc[name].push(plugin.validator.validate);
     return acc;
   }, {});
+
   /**
    * Loop through model fields and validate the corresponding data.
    * Run validation only if the field has validation configured.
    */
-
   const invalidFields = [];
-
-  for (const field of contentModel.fields) {
+  for (const field of model.fields) {
     const error = await execValidation({
-      contentModel,
+      model,
       validatorList,
       field,
-      data,
-      context
+      data: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (entry === null || entry === void 0 ? void 0 : entry.values) || {}), data),
+      context,
+      entry
     });
-
     if (!error) {
       continue;
     }
-
     invalidFields.push({
       fieldId: field.fieldId,
+      storageId: field.storageId,
       error
     });
   }
-
   if (invalidFields.length > 0) {
     throw new _error.default("Validation failed.", "VALIDATION_FAILED", invalidFields);
   }
 };
-
 exports.validateModelEntryData = validateModelEntryData;

package/crud/contentEntry/entryDataValidation.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["validateValue","args","fieldValidators","value","validatorList","context","field","model","entry","fieldValidator","name","validations","length","validate","result","validator","message","ex","validatePredefinedValue","enabled","values","predefinedValues","Array","isArray","predefinedValue","runFieldMultipleValuesValidations","data","fieldId","valuesError","listValidation","valueError","validation","predefinedValueError","runFieldValueValidations","error","execValidation","multipleValues","validateModelEntryData","params","plugins","byType","reduce","acc","plugin","push","invalidFields","fields","storageId","WebinyError"],"sources":["entryDataValidation.ts"],"sourcesContent":["import {\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldValidation,\n    CmsContext,\n    CmsModelFieldValidatorPlugin,\n    CmsModelFieldValidatorValidateParams,\n    CmsEntry\n} from \"~/types\";\nimport WebinyError from \"@webiny/error\";\n\ntype PluginValidationCallable = (params: CmsModelFieldValidatorValidateParams) => Promise<boolean>;\ntype PluginValidationList = Record<string, PluginValidationCallable[]>;\ntype InputData = Record<string, any>;\n\ninterface ValidateArgs {\n    validatorList: PluginValidationList;\n    field: CmsModelField;\n    model: CmsModel;\n    data: InputData;\n    context: CmsContext;\n    entry?: CmsEntry;\n}\n\ntype PossibleValue = boolean | number | string | null | undefined;\n\nconst validateValue = async (\n    args: ValidateArgs,\n    fieldValidators: CmsModelFieldValidation[],\n    value: PossibleValue | PossibleValue[]\n): Promise<string | null> => {\n    if (!fieldValidators) {\n        return null;\n    }\n\n    const { validatorList, context, field, model, entry } = args;\n    try {\n        for (const fieldValidator of fieldValidators) {\n            const name = fieldValidator.name;\n            const validations = validatorList[name];\n            if (!validations || validations.length === 0) {\n                return `There are no \"${name}\" validators defined.`;\n            }\n            for (const validate of validations) {\n                const result = await validate({\n                    value,\n                    context,\n                    validator: fieldValidator,\n                    field,\n                    model,\n                    entry\n                });\n                if (!result) {\n                    return fieldValidator.message;\n                }\n            }\n        }\n    } catch (ex) {\n        return ex.message;\n    }\n\n    return null;\n};\n\nconst validatePredefinedValue = (field: CmsModelField, value: any | any[]): string | null => {\n    const { enabled = false, values: predefinedValues = [] } = field.predefinedValues || {};\n    if (!enabled) {\n        return null;\n    } else if (Array.isArray(predefinedValues) === false || predefinedValues.length === 0) {\n        return \"Missing predefined values to validate against.\";\n    }\n    for (const predefinedValue of predefinedValues) {\n        if (predefinedValue.value == value) {\n            return null;\n        }\n    }\n    return \"Value sent does not match any of the available predefined values.\";\n};\n/**\n * When multiple values is selected we must run validations on the array containing the values\n * And then on each value in the array\n */\nconst runFieldMultipleValuesValidations = async (args: ValidateArgs): Promise<string | null> => {\n    const { field, data } = args;\n    const values = data[field.fieldId] || [];\n    if (Array.isArray(values) === false) {\n        return `Value of the field \"${field.fieldId}\" is not an array.`;\n    }\n    const valuesError = await validateValue(args, field.listValidation || [], values);\n    if (valuesError) {\n        return valuesError;\n    }\n    for (const value of values) {\n        const valueError = await validateValue(args, field.validation || [], value);\n        if (valueError) {\n            return valueError;\n        }\n        const predefinedValueError = validatePredefinedValue(field, value);\n        if (predefinedValueError) {\n            return predefinedValueError;\n        }\n    }\n    return null;\n};\n/**\n * Runs validation on given value.\n */\nconst runFieldValueValidations = async (args: ValidateArgs): Promise<string | null> => {\n    const { data, field } = args;\n    const value = data[field.fieldId];\n    const error = await validateValue(args, field.validation || [], value);\n    if (error) {\n        return error;\n    }\n    return validatePredefinedValue(field, value);\n};\n\nconst execValidation = async (args: ValidateArgs): Promise<string | null> => {\n    if (args.field.multipleValues) {\n        return await runFieldMultipleValuesValidations(args);\n    }\n    return await runFieldValueValidations(args);\n};\n\nexport interface ValidateModelEntryDataParams {\n    context: CmsContext;\n    model: CmsModel;\n    data: InputData;\n    entry?: CmsEntry;\n}\nexport const validateModelEntryData = async (params: ValidateModelEntryDataParams) => {\n    const { context, model, entry, data } = params;\n    /**\n     * To later simplify searching for the validations we map them to a name.\n     * @see CmsModelFieldValidatorPlugin.validator.validate\n     */\n    const validatorList: PluginValidationList = context.plugins\n        .byType<CmsModelFieldValidatorPlugin>(\"cms-model-field-validator\")\n        .reduce((acc, plugin) => {\n            const name = plugin.validator.name;\n            if (!acc[name]) {\n                acc[name] = [];\n            }\n            acc[name].push(plugin.validator.validate);\n\n            return acc;\n        }, {} as PluginValidationList);\n\n    /**\n     * Loop through model fields and validate the corresponding data.\n     * Run validation only if the field has validation configured.\n     */\n    const invalidFields = [];\n    for (const field of model.fields) {\n        const error = await execValidation({\n            model,\n            validatorList,\n            field,\n            data: {\n                ...(entry?.values || {}),\n                ...data\n            },\n            context,\n            entry\n        });\n        if (!error) {\n            continue;\n        }\n        invalidFields.push({\n            fieldId: field.fieldId,\n            storageId: field.storageId,\n            error\n        });\n    }\n\n    if (invalidFields.length > 0) {\n        throw new WebinyError(\"Validation failed.\", \"VALIDATION_FAILED\", invalidFields);\n    }\n};\n"],"mappings":"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"}

package/{content/plugins/crud → crud}/contentEntry/markLockedFields.d.ts

@@ -1,5 +1,5 @@
-import { CmsEntry, CmsModel, CmsContext } from "../../../../types";
-export interface MarkLockedFieldsParams {
+import { CmsEntry, CmsModel, CmsContext } from "../../types";
+interface MarkLockedFieldsParams {
     model: CmsModel;
     entry: CmsEntry;
     context: CmsContext;
@@ -10,3 +10,4 @@ export interface MarkFieldsUnlockedParams {
     model: CmsModel;
 }
 export declare const markUnlockedFields: (params: MarkFieldsUnlockedParams) => Promise<void>;
+export {};

package/{content/plugins/crud → crud}/contentEntry/markLockedFields.js

@@ -1,22 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.markUnlockedFields = exports.markLockedFields = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _error = _interopRequireDefault(require("@webiny/error"));
-
-var _CmsModelPlugin = require("../../CmsModelPlugin");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
+var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
+var _getBaseFieldType = require("../../utils/getBaseFieldType");
 const markLockedFields = async params => {
   const {
     model,
@@ -25,67 +17,58 @@ const markLockedFields = async params => {
   /**
    * If the model is registered via a plugin, we don't need do process anything.
    */
-
   const plugins = context.plugins.byType(_CmsModelPlugin.CmsModelPlugin.type);
-
   if (plugins.find(plugin => plugin.contentModel.modelId === model.modelId)) {
     return;
   }
-
   const cmsLockedFieldPlugins = context.plugins.byType("cms-model-locked-field");
   const existingLockedFields = model.lockedFields || [];
   const lockedFields = [];
-
   for (const field of model.fields) {
-    const alreadyLocked = existingLockedFields.some(lockedField => lockedField.fieldId === field.fieldId);
-
+    const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+    const alreadyLocked = existingLockedFields.some(lockedField => lockedField.fieldId === field.storageId);
     if (alreadyLocked) {
       continue;
     }
-
     let lockedFieldData = {};
-    const lockedFieldPlugins = cmsLockedFieldPlugins.filter(pl => pl.fieldType === field.type);
-
+    const lockedFieldPlugins = cmsLockedFieldPlugins.filter(pl => pl.fieldType === baseType);
     for (const plugin of lockedFieldPlugins) {
       if (typeof plugin.getLockedFieldData !== "function") {
         continue;
       }
-
       const data = plugin.getLockedFieldData({
         field
       });
-      lockedFieldData = _objectSpread(_objectSpread({}, lockedFieldData), data);
+      lockedFieldData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, lockedFieldData), data);
     }
-
-    lockedFields.push(_objectSpread({
-      fieldId: field.fieldId,
-      multipleValues: field.multipleValues,
-      type: field.type
+    lockedFields.push((0, _objectSpread2.default)({
+      fieldId: field.storageId,
+      multipleValues: !!field.multipleValues,
+      type: baseType
     }, lockedFieldData));
-  } // no need to update anything if no locked fields were added
-
-
+  }
+  // no need to update anything if no locked fields were added
   if (lockedFields.length === 0) {
     return;
   }
-
   const newLockedFields = existingLockedFields.concat(lockedFields);
-
   try {
     await context.cms.updateModelDirect({
       original: model,
-      model: _objectSpread(_objectSpread({}, model), {}, {
+      model: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model), {}, {
         lockedFields: newLockedFields
       })
     });
     model.lockedFields = newLockedFields;
   } catch (ex) {
-    throw new _error.default(`Could not update model "${model.modelId}" with new locked fields.`, "MODEL_LOCKED_FIELDS_UPDATE_FAILED", ex);
+    throw new _error.default(`Could not update model "${model.modelId}" with new locked fields.`, "MODEL_LOCKED_FIELDS_UPDATE_FAILED", {
+      message: ex.message,
+      code: ex.code,
+      data: ex.data
+    });
   }
 };
-
 exports.markLockedFields = markLockedFields;
-
 const markUnlockedFields = async params => {
   const {
     context,
@@ -94,24 +77,24 @@ const markUnlockedFields = async params => {
   /**
    * If the model is registered via a plugin, we don't need do process anything.
    */
-
   const plugins = context.plugins.byType(_CmsModelPlugin.CmsModelPlugin.type);
-
   if (plugins.find(plugin => plugin.contentModel.modelId === model.modelId)) {
     return;
   }
-
   try {
     await context.cms.updateModelDirect({
       original: model,
-      model: _objectSpread(_objectSpread({}, model), {}, {
+      model: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model), {}, {
         lockedFields: []
       })
     });
     model.lockedFields = [];
   } catch (ex) {
-    throw new _error.default(`Could not update model "${model.modelId}" with unlocked fields.`, "MODEL_UNLOCKED_FIELDS_UPDATE_FAILED", ex);
+    throw new _error.default(`Could not update model "${model.modelId}" with unlocked fields.`, "MODEL_UNLOCKED_FIELDS_UPDATE_FAILED", {
+      message: ex.message,
+      code: ex.code,
+      data: ex.data
+    });
   }
 };
-
 exports.markUnlockedFields = markUnlockedFields;