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

package/content/plugins/crud/contentModel/models.d.ts

@@ -1,3 +1,4 @@
 export declare const CreateContentModelModel: any;
+export declare const CreateContentModelModelFrom: any;
 export declare const ContentModelFieldModel: any;
 export declare const UpdateContentModelModel: any;

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UpdateContentModelModel = exports.CreateContentModelModel = exports.ContentModelFieldModel = void 0;
+exports.UpdateContentModelModel = exports.CreateContentModelModelFrom = exports.CreateContentModelModel = exports.ContentModelFieldModel = void 0;
 
 var _validation = require("@webiny/validation");
 
@@ -36,6 +36,24 @@ const CreateContentModelModel = (0, _fields.withFields)({
   })
 })();
 exports.CreateContentModelModel = CreateContentModelModel;
+const CreateContentModelModelFrom = (0, _fields.withFields)({
+  name: (0, _fields.string)({
+    validation: requiredShortString
+  }),
+  modelId: (0, _fields.string)({
+    validation: shortString
+  }),
+  description: (0, _fields.string)({
+    validation: shortString
+  }),
+  group: (0, _fields.string)({
+    validation: requiredShortString
+  }),
+  locale: (0, _fields.string)({
+    validation: shortString
+  })
+})();
+exports.CreateContentModelModelFrom = CreateContentModelModelFrom;
 const RendererModel = (0, _fields.withFields)({
   name: (0, _fields.string)({
     validation: requiredShortString

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

@@ -264,8 +264,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,8 +286,7 @@ const createModelsCrud = params => {
         lockedFields: [],
         layout: [],
         webinyVersion: context.WEBINY_VERSION
-      });
-
+      };
       await onBeforeCreate.publish({
         model,
         input
@@ -346,17 +347,30 @@ const createModelsCrud = params => {
        */
 
       const original = await get(modelId);
-      const createdData = new _models.CreateContentModelModel().populate({
+      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 +379,7 @@ const createModelsCrud = params => {
       const identity = getIdentity();
 
       const model = _objectSpread(_objectSpread({}, original), {}, {
+        locale: locale.code,
         group: {
           id: group.id,
           name: group.name
@@ -416,25 +431,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,6 +462,7 @@ const createModelsCrud = params => {
         savedOn: new Date().toISOString()
       });
 
+      (0, _validateLayout.validateLayout)(model, modelFields);
       await onBeforeUpdate.publish({
         input,
         original,

package/content/plugins/schema/contentModels.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "5.20.0-beta.0",
+	"version": "5.20.0-beta.1",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -21,23 +21,23 @@
 		"@babel/runtime": "7.16.3",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api-file-manager": "5.20.0-beta.0",
-		"@webiny/api-i18n": "5.20.0-beta.0",
-		"@webiny/api-i18n-content": "5.20.0-beta.0",
-		"@webiny/api-i18n-ddb": "5.20.0-beta.0",
-		"@webiny/api-security": "5.20.0-beta.0",
-		"@webiny/api-tenancy": "5.20.0-beta.0",
-		"@webiny/api-upgrade": "5.20.0-beta.0",
-		"@webiny/error": "5.20.0-beta.0",
-		"@webiny/handler": "5.20.0-beta.0",
-		"@webiny/handler-aws": "5.20.0-beta.0",
-		"@webiny/handler-db": "5.20.0-beta.0",
-		"@webiny/handler-graphql": "5.20.0-beta.0",
-		"@webiny/handler-http": "5.20.0-beta.0",
-		"@webiny/plugins": "5.20.0-beta.0",
-		"@webiny/pubsub": "5.20.0-beta.0",
-		"@webiny/utils": "5.20.0-beta.0",
-		"@webiny/validation": "5.20.0-beta.0",
+		"@webiny/api-file-manager": "5.20.0-beta.1",
+		"@webiny/api-i18n": "5.20.0-beta.1",
+		"@webiny/api-i18n-content": "5.20.0-beta.1",
+		"@webiny/api-i18n-ddb": "5.20.0-beta.1",
+		"@webiny/api-security": "5.20.0-beta.1",
+		"@webiny/api-tenancy": "5.20.0-beta.1",
+		"@webiny/api-upgrade": "5.20.0-beta.1",
+		"@webiny/error": "5.20.0-beta.1",
+		"@webiny/handler": "5.20.0-beta.1",
+		"@webiny/handler-aws": "5.20.0-beta.1",
+		"@webiny/handler-db": "5.20.0-beta.1",
+		"@webiny/handler-graphql": "5.20.0-beta.1",
+		"@webiny/handler-http": "5.20.0-beta.1",
+		"@webiny/plugins": "5.20.0-beta.1",
+		"@webiny/pubsub": "5.20.0-beta.1",
+		"@webiny/utils": "5.20.0-beta.1",
+		"@webiny/validation": "5.20.0-beta.1",
 		"boolean": "3.1.4",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.0.0",
@@ -54,10 +54,10 @@
 		"@babel/core": "^7.5.5",
 		"@babel/preset-env": "^7.5.5",
 		"@babel/preset-flow": "^7.0.0",
-		"@webiny/api-security-so-ddb": "^5.20.0-beta.0",
-		"@webiny/api-tenancy-so-ddb": "^5.20.0-beta.0",
-		"@webiny/cli": "^5.20.0-beta.0",
-		"@webiny/project-utils": "^5.20.0-beta.0",
+		"@webiny/api-security-so-ddb": "^5.20.0-beta.1",
+		"@webiny/api-tenancy-so-ddb": "^5.20.0-beta.1",
+		"@webiny/cli": "^5.20.0-beta.1",
+		"@webiny/project-utils": "^5.20.0-beta.1",
 		"apollo-graphql": "^0.4.1",
 		"get-yarn-workspaces": "^1.0.2",
 		"graphql": "^14.6.0",
@@ -77,5 +77,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "2de02bc113e15e3ffa8e1d82deb9d27417787188"
+	"gitHead": "40e30fb4c778d0bcc773b3b8231ce8e0861b6d52"
 }

package/types.d.ts

@@ -910,6 +910,18 @@ export interface CmsModelCreateInput {
      */
     group: string;
 }
+/**
+ * A GraphQL params.data parameter received when creating content model from existing model.
+ *
+ * @category GraphQL params
+ * @category CmsModel
+ */
+export interface CmsModelCreateFromInput extends CmsModelCreateInput {
+    /**
+     * Locale into which we want to clone the model into.
+     */
+    locale?: string;
+}
 /**
  * A definition for content model field received from the user.
  *
@@ -981,6 +993,10 @@ export interface CmsModelUpdateInput {
      * A new content model name.
      */
     name?: string;
+    /**
+     * A group we want to move the model to.
+     */
+    group?: string;
     /**
      * A new description of the content model.
      */
@@ -1156,30 +1172,30 @@ export interface CmsModelManager {
     delete: (id: string) => Promise<void>;
 }
 export interface BeforeModelCreateTopicParams {
-    input: Partial<CmsModel>;
+    input: CmsModelCreateInput;
     model: CmsModel;
 }
 export interface AfterModelCreateTopicParams {
-    input: Partial<CmsModel>;
+    input: CmsModelCreateInput;
     model: CmsModel;
 }
 export interface BeforeModelCreateFromTopicParams {
-    input: Partial<CmsModel>;
+    input: CmsModelCreateFromInput;
     original: CmsModel;
     model: CmsModel;
 }
 export interface AfterModelCreateFromTopicParams {
-    input: Partial<CmsModel>;
+    input: CmsModelCreateFromInput;
     original: CmsModel;
     model: CmsModel;
 }
 export interface BeforeModelUpdateTopicParams {
-    input: Partial<CmsModel>;
+    input: CmsModelUpdateInput;
     original: CmsModel;
     model: CmsModel;
 }
 export interface AfterModelUpdateTopicParams {
-    input: Partial<CmsModel>;
+    input: CmsModelUpdateInput;
     original: CmsModel;
     model: CmsModel;
 }
@@ -1224,7 +1240,7 @@ export interface CmsModelContext {
     /**
      * Create a content model from the given model - clone.
      */
-    createModelFrom: (modelId: string, data: CmsModelCreateInput) => Promise<CmsModel>;
+    createModelFrom: (modelId: string, data: CmsModelCreateFromInput) => Promise<CmsModel>;
     /**
      * Update content model without data validation. Used internally.
      * @hidden

package/types.js

@@ -191,6 +191,13 @@ exports.CONTENT_ENTRY_STATUS = void 0;
  * @category CmsModel
  */
 
+/**
+ * A GraphQL params.data parameter received when creating content model from existing model.
+ *
+ * @category GraphQL params
+ * @category CmsModel
+ */
+
 /**
  * A definition for content model field received from the user.
  *