@webiny/api-headless-cms 0.0.0-unstable.6e5425ee89 → 0.0.0-unstable.7f63ea0744

package/crud/contentModel.crud.js

@@ -7,11 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.createModelsCrud = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _dataloader = _interopRequireDefault(require("dataloader"));
+var _error = _interopRequireDefault(require("@webiny/error"));
 var _handlerGraphql = require("@webiny/handler-graphql");
 var _contentModelManagerFactory = require("./contentModel/contentModelManagerFactory");
-var _models = require("./contentModel/models");
-var _createFieldModels = require("./contentModel/createFieldModels");
-var _error = _interopRequireDefault(require("@webiny/error"));
 var _pubsub = require("@webiny/pubsub");
 var _beforeCreate = require("./contentModel/beforeCreate");
 var _beforeUpdate = require("./contentModel/beforeUpdate");
@@ -25,45 +23,19 @@ var _permissions = require("../utils/permissions");
 var _filterAsync = require("../utils/filterAsync");
 var _ownership = require("../utils/ownership");
 var _access = require("../utils/access");
-var _validateModelFields = require("./contentModel/validateModelFields");
-var _semver = _interopRequireDefault(require("semver"));
+var _validation = require("./contentModel/validation");
+var _utils = require("@webiny/utils");
 /**
- * TODO: remove for 5.34.0
- * Required because of the 5.33.0 upgrade.
- * Until the upgrade is done, API will break because there is no storageId assigned.
+ * Given a model, return an array of tags ensuring the `type` tag is set.
  */
