@webiny/api-headless-cms 0.0.0-unstable.d16f688daf → 0.0.0-unstable.d65ec29d44

package/crud/contentModel.crud.js

@@ -1,54 +1,30 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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");
-
 var _beforeDelete = require("./contentModel/beforeDelete");
-
 var _afterCreate = require("./contentModel/afterCreate");
-
 var _afterUpdate = require("./contentModel/afterUpdate");
-
 var _afterDelete = require("./contentModel/afterDelete");
-
 var _afterCreateFrom = require("./contentModel/afterCreateFrom");
-
 var _CmsModelPlugin = require("../plugins/CmsModelPlugin");
-
 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 _validation = require("./contentModel/validation");
+var _utils = require("@webiny/utils");
 /**
  * Given a model, return an array of tags ensuring the `type` tag is set.
  */
@@ -56,14 +32,11 @@ 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");
   }
-
   return tags;
 };
-
 const createModelsCrud = params => {
   const {
     getTenant,
@@ -89,47 +62,39 @@ const createModelsCrud = params => {
       })];
     })
   };
-
   const clearModelsCache = () => {
     for (const loader of Object.values(loaders)) {
       loader.clearAll();
     }
   };
-
   const managers = new Map();
-
   const updateManager = async (context, model) => {
     const manager = await (0, _contentModelManagerFactory.contentModelManagerFactory)(context, model);
     managers.set(model.modelId, manager);
     return manager;
   };
-
   const checkModelPermissions = check => {
     return (0, _permissions.checkPermissions)(context, "cms.contentModel", {
       rwd: check
     });
   };
-
   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 => {
+     */.filter(plugin => {
       const {
         tenant: modelTenant,
         locale: modelLocale
       } = plugin.contentModel;
-
       if (modelTenant && modelTenant !== tenant) {
         return false;
       } else if (modelLocale && modelLocale !== locale) {
         return false;
       }
-
       return true;
     }).map(plugin => {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, plugin.contentModel), {}, {
@@ -139,50 +104,31 @@ const createModelsCrud = params => {
         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);
-
     if (pluginModel) {
       return pluginModel;
     }
-
     const model = await storageOperations.models.get({
       tenant: getTenant().id,
       locale: getLocale().code,
       modelId
     });
-
     if (!model) {
       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
     });
   };
-
   const modelsList = async () => {
     const databaseModels = await loaders.listModels.load("listModels");
     const pluginsModels = getModelsAsPlugins();
     return databaseModels.concat(pluginsModels);
   };
-
   const listModels = async () => {
     const permission = await checkModelPermissions("r");
     const models = await modelsList();
@@ -190,11 +136,9 @@ const createModelsCrud = params => {
       if (!(0, _ownership.validateOwnership)(context, permission, model)) {
         return false;
       }
-
       return (0, _access.validateModelAccess)(context, model);
     });
   };
