@webiny/api-headless-cms 5.20.0-beta.0 → 5.21.0-beta.0

package/content/plugins/crud/contentModel.crud.js

@@ -23,8 +23,6 @@ var _createFieldModels = require("./contentModel/createFieldModels");
 
 var _validateLayout = require("./contentModel/validateLayout");
 
-var _apiSecurity = require("@webiny/api-security");
-
 var _error = _interopRequireDefault(require("@webiny/error"));
 
 var _CmsModelPlugin = require("../CmsModelPlugin");
@@ -148,7 +146,7 @@ const createModelsCrud = params => {
     return databaseModels.concat(pluginsModels);
   };
 
-  const listOperations = async () => {
+  const listModels = async () => {
     const permission = await checkModelPermissions("r");
     const models = await modelsList();
     return utils.filterAsync(models, async model => {
@@ -160,7 +158,7 @@ const createModelsCrud = params => {
     });
   };
 
-  const get = async modelId => {
+  const getModel = async modelId => {
     const permission = await checkModelPermissions("r");
     const model = await modelsGet(modelId);
     utils.checkOwnership(context, permission, model);
@@ -168,7 +166,9 @@ const createModelsCrud = params => {
     return model;
   };
 
-  const getManager = async modelId => {
+  const getModelManager = async target => {
+    const modelId = typeof target === "string" ? target : target.modelId;
+
     if (managers.has(modelId)) {
       return managers.get(modelId);
     }
@@ -183,72 +183,57 @@ const createModelsCrud = params => {
     return await updateManager(context, model);
   };
 
-  const onBeforeCreate = (0, _pubsub.createTopic)();
-  const onAfterCreate = (0, _pubsub.createTopic)();
-  const onBeforeCreateFrom = (0, _pubsub.createTopic)();
-  const onAfterCreateFrom = (0, _pubsub.createTopic)();
-  const onBeforeUpdate = (0, _pubsub.createTopic)();
-  const onAfterUpdate = (0, _pubsub.createTopic)();
-  const onBeforeDelete = (0, _pubsub.createTopic)();
-  const onAfterDelete = (0, _pubsub.createTopic)();
+  const onBeforeModelCreate = (0, _pubsub.createTopic)();
+  const onAfterModelCreate = (0, _pubsub.createTopic)();
+  const onBeforeModelCreateFrom = (0, _pubsub.createTopic)();
+  const onAfterModelCreateFrom = (0, _pubsub.createTopic)();
+  const onBeforeModelUpdate = (0, _pubsub.createTopic)();
+  const onAfterModelUpdate = (0, _pubsub.createTopic)();
+  const onBeforeModelDelete = (0, _pubsub.createTopic)();
+  const onAfterModelDelete = (0, _pubsub.createTopic)();
   /**
    * We need to assign some default behaviors.
    */
 
   (0, _beforeCreate.assignBeforeModelCreate)({
-    onBeforeCreate,
-    onBeforeCreateFrom,
+    onBeforeModelCreate,
+    onBeforeModelCreateFrom,
     plugins: context.plugins,
     storageOperations
   });
   (0, _afterCreate.assignAfterModelCreate)({
     context,
-    onAfterCreate
+    onAfterModelCreate
   });
   (0, _beforeUpdate.assignBeforeModelUpdate)({
-    onBeforeUpdate,
+    onBeforeModelUpdate,
     plugins: context.plugins,
     storageOperations
   });
   (0, _afterUpdate.assignAfterModelUpdate)({
     context,
-    onAfterUpdate
+    onAfterModelUpdate
   });
   (0, _beforeDelete.assignBeforeModelDelete)({
-    onBeforeDelete,
+    onBeforeModelDelete,
     plugins: context.plugins,
     storageOperations
   });
   (0, _afterDelete.assignAfterModelDelete)({
     context,
-    onAfterDelete
+    onAfterModelDelete
   });
   return {
-    onBeforeModelCreate: onBeforeCreate,
-    onAfterModelCreate: onAfterCreate,
-    onBeforeModelCreateFrom: onBeforeCreateFrom,
-    onAfterModelCreateFrom: onAfterCreateFrom,
-    onBeforeModelUpdate: onBeforeUpdate,
-    onAfterModelUpdate: onAfterUpdate,
-    onBeforeModelDelete: onBeforeDelete,
-    onAfterModelDelete: onAfterDelete,
-    silentAuthModel: () => {
-      return {
-        list: async () => {
-          try {
-            return await listOperations();
-          } catch (ex) {
-            if (ex instanceof _apiSecurity.NotAuthorizedError) {
-              return [];
-            }
-
-            throw ex;
-          }
-        }
-      };
-    },
-    getModel: get,
-    listModels: listOperations,
+    onBeforeModelCreate,
+    onAfterModelCreate,
+    onBeforeModelCreateFrom,
+    onAfterModelCreateFrom,
+    onBeforeModelUpdate,
+    onAfterModelUpdate,
+    onBeforeModelDelete,
+    onAfterModelDelete,
+    getModel,
+    listModels,
 
     async createModel(inputData) {
       await checkModelPermissions("w");
@@ -264,8 +249,10 @@ const createModelsCrud = params => {
       }
 
       const identity = getIdentity();
-
-      const model = _objectSpread(_objectSpread({}, input), {}, {
+      const model = {
+        name: input.name,
+        description: input.description,
+        modelId: input.modelId,
         titleFieldId: "id",
         locale: getLocale().code,
         tenant: getTenant().id,
@@ -284,11 +271,10 @@ const createModelsCrud = params => {
         lockedFields: [],
         layout: [],
         webinyVersion: context.WEBINY_VERSION
-      });
-
-      await onBeforeCreate.publish({
-        model,
-        input
+      };
+      await onBeforeModelCreate.publish({
+        input,
+        model
       });
       const createdModel = await storageOperations.models.create({
         input,
@@ -296,7 +282,7 @@ const createModelsCrud = params => {
       });
       loaders.listModels.clearAll();
       await updateManager(context, model);
-      await onAfterCreate.publish({
+      await onAfterModelCreate.publish({
         input,
         model: createdModel
       });
@@ -319,7 +305,7 @@ const createModelsCrud = params => {
         webinyVersion: context.WEBINY_VERSION
       });
 
-      await onBeforeUpdate.publish({
+      await onBeforeModelUpdate.publish({
         input: {},
         original,
         model
@@ -331,7 +317,7 @@ const createModelsCrud = params => {
       });
       await updateManager(context, resultModel);
       loaders.listModels.clearAll();
-      await onAfterUpdate.publish({
+      await onAfterModelUpdate.publish({
         input: {},
         original,
         model: resultModel
@@ -345,18 +331,31 @@ const createModelsCrud = params => {
        * Get a model record; this will also perform ownership validation.
        */
 
-      const original = await get(modelId);
-      const createdData = new _models.CreateContentModelModel().populate({
+      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
+        group: data.group,
+        locale: data.locale
       });
       await createdData.validate();
       const input = await createdData.toJSON();
-      context.security.disableAuthorization();
-      const group = await context.cms.getGroup(input.group);
-      context.security.enableAuthorization();
+      const locale = await context.i18n.getLocale(input.locale || original.locale);
+
+      if (!locale) {
+        throw new _handlerGraphql.NotFoundError(`There is no locale "${input.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,
+        tenant: original.tenant,
+        locale: locale.code
+      });
 
       if (!group) {
         throw new _handlerGraphql.NotFoundError(`There is no group "${input.group}".`);
@@ -365,6 +364,7 @@ const createModelsCrud = params => {
       const identity = getIdentity();
 
       const model = _objectSpread(_objectSpread({}, original), {}, {
+        locale: locale.code,
         group: {
           id: group.id,
           name: group.name
@@ -383,10 +383,10 @@ const createModelsCrud = params => {
         webinyVersion: context.WEBINY_VERSION
       });
 
-      await onBeforeCreateFrom.publish({
+      await onBeforeModelCreateFrom.publish({
+        input,
         model,
-        original,
-        input
+        original
       });
       const createdModel = await storageOperations.models.create({
         input,
@@ -394,7 +394,7 @@ const createModelsCrud = params => {
       });
       loaders.listModels.clearAll();
       await updateManager(context, model);
-      await onAfterCreateFrom.publish({
+      await onAfterModelCreateFrom.publish({
         input,
         original,
         model: createdModel
@@ -405,7 +405,7 @@ const createModelsCrud = params => {
     async updateModel(modelId, inputData) {
       await checkModelPermissions("w"); // Get a model record; this will also perform ownership validation.
 
-      const original = await get(modelId);
+      const original = await getModel(modelId);
       const updatedData = new _models.UpdateContentModelModel().populate(inputData);
       await updatedData.validate();
       const input = await updatedData.toJSON({
@@ -416,25 +416,30 @@ const createModelsCrud = params => {
         return {};
       }
 
+      let group = {
+        id: original.group.id,
+        name: original.group.name
+      };
+
       if (input.group) {
         context.security.disableAuthorization();
-        const group = await context.cms.getGroup(input.group);
+        const groupData = await context.cms.getGroup(input.group);
         context.security.enableAuthorization();
 
-        if (!group) {
+        if (!groupData) {
           throw new _handlerGraphql.NotFoundError(`There is no group "${input.group}".`);
         }
 
-        input.group = {
-          id: group.id,
-          name: group.name
+        group = {
+          id: groupData.id,
+          name: groupData.name
         };
       }
 
       const modelFields = await (0, _createFieldModels.createFieldModels)(original, inputData);
-      (0, _validateLayout.validateLayout)(input, modelFields);
 
       const model = _objectSpread(_objectSpread(_objectSpread({}, original), input), {}, {
+        group,
         tenant: original.tenant || getTenant().id,
         locale: original.locale || getLocale().code,
         webinyVersion: context.WEBINY_VERSION,
@@ -442,7 +447,8 @@ const createModelsCrud = params => {
         savedOn: new Date().toISOString()
       });
 
-      await onBeforeUpdate.publish({
+      (0, _validateLayout.validateLayout)(model, modelFields);
+      await onBeforeModelUpdate.publish({
         input,
         original,
         model
@@ -453,18 +459,18 @@ const createModelsCrud = params => {
         input
       });
       await updateManager(context, resultModel);
-      await onAfterUpdate.publish({
+      await onAfterModelUpdate.publish({
+        input,
         original,
-        model: resultModel,
-        input
+        model: resultModel
       });
       return resultModel;
     },
 
     async deleteModel(modelId) {
       await checkModelPermissions("d");
-      const model = await get(modelId);
-      await onBeforeDelete.publish({
+      const model = await getModel(modelId);
+      await onBeforeModelDelete.publish({
         model
       });
 
@@ -479,13 +485,13 @@ const createModelsCrud = params => {
         });
       }
 
-      await onAfterDelete.publish({
+      await onAfterModelDelete.publish({
         model
       });
       managers.delete(model.modelId);
     },
 
-    getModelManager: getManager,
+    getModelManager,
     getManagers: () => managers
   };
 };

package/content/plugins/graphqlFields/boolean.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _requiredField = require("./requiredField");
+
 const createListFilters = ({
   field
 }) => {
@@ -57,10 +59,10 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [Boolean]";
+        return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": [Boolean]", field);
       }
 
-      return field.fieldId + ": Boolean";
+      return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": Boolean", field);
     }
 
   }

package/content/plugins/graphqlFields/datetime.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
+var _requiredField = require("./requiredField");
+
 const fieldGraphQLTypes = {
   time: "Time",
   dateTimeWithoutTimezone: "DateTime",
@@ -74,7 +77,7 @@ const plugin = {
     createInputField({
       field
     }) {
-      return `${field.fieldId}: ${getFieldGraphQLType(field)}`;
+      return (0, _requiredField.attachRequiredFieldValue)(`${field.fieldId}: ${getFieldGraphQLType(field)}`, field);
     }
 
   }

package/content/plugins/graphqlFields/file.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
+var _requiredField = require("./requiredField");
+
 const plugin = {
   name: "cms-model-field-to-graphql-file",
   type: "cms-model-field-to-graphql",
@@ -37,10 +40,10 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [String]";
+        return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": [String]", field);
       }
 
-      return field.fieldId + ": String";
+      return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": String", field);
     }
 
   }

package/content/plugins/graphqlFields/longText.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _requiredField = require("./requiredField");
+
 const createListFilters = ({
   field
 }) => {
@@ -50,10 +52,10 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [String]";
+        return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": [String]", field);
       }
 
-      return field.fieldId + ": String";
+      return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": String", field);
     }
 
   }

package/content/plugins/graphqlFields/number.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _requiredField = require("./requiredField");
+
 const createListFilters = ({
   field
 }) => {
@@ -63,10 +65,10 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [Number]";
+        return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": [Number]", field);
       }
 
-      return field.fieldId + ": Number";
+      return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": Number", field);
     }
 
   }

package/content/plugins/graphqlFields/object.js

@@ -15,6 +15,8 @@ var _renderInputFields = require("../utils/renderInputFields");
 
 var _createTypeName = require("../utils/createTypeName");
 
+var _requiredField = require("./requiredField");
+
 const typeFromField = ({
   typeOfType,
   model,
@@ -182,7 +184,7 @@ const plugin = {
         typeDefs
       } = result;
       return {
-        fields: `${field.fieldId}: ${field.multipleValues ? `[${fieldType}!]` : fieldType}`,
+        fields: (0, _requiredField.attachRequiredFieldValue)(`${field.fieldId}: ${field.multipleValues ? `[${fieldType}!]` : fieldType}`, field),
         typeDefs
       };
     },

package/content/plugins/graphqlFields/ref.js

@@ -13,6 +13,8 @@ var _createTypeName = require("../utils/createTypeName");
 
 var _utils = require("@webiny/utils");
 
+var _requiredField = require("./requiredField");
+
 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; }
@@ -228,10 +230,10 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [RefFieldInput!]";
+        return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": [RefFieldInput!]", field);
       }
 
-      return field.fieldId + ": RefFieldInput";
+      return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": RefFieldInput", field);
     },
 
     createListFilters

package/content/plugins/graphqlFields/requiredField.d.ts

@@ -0,0 +1,2 @@
+import { CmsModelField } from "../../../types";
+export declare const attachRequiredFieldValue: (def: string, field: CmsModelField) => string;

package/content/plugins/graphqlFields/requiredField.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.attachRequiredFieldValue = void 0;
+
+const attachRequiredFieldValue = (def, field) => {
+  if (!field.validation || field.validation.length === 0) {
+    return def;
+  }
+
+  const isRequired = field.validation.some(validation => {
+    return validation.name === "required";
+  });
+
+  if (!isRequired) {
+    return def;
+  }
+
+  return `${def}!`;
+};
+
+exports.attachRequiredFieldValue = attachRequiredFieldValue;

package/content/plugins/graphqlFields/richText.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
+var _requiredField = require("./requiredField");
+
 const plugin = {
   name: "cms-model-field-to-graphql-rich-text",
   type: "cms-model-field-to-graphql",
@@ -43,10 +46,10 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [JSON]";
+        return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": [JSON]", field);
       }
 
-      return field.fieldId + ": JSON";
+      return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": JSON", field);
     }
 
   }

package/content/plugins/graphqlFields/text.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _requiredField = require("./requiredField");
+
 const createListFilters = ({
   field
 }) => {
@@ -60,10 +62,10 @@ const plugin = {
       field
     }) {
       if (field.multipleValues) {
-        return field.fieldId + ": [String]";
+        return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": [String]", field);
       }
 
-      return field.fieldId + ": String";
+      return (0, _requiredField.attachRequiredFieldValue)(field.fieldId + ": String", field);
     }
 
   }

package/content/plugins/schema/contentModelGroups.js

@@ -62,11 +62,15 @@ const plugin = context => {
     resolvers = {
       CmsContentModelGroup: {
         contentModels: async (group, _, context) => {
-          const models = await context.cms.silentAuthModel().list();
+          context.security.disableAuthorization();
+          const models = await context.cms.listModels();
+          context.security.enableAuthorization();
           return models.filter(m => m.group.id === group.id);
         },
         totalContentModels: async (group, _, context) => {
-          const models = await context.cms.silentAuthModel().list();
+          context.security.disableAuthorization();
+          const models = await context.cms.listModels();
+          context.security.enableAuthorization();
           return models.filter(m => m.group === group.id).length;
         },
         plugin: async (group, _, context) => {

package/content/plugins/schema/contentModels.js

@@ -133,6 +133,7 @@ const plugin = context => {
                 modelId: String
                 group: RefInput!
                 description: String
+                locale: String
             }
 
             input CmsContentModelUpdateInput {

package/content/plugins/storage/object.js

@@ -29,6 +29,11 @@ const processValue = async ({
 }) => {
   return await (0, _pReduce.default)(fields, async (values, field) => {
     const plugin = getStoragePlugin(field.type);
+
+    if (!plugin) {
+      throw new Error(`Missing storage plugin for field type "${field.type}".`);
+    }
+
     const value = await plugin[operation]({
       plugins,
       model,