-const featureVersion = _semver.default.coerce("5.33.0");
-const attachStorageIdToFields = fields => {
-  return fields.map(field => {
-    var _field$settings;
-    if ((_field$settings = field.settings) !== null && _field$settings !== void 0 && _field$settings.fields) {
-      field.settings.fields = attachStorageIdToFields(field.settings.fields);
-    }
-    if (!field.storageId) {
-      field.storageId = field.fieldId;
-    }
-    return field;
-  });
-};
-const attachStorageIdToModelFields = model => {
-  if (!model.webinyVersion) {
-    return model.fields;
+const ensureTypeTag = model => {
+  // Let's make sure we have a `type` tag assigned.
+  // If `type` tag is not set, set it to a default one (`model`).
+  const tags = model.tags || [];
+  if (!tags.some(tag => tag.startsWith("type:"))) {
+    tags.push("type:model");
   }
-  const version = _semver.default.coerce(model.webinyVersion);
-  if (!version) {
-    return model.fields;
-  }
-  /**
-   * Unfortunately we need to check for beta and next.
-   * TODO remove after 5.33.0
-   */
-  if (model.webinyVersion.match(/beta|next/)) {
-    return attachStorageIdToFields(model.fields);
-  }
-  if (_semver.default.compare(version, featureVersion) >= 0) {
-    return model.fields;
-  }
-  return attachStorageIdToFields(model.fields);
+  return tags;
 };
 const createModelsCrud = params => {
   const {
@@ -83,7 +55,7 @@ const createModelsCrud = params => {
       });
       return [models.map(model => {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model), {}, {
-          fields: attachStorageIdToModelFields(model),
+          tags: ensureTypeTag(model),
           tenant: model.tenant || getTenant().id,
           locale: model.locale || getLocale().code
         });
@@ -109,38 +81,29 @@ const createModelsCrud = params => {
   const getModelsAsPlugins = () => {
     const tenant = getTenant().id;
     const locale = getLocale().code;
-    const models = context.plugins.byType(_CmsModelPlugin.CmsModelPlugin.type)
+    return context.plugins.byType(_CmsModelPlugin.CmsModelPlugin.type)
     /**
      * We need to filter out models that are not for this tenant or locale.
      * If it does not have tenant or locale define, it is for every locale and tenant
      */.filter(plugin => {
       const {
-        tenant: t,
-        locale: l
+        tenant: modelTenant,
+        locale: modelLocale
       } = plugin.contentModel;
-      if (t && t !== tenant) {
+      if (modelTenant && modelTenant !== tenant) {
         return false;
-      } else if (l && l !== locale) {
+      } else if (modelLocale && modelLocale !== locale) {
         return false;
       }
       return true;
     }).map(plugin => {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, plugin.contentModel), {}, {
+        tags: ensureTypeTag(plugin.contentModel),
         tenant,
         locale,
         webinyVersion: context.WEBINY_VERSION
       });
     });
-    /**
-     * Only point where we can truly validate the user model is in the runtime.
-     */
-    for (const model of models) {
-      (0, _validateModelFields.validateModelFields)({
-        model,
-        plugins: context.plugins
-      });
-    }
-    return models;
   };
   const modelsGet = async modelId => {
     const pluginModel = getModelsAsPlugins().find(model => model.modelId === modelId);
@@ -156,6 +119,7 @@ const createModelsCrud = params => {
       throw new _handlerGraphql.NotFoundError(`Content model "${modelId}" was not found!`);
     }
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model), {}, {
+      tags: ensureTypeTag(model),
       tenant: model.tenant || getTenant().id,
       locale: model.locale || getLocale().code
     });
@@ -195,18 +159,33 @@ const createModelsCrud = params => {
     return await updateManager(context, model);
   };
 
-  // create
+  /**
+   * Create
+   */
   const onModelBeforeCreate = (0, _pubsub.createTopic)("cms.onModelBeforeCreate");
   const onModelAfterCreate = (0, _pubsub.createTopic)("cms.onModelAfterCreate");
-  // create from
+  const onModelCreateError = (0, _pubsub.createTopic)("cms.onModelCreateError");
+  /**
+   * Create from / clone
+   */
   const onModelBeforeCreateFrom = (0, _pubsub.createTopic)("cms.onModelBeforeCreateFrom");
   const onModelAfterCreateFrom = (0, _pubsub.createTopic)("cms.onModelAfterCreateFrom");
-  // update
+  const onModelCreateFromError = (0, _pubsub.createTopic)("cms.onModelCreateFromError");
+  /**
+   * Update
+   */
   const onModelBeforeUpdate = (0, _pubsub.createTopic)("cms.onModelBeforeUpdate");
   const onModelAfterUpdate = (0, _pubsub.createTopic)("cms.onModelAfterUpdate");
-  // delete
+  const onModelUpdateError = (0, _pubsub.createTopic)("cms.onModelUpdateError");
+  /**
+   * Delete
+   */
   const onModelBeforeDelete = (0, _pubsub.createTopic)("cms.onModelBeforeDelete");
   const onModelAfterDelete = (0, _pubsub.createTopic)("cms.onModelAfterDelete");
+  const onModelDeleteError = (0, _pubsub.createTopic)("cms.onModelDeleteError");
+  /**
+   * Initialize
+   */
   const onModelInitialize = (0, _pubsub.createTopic)("cms.onModelInitialize");
   /**
    * We need to assign some default behaviors.
@@ -214,7 +193,7 @@ const createModelsCrud = params => {
   (0, _beforeCreate.assignModelBeforeCreate)({
     onModelBeforeCreate,
     onModelBeforeCreateFrom,
-    plugins: context.plugins,
+    context,
     storageOperations
   });
   (0, _afterCreate.assignModelAfterCreate)({
@@ -223,8 +202,7 @@ const createModelsCrud = params => {
   });
   (0, _beforeUpdate.assignModelBeforeUpdate)({
     onModelBeforeUpdate,
-    plugins: context.plugins,
-    storageOperations
+    context
   });
   (0, _afterUpdate.assignModelAfterUpdate)({
     context,
@@ -260,33 +238,38 @@ const createModelsCrud = params => {
      */
     onModelBeforeCreate,
     onModelAfterCreate,
+    onModelCreateError,
     onModelBeforeCreateFrom,
     onModelAfterCreateFrom,
+    onModelCreateFromError,
     onModelBeforeUpdate,
     onModelAfterUpdate,
+    onModelUpdateError,
     onModelBeforeDelete,
     onModelAfterDelete,
+    onModelDeleteError,
     onModelInitialize,
     clearModelsCache,
     getModel,
     listModels,
-    async createModel(inputData) {
+    async createModel(input) {
       await checkModelPermissions("w");
-      const createdData = new _models.CreateContentModelModel().populate(inputData);
-      await createdData.validate();
-      const input = await createdData.toJSON();
+      const result = await (0, _validation.createModelCreateValidation)().safeParseAsync(input);
+      if (!result.success) {
+        throw (0, _utils.createZodError)(result.error);
+      }
+      const data = result.data;
       context.security.disableAuthorization();
-      const group = await context.cms.getGroup(input.group);
+      const group = await context.cms.getGroup(data.group);
       context.security.enableAuthorization();
       if (!group) {
-        throw new _handlerGraphql.NotFoundError(`There is no group "${input.group}".`);
+        throw new _handlerGraphql.NotFoundError(`There is no group "${data.group}".`);
       }
-      const fields = await (0, _createFieldModels.createFieldModels)(input.fields);
       const identity = getIdentity();
       const model = {
-        name: input.name,
-        description: input.description || "",
-        modelId: input.modelId || "",
+        name: data.name,
+        description: data.description || "",
+        modelId: data.modelId || "",
         titleFieldId: "id",
         locale: getLocale().code,
         tenant: getTenant().id,
@@ -301,25 +284,36 @@ const createModelsCrud = params => {
         },
         createdOn: new Date().toISOString(),
         savedOn: new Date().toISOString(),
-        fields,
+        fields: data.fields,
         lockedFields: [],
-        layout: input.layout || [],
+        layout: data.layout || [],
+        tags: [...(data.tags || [])],
         webinyVersion: context.WEBINY_VERSION
       };
-      await onModelBeforeCreate.publish({
-        input,
-        model
-      });
-      const createdModel = await storageOperations.models.create({
-        model
-      });
-      loaders.listModels.clearAll();
-      await updateManager(context, model);
-      await onModelAfterCreate.publish({
-        input,
-        model: createdModel
-      });
-      return createdModel;
+      model.tags = ensureTypeTag(model);
+      try {
+        await onModelBeforeCreate.publish({
+          input: data,
+          model
+        });
+        const createdModel = await storageOperations.models.create({
+          model
+        });
+        loaders.listModels.clearAll();
+        await updateManager(context, model);
+        await onModelAfterCreate.publish({
+          input: data,
+          model: createdModel
+        });
+        return createdModel;
+      } catch (ex) {
+        await onModelCreateError.publish({
+          input: data,
+          model,
+          error: ex
+        });
+        throw ex;
+      }
     },
     /**
      * Method does not check for permissions or ownership.
@@ -335,52 +329,64 @@ const createModelsCrud = params => {
         locale: initialModel.locale || getLocale().code,
         webinyVersion: context.WEBINY_VERSION
       });
-      await onModelBeforeUpdate.publish({
-        input: {},
-        original,
-        model
-      });
-      const resultModel = await storageOperations.models.update({
-        model
-      });
-      await updateManager(context, resultModel);
-      loaders.listModels.clearAll();
-      await onModelAfterUpdate.publish({
-        input: {},
-        original,
-        model: resultModel
-      });
-      return resultModel;
+      try {
+        await onModelBeforeUpdate.publish({
+          input: {},
+          original,
+          model
+        });
+        const resultModel = await storageOperations.models.update({
+          model
+        });
+        await updateManager(context, resultModel);
+        loaders.listModels.clearAll();
+        await onModelAfterUpdate.publish({
+          input: {},
+          original,
+          model: resultModel
+        });
+        return resultModel;
+      } catch (ex) {
+        await onModelUpdateError.publish({
+          input: {},
+          original,
+          model,
+          error: ex
+        });
+        throw ex;
+      }
     },
-    async createModelFrom(modelId, data) {
+    async createModelFrom(modelId, userInput) {
       await checkModelPermissions("w");
       /**
        * Get a model record; this will also perform ownership validation.
        */
       const original = await getModel(modelId);
-      const createdData = new _models.CreateContentModelModelFrom().populate({
-        name: data.name,
-        modelId: data.modelId,
-        description: data.description || original.description,
-        group: data.group,
-        locale: data.locale
+      const result = await (0, _validation.createModelCreateFromValidation)().safeParseAsync({
+        name: userInput.name,
+        modelId: userInput.modelId,
+        description: userInput.description || original.description,
+        group: userInput.group,
+        locale: userInput.locale
       });
-      await createdData.validate();
-      const input = await createdData.toJSON();
-      const locale = await context.i18n.getLocale(input.locale || original.locale);
+      if (!result.success) {
+        throw (0, _utils.createZodError)(result.error);
+      }
+      const data = result.data;
+      const locale = await context.i18n.getLocale(data.locale || original.locale);
       if (!locale) {
-        throw new _handlerGraphql.NotFoundError(`There is no locale "${input.locale}".`);
+        throw new _handlerGraphql.NotFoundError(`There is no locale "${data.locale}".`);
       }
       /**
        * Use storage operations directly because we cannot get group from different locale via context methods.
        */
       const group = await context.cms.storageOperations.groups.get({
-        id: input.group,
+        id: data.group,
         tenant: original.tenant,
         locale: locale.code
       });
       if (!group) {
-        throw new _handlerGraphql.NotFoundError(`There is no group "${input.group}".`);
+        throw new _handlerGraphql.NotFoundError(`There is no group "${data.group}".`);
       }
       const identity = getIdentity();
       const model = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), {}, {
@@ -389,9 +395,9 @@ const createModelsCrud = params => {
           id: group.id,
           name: group.name
         },
-        name: input.name,
-        modelId: input.modelId || "",
-        description: input.description || "",
+        name: data.name,
+        modelId: data.modelId || "",
+        description: data.description || "",
         createdBy: {
           id: identity.id,
           displayName: identity.displayName,
@@ -402,34 +408,44 @@ const createModelsCrud = params => {
         lockedFields: [],
         webinyVersion: context.WEBINY_VERSION
       });
-      await onModelBeforeCreateFrom.publish({
-        input,
-        model,
-        original
-      });
-      const createdModel = await storageOperations.models.create({
-        model
-      });
-      loaders.listModels.clearAll();
-      await updateManager(context, model);
-      await onModelAfterCreateFrom.publish({
-        input,
-        original,
-        model: createdModel
-      });
-      return createdModel;
+      try {
+        await onModelBeforeCreateFrom.publish({
+          input: data,
+          model,
+          original
+        });
+        const createdModel = await storageOperations.models.create({
+          model
+        });
+        loaders.listModels.clearAll();
+        await updateManager(context, model);
+        await onModelAfterCreateFrom.publish({
+          input: data,
+          original,
+          model: createdModel
+        });
+        return createdModel;
+      } catch (ex) {
+        await onModelCreateFromError.publish({
+          input: data,
+          original,
+          model,
+          error: ex
+        });
+        throw ex;
+      }
     },
-    async updateModel(modelId, inputData) {
+    async updateModel(modelId, input) {
       await checkModelPermissions("w");
 
       // Get a model record; this will also perform ownership validation.
       const original = await getModel(modelId);
-      const updatedData = new _models.UpdateContentModelModel().populate(inputData);
-      await updatedData.validate();
-      const input = await updatedData.toJSON({
-        onlyDirty: true
-      });
-      if (Object.keys(input).length === 0) {
+      const result = await (0, _validation.createModelUpdateValidation)().safeParseAsync(input);
+      if (!result.success) {
+        throw (0, _utils.createZodError)(result.error);
+      }
+      const data = result.data;
+      if (Object.keys(data).length === 0) {
         /**
          * We need to return the original if nothing is to be updated.
          */
@@ -439,65 +455,83 @@ const createModelsCrud = params => {
         id: original.group.id,
         name: original.group.name
       };
-      if (input.group) {
+      if (data.group) {
         context.security.disableAuthorization();
-        const groupData = await context.cms.getGroup(input.group);
+        const groupData = await context.cms.getGroup(data.group);
         context.security.enableAuthorization();
         if (!groupData) {
-          throw new _handlerGraphql.NotFoundError(`There is no group "${input.group}".`);
+          throw new _handlerGraphql.NotFoundError(`There is no group "${data.group}".`);
         }
         group = {
           id: groupData.id,
           name: groupData.name
         };
       }
-      const fields = await (0, _createFieldModels.createFieldModels)(inputData.fields);
-      const model = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), input), {}, {
+      const model = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), data), {}, {
         group,
+        description: data.description || original.description,
         tenant: original.tenant || getTenant().id,
         locale: original.locale || getLocale().code,
         webinyVersion: context.WEBINY_VERSION,
-        fields,
         savedOn: new Date().toISOString()
       });
-      await onModelBeforeUpdate.publish({
-        input,
-        original,
-        model
-      });
-      const resultModel = await storageOperations.models.update({
-        model
-      });
-      await updateManager(context, resultModel);
-      await onModelAfterUpdate.publish({
-        input,
-        original,
-        model: resultModel
-      });
-      return resultModel;
+      model.tags = ensureTypeTag(model);
+      try {
+        await onModelBeforeUpdate.publish({
+          input: data,
+          original,
+          model
+        });
+        const resultModel = await storageOperations.models.update({
+          model
+        });
+        await updateManager(context, resultModel);
+        await onModelAfterUpdate.publish({
+          input: data,
+          original,
+          model: resultModel
+        });
+        return resultModel;
+      } catch (ex) {
+        await onModelUpdateError.publish({
+          input: data,
+          model,
+          original,
+          error: ex
+        });
+        throw ex;
+      }
     },
     async deleteModel(modelId) {
       await checkModelPermissions("d");
       const model = await getModel(modelId);
-      await onModelBeforeDelete.publish({
-        model
-      });
       try {
-        await storageOperations.models.delete({
+        await onModelBeforeDelete.publish({
           model
         });
+        try {
+          await storageOperations.models.delete({
+            model
+          });
+        } catch (ex) {
+          throw new _error.default(ex.message || "Could not delete the content model", ex.code || "CONTENT_MODEL_DELETE_ERROR", {
+            error: ex,
+            modelId: model.modelId
+          });
+        }
+        await onModelAfterDelete.publish({
+          model
+        });
+        managers.delete(model.modelId);
       } catch (ex) {
-        throw new _error.default(ex.message || "Could not delete the content model", ex.code || "CONTENT_MODEL_DELETE_ERROR", {
-          error: ex,
-          modelId: model.modelId
+        await onModelDeleteError.publish({
+          model,
+          error: ex
         });
+        throw ex;
       }
-      await onModelAfterDelete.publish({
-        model
-      });
-      managers.delete(model.modelId);
     },
-    async initializeModel(modelId) {
+    async initializeModel(modelId, data) {
       /**
        * We require that users have write permissions to initialize models.
        * Maybe introduce another permission for it?
@@ -505,7 +539,8 @@ const createModelsCrud = params => {
       await checkModelPermissions("w");
       const model = await getModel(modelId);
       await onModelInitialize.publish({
-        model
+        model,
+        data
       });
       return true;
     },