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

package/crud/contentEntry/entryDataValidation.js

@@ -191,6 +191,7 @@ const validateModelEntryData = async params => {
 
     invalidFields.push({
       fieldId: field.fieldId,
+      storageId: field.storageId,
       error
     });
   }

package/crud/contentEntry/entryDataValidation.js.map

@@ -1 +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","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            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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"}
+{"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/crud/contentEntry/markLockedFields.js

@@ -37,7 +37,7 @@ const markLockedFields = async params => {
   const lockedFields = [];
 
   for (const field of model.fields) {
-    const alreadyLocked = existingLockedFields.some(lockedField => lockedField.fieldId === field.fieldId);
+    const alreadyLocked = existingLockedFields.some(lockedField => lockedField.fieldId === field.storageId);
 
     if (alreadyLocked) {
       continue;
@@ -58,7 +58,7 @@ const markLockedFields = async params => {
     }
 
     lockedFields.push(_objectSpread({
-      fieldId: field.fieldId,
+      fieldId: field.storageId,
       multipleValues: !!field.multipleValues,
       type: field.type
     }, lockedFieldData));

package/crud/contentEntry/markLockedFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["markLockedFields","params","model","context","plugins","byType","CmsModelPlugin","type","find","plugin","contentModel","modelId","cmsLockedFieldPlugins","existingLockedFields","lockedFields","field","fields","alreadyLocked","some","lockedField","fieldId","lockedFieldData","lockedFieldPlugins","filter","pl","fieldType","getLockedFieldData","data","push","multipleValues","length","newLockedFields","concat","cms","updateModelDirect","original","ex","WebinyError","markUnlockedFields"],"sources":["markLockedFields.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntry, CmsModel, CmsContext, CmsModelLockedFieldPlugin, LockedField } from \"~/types\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\n\ninterface MarkLockedFieldsParams {\n    model: CmsModel;\n    entry: CmsEntry;\n    context: CmsContext;\n}\nexport const markLockedFields = async (params: MarkLockedFieldsParams): Promise<void> => {\n    const { model, context } = params;\n    /**\n     * If the model is registered via a plugin, we don't need do process anything.\n     */\n    const plugins = context.plugins.byType<CmsModelPlugin>(CmsModelPlugin.type);\n    if (plugins.find(plugin => plugin.contentModel.modelId === model.modelId)) {\n        return;\n    }\n\n    const cmsLockedFieldPlugins =\n        context.plugins.byType<CmsModelLockedFieldPlugin>(\"cms-model-locked-field\");\n\n    const existingLockedFields = model.lockedFields || [];\n    const lockedFields: LockedField[] = [];\n    for (const field of model.fields) {\n        const alreadyLocked = existingLockedFields.some(\n            lockedField => lockedField.fieldId === field.fieldId\n        );\n        if (alreadyLocked) {\n            continue;\n        }\n\n        let lockedFieldData = {};\n\n        const lockedFieldPlugins = cmsLockedFieldPlugins.filter(pl => pl.fieldType === field.type);\n        for (const plugin of lockedFieldPlugins) {\n            if (typeof plugin.getLockedFieldData !== \"function\") {\n                continue;\n            }\n            const data = plugin.getLockedFieldData({\n                field\n            });\n            lockedFieldData = { ...lockedFieldData, ...data };\n        }\n\n        lockedFields.push({\n            fieldId: field.fieldId,\n            multipleValues: !!field.multipleValues,\n            type: field.type,\n            ...lockedFieldData\n        });\n    }\n    // no need to update anything if no locked fields were added\n    if (lockedFields.length === 0) {\n        return;\n    }\n\n    const newLockedFields = existingLockedFields.concat(lockedFields);\n\n    try {\n        await context.cms.updateModelDirect({\n            original: model,\n            model: {\n                ...model,\n                lockedFields: newLockedFields\n            }\n        });\n        model.lockedFields = newLockedFields;\n    } catch (ex) {\n        throw new WebinyError(\n            `Could not update model \"${model.modelId}\" with new locked fields.`,\n            \"MODEL_LOCKED_FIELDS_UPDATE_FAILED\",\n            ex\n        );\n    }\n};\n\nexport interface MarkFieldsUnlockedParams {\n    context: CmsContext;\n    model: CmsModel;\n}\nexport const markUnlockedFields = async (params: MarkFieldsUnlockedParams) => {\n    const { context, model } = params;\n    /**\n     * If the model is registered via a plugin, we don't need do process anything.\n     */\n    const plugins = context.plugins.byType<CmsModelPlugin>(CmsModelPlugin.type);\n    if (plugins.find(plugin => plugin.contentModel.modelId === model.modelId)) {\n        return;\n    }\n\n    try {\n        await context.cms.updateModelDirect({\n            original: model,\n            model: {\n                ...model,\n                lockedFields: []\n            }\n        });\n        model.lockedFields = [];\n    } catch (ex) {\n        throw new WebinyError(\n            `Could not update model \"${model.modelId}\" with unlocked fields.`,\n            \"MODEL_UNLOCKED_FIELDS_UPDATE_FAILED\",\n            ex\n        );\n    }\n};\n"],"mappings":"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"}
+{"version":3,"names":["markLockedFields","params","model","context","plugins","byType","CmsModelPlugin","type","find","plugin","contentModel","modelId","cmsLockedFieldPlugins","existingLockedFields","lockedFields","field","fields","alreadyLocked","some","lockedField","fieldId","storageId","lockedFieldData","lockedFieldPlugins","filter","pl","fieldType","getLockedFieldData","data","push","multipleValues","length","newLockedFields","concat","cms","updateModelDirect","original","ex","WebinyError","markUnlockedFields"],"sources":["markLockedFields.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntry, CmsModel, CmsContext, CmsModelLockedFieldPlugin, LockedField } from \"~/types\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\n\ninterface MarkLockedFieldsParams {\n    model: CmsModel;\n    entry: CmsEntry;\n    context: CmsContext;\n}\nexport const markLockedFields = async (params: MarkLockedFieldsParams): Promise<void> => {\n    const { model, context } = params;\n    /**\n     * If the model is registered via a plugin, we don't need do process anything.\n     */\n    const plugins = context.plugins.byType<CmsModelPlugin>(CmsModelPlugin.type);\n    if (plugins.find(plugin => plugin.contentModel.modelId === model.modelId)) {\n        return;\n    }\n\n    const cmsLockedFieldPlugins =\n        context.plugins.byType<CmsModelLockedFieldPlugin>(\"cms-model-locked-field\");\n\n    const existingLockedFields = model.lockedFields || [];\n    const lockedFields: LockedField[] = [];\n    for (const field of model.fields) {\n        const alreadyLocked = existingLockedFields.some(\n            lockedField => lockedField.fieldId === field.storageId\n        );\n        if (alreadyLocked) {\n            continue;\n        }\n\n        let lockedFieldData = {};\n\n        const lockedFieldPlugins = cmsLockedFieldPlugins.filter(pl => pl.fieldType === field.type);\n        for (const plugin of lockedFieldPlugins) {\n            if (typeof plugin.getLockedFieldData !== \"function\") {\n                continue;\n            }\n            const data = plugin.getLockedFieldData({\n                field\n            });\n            lockedFieldData = { ...lockedFieldData, ...data };\n        }\n\n        lockedFields.push({\n            fieldId: field.storageId,\n            multipleValues: !!field.multipleValues,\n            type: field.type,\n            ...lockedFieldData\n        });\n    }\n    // no need to update anything if no locked fields were added\n    if (lockedFields.length === 0) {\n        return;\n    }\n\n    const newLockedFields = existingLockedFields.concat(lockedFields);\n\n    try {\n        await context.cms.updateModelDirect({\n            original: model,\n            model: {\n                ...model,\n                lockedFields: newLockedFields\n            }\n        });\n        model.lockedFields = newLockedFields;\n    } catch (ex) {\n        throw new WebinyError(\n            `Could not update model \"${model.modelId}\" with new locked fields.`,\n            \"MODEL_LOCKED_FIELDS_UPDATE_FAILED\",\n            ex\n        );\n    }\n};\n\nexport interface MarkFieldsUnlockedParams {\n    context: CmsContext;\n    model: CmsModel;\n}\nexport const markUnlockedFields = async (params: MarkFieldsUnlockedParams) => {\n    const { context, model } = params;\n    /**\n     * If the model is registered via a plugin, we don't need do process anything.\n     */\n    const plugins = context.plugins.byType<CmsModelPlugin>(CmsModelPlugin.type);\n    if (plugins.find(plugin => plugin.contentModel.modelId === model.modelId)) {\n        return;\n    }\n\n    try {\n        await context.cms.updateModelDirect({\n            original: model,\n            model: {\n                ...model,\n                lockedFields: []\n            }\n        });\n        model.lockedFields = [];\n    } catch (ex) {\n        throw new WebinyError(\n            `Could not update model \"${model.modelId}\" with unlocked fields.`,\n            \"MODEL_UNLOCKED_FIELDS_UPDATE_FAILED\",\n            ex\n        );\n    }\n};\n"],"mappings":"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"}

package/crud/contentEntry.crud.js

@@ -39,6 +39,8 @@ var _ownership = require("../utils/ownership");
 
 var _entryStorage = require("../utils/entryStorage");
 
+var _valueKeyStorageConverter = require("../utils/converters/valueKeyStorageConverter");
+
 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; }
@@ -113,8 +115,18 @@ const getDefaultValue = field => {
  */
 
 
-const cleanInputData = (model, input) => {
+const mapAndCleanCreateInputData = (model, input) => {
   return model.fields.reduce((acc, field) => {
+    /**
+     * This should never happen, but let's make it sure.
+     * The fix would be for the user to add the fieldId on the field definition.
+     */
+    if (!field.fieldId) {
+      throw new _error.default("Field does not have an fieldId.", "MISSING_FIELD_ID", {
+        field
+      });
+    }
+
     const value = input[field.fieldId];
     /**
      * We set the default value on create input if value is not defined.
@@ -129,16 +141,29 @@ const cleanInputData = (model, input) => {
  */
 
 
-const cleanUpdatedInputData = (model, input) => {
+const mapAndCleanUpdatedInputData = (model, input) => {
   return model.fields.reduce((acc, field) => {
     /**
-     * We cannot set default value here because user might want to updated only certain field values.
+     * This should never happen, but let's make it sure.
+     * The fix would be for the user to add the fieldId on the field definition.
      */
-    if (input[field.fieldId] === undefined) {
+    if (!field.fieldId) {
+      throw new _error.default("Field does not have an fieldId.", "MISSING_FIELD_ID", {
+        field
+      });
+    }
+    /**
+     * We cannot set default value here because user might want to update only certain field values.
+     */
+
+
+    const value = input[field.fieldId];
+
+    if (value === undefined) {
       return acc;
     }
 
-    acc[field.fieldId] = input[field.fieldId];
+    acc[field.fieldId] = value;
     return acc;
   }, {});
 };
@@ -207,6 +232,10 @@ const getSearchableFields = params => {
     return collection;
   }, {});
   return model.fields.filter(field => {
+    if (!field.fieldId) {
+      return false;
+    }
+
     const plugin = fieldPluginMap[field.type];
 
     if (!plugin) {
@@ -228,6 +257,9 @@ const createContentEntryCrud = params => {
     getIdentity,
     getTenant
   } = params;
+  const {
+    plugins
+  } = context;
   const onBeforeEntryCreate = (0, _pubsub.createTopic)();
   const onAfterEntryCreate = (0, _pubsub.createTopic)();
   const onBeforeEntryCreateRevision = (0, _pubsub.createTopic)();
@@ -302,11 +334,15 @@ const createContentEntryCrud = params => {
    */
 
 
-  const getEntriesByIds = async (model, ids) => {
+  const getEntriesByIds = async (initialModel, ids) => {
     const permission = await checkEntryPermissions({
       rwd: "r"
     });
-    await (0, _access.checkModelAccess)(context, model);
+    await (0, _access.checkModelAccess)(context, initialModel);
+    const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+      model: initialModel,
+      plugins
+    });
     const entries = await storageOperations.entries.getByIds(model, {
       ids
     });
@@ -343,10 +379,14 @@ const createContentEntryCrud = params => {
     /**
      * Get a single entry by revision ID from the database.
      */
-    getEntryById: async (model, id) => {
+    getEntryById: async (initialModel, id) => {
       const where = {
         id
       };
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       await onBeforeEntryGet.publish({
         where,
         model
@@ -363,11 +403,15 @@ const createContentEntryCrud = params => {
     /**
      * Get published revisions by entry IDs.
      */
-    getPublishedEntriesByIds: async (model, ids) => {
+    getPublishedEntriesByIds: async (initialModel, ids) => {
       const permission = await checkEntryPermissions({
         rwd: "r"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const entries = await storageOperations.entries.getPublishedByIds(model, {
         ids
       });
@@ -377,17 +421,25 @@ const createContentEntryCrud = params => {
     /**
      * Get latest revisions by entry IDs.
      */
-    getLatestEntriesByIds: async (model, ids) => {
+    getLatestEntriesByIds: async (initialModel, ids) => {
       const permission = await checkEntryPermissions({
         rwd: "r"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const entries = await storageOperations.entries.getLatestByIds(model, {
         ids
       });
       return entries.filter(entry => (0, _ownership.validateOwnership)(context, permission, entry));
     },
-    getEntryRevisions: async (model, entryId) => {
+    getEntryRevisions: async (initialModel, entryId) => {
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       return storageOperations.entries.getRevisions(model, {
         id: entryId
       });
@@ -398,10 +450,14 @@ const createContentEntryCrud = params => {
      *
      * @internal
      */
-    getEntry: async (model, params) => {
+    getEntry: async (initialModel, params) => {
       await checkEntryPermissions({
         rwd: "r"
       });
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const {
         where,
         sort
@@ -428,11 +484,15 @@ const createContentEntryCrud = params => {
      *
      * @internal
      */
-    listEntries: async (model, params) => {
+    listEntries: async (initialModel, params) => {
       const permission = await checkEntryPermissions({
         rwd: "r"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const {
         where: initialWhere
       } = params;
@@ -468,35 +528,45 @@ const createContentEntryCrud = params => {
         });
       }
 
-      await onBeforeEntryList.publish({
-        where,
-        model
-      });
       const fields = getSearchableFields({
         model,
         plugins: context.plugins,
         fields: params.fields || []
       });
-      const {
-        hasMoreItems,
-        totalCount,
-        cursor,
-        items
-      } = await storageOperations.entries.list(model, _objectSpread(_objectSpread({}, params), {}, {
-        where,
-        fields
-      }));
-      const meta = {
-        hasMoreItems,
-        totalCount,
-
-        /**
-         * Cursor should be null if there are no more items to load.
-         * Just make sure of that, disregarding what is returned from the storageOperations.entries.list method.
-         */
-        cursor: hasMoreItems ? cursor : null
-      };
-      return [items, meta];
+
+      try {
+        await onBeforeEntryList.publish({
+          where,
+          model
+        });
+        const {
+          hasMoreItems,
+          totalCount,
+          cursor,
+          items
+        } = await storageOperations.entries.list(model, _objectSpread(_objectSpread({}, params), {}, {
+          where,
+          fields
+        }));
+        const meta = {
+          hasMoreItems,
+          totalCount,
+
+          /**
+           * Cursor should be null if there are no more items to load.
+           * Just make sure of that, disregarding what is returned from the storageOperations.entries.list method.
+           */
+          cursor: hasMoreItems ? cursor : null
+        };
+        return [items, meta];
+      } catch (ex) {
+        throw new _error.default("Error while fetching entries from storage.", "LIST_ENTRIES_ERROR", {
+          params,
+          error: ex,
+          model,
+          fields
+        });
+      }
     },
     listLatestEntries: async function (model, params) {
       const where = (params === null || params === void 0 ? void 0 : params.where) || {};
@@ -518,16 +588,20 @@ const createContentEntryCrud = params => {
         })
       }));
     },
-    createEntry: async (model, inputData) => {
+    createEntry: async (initialModel, inputData) => {
       await checkEntryPermissions({
         rwd: "w"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       /**
        * Make sure we only work with fields that are defined in the model.
        */
 
-      const initialInput = cleanInputData(model, inputData);
+      const initialInput = mapAndCleanCreateInputData(model, inputData);
       await (0, _entryDataValidation.validateModelEntryData)({
         context,
         model,
@@ -596,16 +670,20 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    createEntryRevisionFrom: async (model, sourceId, inputData) => {
+    createEntryRevisionFrom: async (initialModel, sourceId, inputData) => {
       const permission = await checkEntryPermissions({
         rwd: "w"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       /**
        * Make sure we only work with fields that are defined in the model.
        */
 
-      const input = cleanUpdatedInputData(model, inputData);
+      const input = mapAndCleanUpdatedInputData(model, inputData);
       /**
        * Entries are identified by a common parent ID + Revision number.
        */
@@ -700,16 +778,20 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    updateEntry: async (model, id, inputData, metaInput) => {
+    updateEntry: async (initialModel, id, inputData, metaInput) => {
       const permission = await checkEntryPermissions({
         rwd: "w"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       /**
        * Make sure we only work with fields that are defined in the model.
        */
 
-      const input = cleanUpdatedInputData(model, inputData);
+      const input = mapAndCleanUpdatedInputData(model, inputData);
       /**
        * The entry we are going to update.
        */
@@ -790,11 +872,15 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    republishEntry: async (model, id) => {
+    republishEntry: async (initialModel, id) => {
       await checkEntryPermissions({
         rwd: "w"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       /**
        * Fetch the entry from the storage.
        */
@@ -863,11 +949,15 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    deleteEntryRevision: async (model, revisionId) => {
+    deleteEntryRevision: async (initialModel, revisionId) => {
       const permission = await checkEntryPermissions({
         rwd: "d"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const {
         id: entryId,
         version
@@ -939,11 +1029,15 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    deleteEntry: async (model, entryId) => {
+    deleteEntry: async (initialModel, entryId) => {
       const permission = await checkEntryPermissions({
         rwd: "d"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const storageEntry = await storageOperations.entries.getLatestRevisionByEntryId(model, {
         id: entryId
       });
@@ -959,11 +1053,15 @@ const createContentEntryCrud = params => {
         entry
       });
     },
-    publishEntry: async (model, id) => {
+    publishEntry: async (initialModel, id) => {
       const permission = await checkEntryPermissions({
         pw: "p"
       });
-      await (0, _access.checkModelAccess)(context, model);
+      await (0, _access.checkModelAccess)(context, initialModel);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
         id
       });
@@ -1011,10 +1109,14 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    requestEntryChanges: async (model, id) => {
+    requestEntryChanges: async (initialModel, id) => {
       const permission = await checkEntryPermissions({
         pw: "c"
       });
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
         id
       });
@@ -1066,13 +1168,17 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    requestEntryReview: async (model, id) => {
+    requestEntryReview: async (initialModel, id) => {
       const permission = await checkEntryPermissions({
         pw: "r"
       });
       const {
         id: entryId
       } = (0, _utils.parseIdentifier)(id);
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
         id
       });
@@ -1126,10 +1232,14 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    unpublishEntry: async (model, id) => {
+    unpublishEntry: async (initialModel, id) => {
       const permission = await checkEntryPermissions({
         pw: "u"
       });
+      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
+        model: initialModel,
+        plugins
+      });
       const {
         id: entryId
       } = (0, _utils.parseIdentifier)(id);