-
   const getModel = async modelId => {
     const permission = await checkModelPermissions("r");
     const model = await modelsGet(modelId);
@@ -202,65 +146,54 @@ const createModelsCrud = params => {
     await (0, _access.checkModelAccess)(context, model);
     return model;
   };
-
   const getModelManager = async target => {
     const modelId = typeof target === "string" ? target : target.modelId;
-
     if (managers.has(modelId)) {
       return managers.get(modelId);
     }
-
     const models = await modelsList();
     const model = models.find(m => m.modelId === modelId);
-
     if (!model) {
       throw new _handlerGraphql.NotFoundError(`There is no content model "${modelId}".`);
     }
-
     return await updateManager(context, model);
   };
+
   /**
    * Create
    */
-
-
   const onModelBeforeCreate = (0, _pubsub.createTopic)("cms.onModelBeforeCreate");
   const onModelAfterCreate = (0, _pubsub.createTopic)("cms.onModelAfterCreate");
   const onModelCreateError = (0, _pubsub.createTopic)("cms.onModelCreateError");
   /**
    * Create from / clone
    */
-
   const onModelBeforeCreateFrom = (0, _pubsub.createTopic)("cms.onModelBeforeCreateFrom");
   const onModelAfterCreateFrom = (0, _pubsub.createTopic)("cms.onModelAfterCreateFrom");
   const onModelCreateFromError = (0, _pubsub.createTopic)("cms.onModelCreateFromError");
   /**
    * Update
    */
-
   const onModelBeforeUpdate = (0, _pubsub.createTopic)("cms.onModelBeforeUpdate");
   const onModelAfterUpdate = (0, _pubsub.createTopic)("cms.onModelAfterUpdate");
   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.
    */
-
   (0, _beforeCreate.assignModelBeforeCreate)({
     onModelBeforeCreate,
     onModelBeforeCreateFrom,
-    plugins: context.plugins,
+    context,
     storageOperations
   });
   (0, _afterCreate.assignModelAfterCreate)({
@@ -269,8 +202,7 @@ const createModelsCrud = params => {
   });
   (0, _beforeUpdate.assignModelBeforeUpdate)({
     onModelBeforeUpdate,
-    plugins: context.plugins,
-    storageOperations
+    context
   });
   (0, _afterUpdate.assignModelAfterUpdate)({
     context,
@@ -301,7 +233,6 @@ const createModelsCrud = params => {
     onAfterModelUpdate: onModelAfterUpdate,
     onBeforeModelDelete: onModelBeforeDelete,
     onAfterModelDelete: onModelAfterDelete,
-
     /**
      * Released in 5.34.0
      */
@@ -321,26 +252,24 @@ const createModelsCrud = params => {
     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,
@@ -355,17 +284,16 @@ const createModelsCrud = params => {
         },
         createdOn: new Date().toISOString(),
         savedOn: new Date().toISOString(),
-        fields,
+        fields: data.fields,
         lockedFields: [],
-        layout: input.layout || [],
-        tags: [...(input.tags || [])],
+        layout: data.layout || [],
+        tags: [...(data.tags || [])],
         webinyVersion: context.WEBINY_VERSION
       };
       model.tags = ensureTypeTag(model);
-
       try {
         await onModelBeforeCreate.publish({
-          input,
+          input: data,
           model
         });
         const createdModel = await storageOperations.models.create({
@@ -374,20 +302,19 @@ const createModelsCrud = params => {
         loaders.listModels.clearAll();
         await updateManager(context, model);
         await onModelAfterCreate.publish({
-          input,
+          input: data,
           model: createdModel
         });
         return createdModel;
       } catch (ex) {
         await onModelCreateError.publish({
-          input,
+          input: data,
           model,
           error: ex
         });
         throw ex;
       }
     },
-
     /**
      * Method does not check for permissions or ownership.
      * @internal
@@ -402,7 +329,6 @@ const createModelsCrud = params => {
         locale: initialModel.locale || getLocale().code,
         webinyVersion: context.WEBINY_VERSION
       });
-
       try {
         await onModelBeforeUpdate.publish({
           input: {},
@@ -430,43 +356,38 @@ const createModelsCrud = params => {
         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), {}, {
         locale: locale.code,
@@ -474,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,
@@ -487,10 +408,9 @@ const createModelsCrud = params => {
         lockedFields: [],
         webinyVersion: context.WEBINY_VERSION
       });
-
       try {
         await onModelBeforeCreateFrom.publish({
-          input,
+          input: data,
           model,
           original
         });
@@ -500,14 +420,14 @@ const createModelsCrud = params => {
         loaders.listModels.clearAll();
         await updateManager(context, model);
         await onModelAfterCreateFrom.publish({
-          input,
+          input: data,
           original,
           model: createdModel
         });
         return createdModel;
       } catch (ex) {
         await onModelCreateFromError.publish({
-          input,
+          input: data,
           original,
           model,
           error: ex
@@ -515,58 +435,50 @@ const createModelsCrud = params => {
         throw ex;
       }
     },
+    async updateModel(modelId, input) {
+      await checkModelPermissions("w");
 
-    async updateModel(modelId, inputData) {
-      await checkModelPermissions("w"); // Get a model record; this will also perform ownership validation.
-
+      // 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.
          */
         return original;
       }
-
       let group = {
         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()
       });
       model.tags = ensureTypeTag(model);
-
       try {
         await onModelBeforeUpdate.publish({
-          input,
+          input: data,
           original,
           model
         });
@@ -575,14 +487,14 @@ const createModelsCrud = params => {
         });
         await updateManager(context, resultModel);
         await onModelAfterUpdate.publish({
-          input,
+          input: data,
           original,
           model: resultModel
         });
         return resultModel;
       } catch (ex) {
         await onModelUpdateError.publish({
-          input,
+          input: data,
           model,
           original,
           error: ex
@@ -590,16 +502,13 @@ const createModelsCrud = params => {
         throw ex;
       }
     },
-
     async deleteModel(modelId) {
       await checkModelPermissions("d");
       const model = await getModel(modelId);
-
       try {
         await onModelBeforeDelete.publish({
           model
         });
-
         try {
           await storageOperations.models.delete({
             model
@@ -610,7 +519,6 @@ const createModelsCrud = params => {
             modelId: model.modelId
           });
         }
-
         await onModelAfterDelete.publish({
           model
         });
@@ -623,7 +531,6 @@ const createModelsCrud = params => {
         throw ex;
       }
     },
-
     async initializeModel(modelId, data) {
       /**
        * We require that users have write permissions to initialize models.
@@ -637,7 +544,6 @@ const createModelsCrud = params => {
       });
       return true;
     },
-
     getModelManager,
     getEntryManager: async model => {
       return getModelManager(model);
@@ -646,5 +552,4 @@ const createModelsCrud = params => {
     getEntryManagers: () => managers
   };
 };
-
 exports.createModelsCrud = createModelsCrud;