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

package/content/graphQLHandlerFactory.js

@@ -23,16 +23,19 @@ var _buildSchemaPlugins = _interopRequireDefault(require("./plugins/buildSchemaP
 
 var _plugins = require("@webiny/handler-graphql/plugins");
 
+var _utils = require("@webiny/utils");
+
 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; }
 
-const DEFAULT_HEADERS = {
+const DEFAULT_HEADERS = _objectSpread({
   "Access-Control-Allow-Origin": "*",
   "Access-Control-Allow-Headers": "*",
   "Access-Control-Allow-Methods": "OPTIONS,POST",
   "Content-Type": "application/json"
-};
+}, (0, _utils.getWebinyVersionHeaders)());
+
 const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
 
 const respond = (http, result) => {

package/content/plugins/crud/contentEntry/afterDelete.d.ts

@@ -2,6 +2,6 @@ import { Topic } from "@webiny/pubsub/types";
 import { AfterEntryDeleteTopicParams, CmsContext } from "../../../../types";
 export interface Params {
     context: CmsContext;
-    onAfterDelete: Topic<AfterEntryDeleteTopicParams>;
+    onAfterEntryDelete: Topic<AfterEntryDeleteTopicParams>;
 }
 export declare const assignAfterEntryDelete: (params: Params) => void;

package/content/plugins/crud/contentEntry/afterDelete.js

@@ -10,9 +10,9 @@ var _markLockedFields = require("./markLockedFields");
 const assignAfterEntryDelete = params => {
   const {
     context,
-    onAfterDelete
+    onAfterEntryDelete
   } = params;
-  onAfterDelete.subscribe(async params => {
+  onAfterEntryDelete.subscribe(async params => {
     const {
       entry,
       model

package/content/plugins/crud/contentEntry/beforeCreate.d.ts

@@ -2,6 +2,6 @@ import { Topic } from "@webiny/pubsub/types";
 import { BeforeEntryCreateTopicParams, CmsContext } from "../../../../types";
 export interface Params {
     context: CmsContext;
-    onBeforeCreate: Topic<BeforeEntryCreateTopicParams>;
+    onBeforeEntryCreate: Topic<BeforeEntryCreateTopicParams>;
 }
 export declare const assignBeforeEntryCreate: (params: Params) => void;

package/content/plugins/crud/contentEntry/beforeCreate.js

@@ -10,9 +10,9 @@ var _markLockedFields = require("./markLockedFields");
 const assignBeforeEntryCreate = params => {
   const {
     context,
-    onBeforeCreate
+    onBeforeEntryCreate
   } = params;
-  onBeforeCreate.subscribe(async params => {
+  onBeforeEntryCreate.subscribe(async params => {
     const {
       entry,
       model

package/content/plugins/crud/contentEntry/beforeUpdate.d.ts

@@ -2,6 +2,6 @@ import { Topic } from "@webiny/pubsub/types";
 import { BeforeEntryUpdateTopicParams, CmsContext } from "../../../../types";
 export interface Params {
     context: CmsContext;
-    onBeforeUpdate: Topic<BeforeEntryUpdateTopicParams>;
+    onBeforeEntryUpdate: Topic<BeforeEntryUpdateTopicParams>;
 }
 export declare const assignBeforeEntryUpdate: (params: Params) => void;

package/content/plugins/crud/contentEntry/beforeUpdate.js

@@ -10,9 +10,9 @@ var _markLockedFields = require("./markLockedFields");
 const assignBeforeEntryUpdate = params => {
   const {
     context,
-    onBeforeUpdate
+    onBeforeEntryUpdate
   } = params;
-  onBeforeUpdate.subscribe(async params => {
+  onBeforeEntryUpdate.subscribe(async params => {
     const {
       entry,
       model

package/content/plugins/crud/contentEntry.crud.js

@@ -52,9 +52,9 @@ exports.STATUS_CHANGES_REQUESTED = STATUS_CHANGES_REQUESTED;
 const STATUS_REVIEW_REQUESTED = "reviewRequested";
 exports.STATUS_REVIEW_REQUESTED = STATUS_REVIEW_REQUESTED;
 
-const cleanInputData = (model, inputData) => {
+const cleanInputData = (model, input) => {
   return model.fields.reduce((acc, field) => {
-    acc[field.fieldId] = inputData[field.fieldId];
+    acc[field.fieldId] = input[field.fieldId];
     return acc;
   }, {});
 };
@@ -110,41 +110,41 @@ const createContentEntryCrud = params => {
     context,
     getIdentity
   } = params;
-  const onBeforeCreate = (0, _pubsub.createTopic)();
-  const onAfterCreate = (0, _pubsub.createTopic)();
-  const onBeforeCreateRevision = (0, _pubsub.createTopic)();
-  const onAfterCreateRevision = (0, _pubsub.createTopic)();
-  const onBeforeUpdate = (0, _pubsub.createTopic)();
-  const onAfterUpdate = (0, _pubsub.createTopic)();
-  const onBeforePublish = (0, _pubsub.createTopic)();
-  const onAfterPublish = (0, _pubsub.createTopic)();
-  const onBeforeUnpublish = (0, _pubsub.createTopic)();
-  const onAfterUnpublish = (0, _pubsub.createTopic)();
-  const onBeforeRequestChanges = (0, _pubsub.createTopic)();
-  const onAfterRequestChanges = (0, _pubsub.createTopic)();
-  const onBeforeRequestReview = (0, _pubsub.createTopic)();
-  const onAfterRequestReview = (0, _pubsub.createTopic)();
-  const onBeforeDelete = (0, _pubsub.createTopic)();
-  const onAfterDelete = (0, _pubsub.createTopic)();
-  const onBeforeDeleteRevision = (0, _pubsub.createTopic)();
-  const onAfterDeleteRevision = (0, _pubsub.createTopic)();
-  const onBeforeGet = (0, _pubsub.createTopic)();
-  const onBeforeList = (0, _pubsub.createTopic)();
+  const onBeforeEntryCreate = (0, _pubsub.createTopic)();
+  const onAfterEntryCreate = (0, _pubsub.createTopic)();
+  const onBeforeEntryCreateRevision = (0, _pubsub.createTopic)();
+  const onAfterEntryCreateRevision = (0, _pubsub.createTopic)();
+  const onBeforeEntryUpdate = (0, _pubsub.createTopic)();
+  const onAfterEntryUpdate = (0, _pubsub.createTopic)();
+  const onBeforeEntryPublish = (0, _pubsub.createTopic)();
+  const onAfterEntryPublish = (0, _pubsub.createTopic)();
+  const onBeforeEntryUnpublish = (0, _pubsub.createTopic)();
+  const onAfterEntryUnpublish = (0, _pubsub.createTopic)();
+  const onBeforeEntryRequestChanges = (0, _pubsub.createTopic)();
+  const onAfterEntryRequestChanges = (0, _pubsub.createTopic)();
+  const onBeforeEntryRequestReview = (0, _pubsub.createTopic)();
+  const onAfterEntryRequestReview = (0, _pubsub.createTopic)();
+  const onBeforeEntryDelete = (0, _pubsub.createTopic)();
+  const onAfterEntryDelete = (0, _pubsub.createTopic)();
+  const onBeforeEntryDeleteRevision = (0, _pubsub.createTopic)();
+  const onAfterEntryDeleteRevision = (0, _pubsub.createTopic)();
+  const onBeforeEntryGet = (0, _pubsub.createTopic)();
+  const onBeforeEntryList = (0, _pubsub.createTopic)();
   /**
    * We need to assign some default behaviors.
    */
 
   (0, _beforeCreate.assignBeforeEntryCreate)({
     context,
-    onBeforeCreate
+    onBeforeEntryCreate
   });
   (0, _beforeUpdate.assignBeforeEntryUpdate)({
     context,
-    onBeforeUpdate
+    onBeforeEntryUpdate
   });
   (0, _afterDelete.assignAfterEntryDelete)({
     context,
-    onAfterDelete
+    onAfterEntryDelete
   });
 
   const checkEntryPermissions = check => {
@@ -163,7 +163,7 @@ const createContentEntryCrud = params => {
     } = params;
 
     try {
-      await onBeforeDelete.publish({
+      await onBeforeEntryDelete.publish({
         entry,
         model
       });
@@ -171,7 +171,7 @@ const createContentEntryCrud = params => {
         entry,
         storageEntry
       });
-      await onAfterDelete.publish({
+      await onAfterEntryDelete.publish({
         entry,
         model
       });
@@ -198,26 +198,26 @@ const createContentEntryCrud = params => {
   };
 
   return {
-    onBeforeEntryCreate: onBeforeCreate,
-    onAfterEntryCreate: onAfterCreate,
-    onBeforeEntryRevisionCreate: onBeforeCreateRevision,
-    onAfterEntryRevisionCreate: onAfterCreateRevision,
-    onBeforeEntryUpdate: onBeforeUpdate,
-    onAfterEntryUpdate: onAfterUpdate,
-    onBeforeEntryDelete: onBeforeDelete,
-    onAfterEntryDelete: onAfterDelete,
-    onBeforeEntryRevisionDelete: onBeforeDeleteRevision,
-    onAfterEntryRevisionDelete: onAfterDeleteRevision,
-    onBeforeEntryPublish: onBeforePublish,
-    onAfterEntryPublish: onAfterPublish,
-    onBeforeEntryUnpublish: onBeforeUnpublish,
-    onAfterEntryUnpublish: onAfterUnpublish,
-    onBeforeEntryRequestChanges: onBeforeRequestChanges,
-    onAfterEntryRequestChanges: onAfterRequestChanges,
-    onBeforeEntryRequestReview: onBeforeRequestReview,
-    onAfterEntryRequestReview: onAfterRequestReview,
-    onBeforeEntryGet: onBeforeGet,
-    onBeforeEntryList: onBeforeList,
+    onBeforeEntryCreate,
+    onAfterEntryCreate,
+    onBeforeEntryCreateRevision,
+    onAfterEntryCreateRevision,
+    onBeforeEntryUpdate,
+    onAfterEntryUpdate,
+    onBeforeEntryDelete,
+    onAfterEntryDelete,
+    onBeforeEntryDeleteRevision,
+    onAfterEntryDeleteRevision,
+    onBeforeEntryPublish,
+    onAfterEntryPublish,
+    onBeforeEntryUnpublish,
+    onAfterEntryUnpublish,
+    onBeforeEntryRequestChanges,
+    onAfterEntryRequestChanges,
+    onBeforeEntryRequestReview,
+    onAfterEntryRequestReview,
+    onBeforeEntryGet,
+    onBeforeEntryList,
 
     /**
      * Get entries by exact revision IDs from the database.
@@ -231,7 +231,7 @@ const createContentEntryCrud = params => {
       const where = {
         id
       };
-      await onBeforeGet.publish({
+      await onBeforeEntryGet.publish({
         where,
         model
       });
@@ -290,7 +290,7 @@ const createContentEntryCrud = params => {
         where,
         sort
       } = params;
-      await onBeforeGet.publish({
+      await onBeforeEntryGet.publish({
         where,
         model
       });
@@ -351,7 +351,7 @@ const createContentEntryCrud = params => {
         listWhere.ownedBy = ownedBy;
       }
 
-      await onBeforeList.publish({
+      await onBeforeEntryList.publish({
         where: listWhere,
         model
       });
@@ -443,7 +443,7 @@ const createContentEntryCrud = params => {
       let storageEntry = null;
 
       try {
-        await onBeforeCreate.publish({
+        await onBeforeEntryCreate.publish({
           entry,
           input,
           model
@@ -454,7 +454,7 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterCreate.publish({
+        await onAfterEntryCreate.publish({
           entry,
           storageEntry: result,
           model,
@@ -470,7 +470,7 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    createEntryRevisionFrom: async (model, sourceId, inputData = {}) => {
+    createEntryRevisionFrom: async (model, sourceId, inputData) => {
       const permission = await checkEntryPermissions({
         rwd: "w"
       });
@@ -541,8 +541,10 @@ const createContentEntryCrud = params => {
       let storageEntry = undefined;
 
       try {
-        await onBeforeCreateRevision.publish({
+        await onBeforeEntryCreateRevision.publish({
+          input,
           entry,
+          original: originalEntry,
           model
         });
         storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
@@ -554,9 +556,11 @@ const createContentEntryCrud = params => {
           latestEntry,
           latestStorageEntry
         });
-        await onAfterCreateRevision.publish({
+        await onAfterEntryCreateRevision.publish({
+          input,
           entry,
           model,
+          original: originalEntry,
           storageEntry: result
         });
         return result;
@@ -579,7 +583,7 @@ const createContentEntryCrud = params => {
        * Make sure we only work with fields that are defined in the model.
        */
 
-      const input = cleanInputData(model, inputData);
+      const input = cleanUpdatedInputData(model, inputData);
       /**
        * Validate data early. We don't want to query DB if input data is invalid.
        */
@@ -624,7 +628,7 @@ const createContentEntryCrud = params => {
       let storageEntry = undefined;
 
       try {
-        await onBeforeUpdate.publish({
+        await onBeforeEntryUpdate.publish({
           entry,
           model,
           input,
@@ -638,7 +642,7 @@ const createContentEntryCrud = params => {
           storageEntry,
           input
         });
-        await onAfterUpdate.publish({
+        await onAfterEntryUpdate.publish({
           entry,
           storageEntry: result,
           model,
@@ -787,7 +791,7 @@ const createContentEntryCrud = params => {
       }
 
       try {
-        await onBeforeDeleteRevision.publish({
+        await onBeforeEntryDeleteRevision.publish({
           entry: entryToDelete,
           model
         });
@@ -797,7 +801,7 @@ const createContentEntryCrud = params => {
           entryToSetAsLatest,
           storageEntryToSetAsLatest
         });
-        await onAfterDeleteRevision.publish({
+        await onAfterEntryDeleteRevision.publish({
           entry: entryToDelete,
           model
         });
@@ -859,7 +863,7 @@ const createContentEntryCrud = params => {
       let storageEntry = undefined;
 
       try {
-        await onBeforePublish.publish({
+        await onBeforeEntryPublish.publish({
           entry,
           model
         });
@@ -870,7 +874,7 @@ const createContentEntryCrud = params => {
           originalEntry,
           originalStorageEntry
         });
-        await onAfterPublish.publish({
+        await onAfterEntryPublish.publish({
           entry,
           storageEntry: result,
           model
@@ -919,7 +923,7 @@ const createContentEntryCrud = params => {
       let storageEntry = undefined;
 
       try {
-        await onBeforeRequestChanges.publish({
+        await onBeforeEntryRequestChanges.publish({
           entry,
           model
         });
@@ -930,7 +934,7 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterRequestChanges.publish({
+        await onAfterEntryRequestChanges.publish({
           entry,
           storageEntry: result,
           model
@@ -981,7 +985,7 @@ const createContentEntryCrud = params => {
       let storageEntry = undefined;
 
       try {
-        await onBeforeRequestReview.publish({
+        await onBeforeEntryRequestReview.publish({
           entry,
           model
         });
@@ -992,7 +996,7 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterRequestReview.publish({
+        await onAfterEntryRequestReview.publish({
           entry,
           storageEntry: result,
           model
@@ -1036,7 +1040,7 @@ const createContentEntryCrud = params => {
       let storageEntry = undefined;
 
       try {
-        await onBeforeUnpublish.publish({
+        await onBeforeEntryUnpublish.publish({
           entry,
           model
         });
@@ -1047,7 +1051,7 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterUnpublish.publish({
+        await onAfterEntryUnpublish.publish({
           entry,
           storageEntry: result,
           model

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

@@ -1,7 +1,7 @@
 import { AfterModelCreateTopicParams, CmsContext } from "../../../../types";
 import { Topic } from "@webiny/pubsub/types";
 export interface Params {
-    onAfterCreate: Topic<AfterModelCreateTopicParams>;
+    onAfterModelCreate: Topic<AfterModelCreateTopicParams>;
     context: CmsContext;
 }
 export declare const assignAfterModelCreate: (params: Params) => void;

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

@@ -7,10 +7,10 @@ exports.assignAfterModelCreate = void 0;
 
 const assignAfterModelCreate = params => {
   const {
-    onAfterCreate,
+    onAfterModelCreate,
     context
   } = params;
-  onAfterCreate.subscribe(async () => {
+  onAfterModelCreate.subscribe(async () => {
     await context.cms.updateModelLastChange();
   });
 };

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

@@ -1,7 +1,7 @@
 import { AfterModelDeleteTopicParams, CmsContext } from "../../../../types";
 import { Topic } from "@webiny/pubsub/types";
 export interface Params {
-    onAfterDelete: Topic<AfterModelDeleteTopicParams>;
+    onAfterModelDelete: Topic<AfterModelDeleteTopicParams>;
     context: CmsContext;
 }
 export declare const assignAfterModelDelete: (params: Params) => void;

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

@@ -7,10 +7,10 @@ exports.assignAfterModelDelete = void 0;
 
 const assignAfterModelDelete = params => {
   const {
-    onAfterDelete,
+    onAfterModelDelete,
     context
   } = params;
-  onAfterDelete.subscribe(async () => {
+  onAfterModelDelete.subscribe(async () => {
     await context.cms.updateModelLastChange();
   });
 };

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

@@ -1,7 +1,7 @@
 import { AfterModelUpdateTopicParams, CmsContext } from "../../../../types";
 import { Topic } from "@webiny/pubsub/types";
 export interface Params {
-    onAfterUpdate: Topic<AfterModelUpdateTopicParams>;
+    onAfterModelUpdate: Topic<AfterModelUpdateTopicParams>;
     context: CmsContext;
 }
 export declare const assignAfterModelUpdate: (params: Params) => void;

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

@@ -7,10 +7,10 @@ exports.assignAfterModelUpdate = void 0;
 
 const assignAfterModelUpdate = params => {
   const {
-    onAfterUpdate,
+    onAfterModelUpdate,
     context
   } = params;
-  onAfterUpdate.subscribe(async () => {
+  onAfterModelUpdate.subscribe(async () => {
     await context.cms.updateModelLastChange();
   });
 };

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

@@ -2,8 +2,8 @@ import { BeforeModelCreateTopicParams, HeadlessCmsStorageOperations } from "../.
 import { Topic } from "@webiny/pubsub/types";
 import { PluginsContainer } from "@webiny/plugins";
 export interface Params {
-    onBeforeCreate: Topic<BeforeModelCreateTopicParams>;
-    onBeforeCreateFrom: Topic<BeforeModelCreateTopicParams>;
+    onBeforeModelCreate: Topic<BeforeModelCreateTopicParams>;
+    onBeforeModelCreateFrom: Topic<BeforeModelCreateTopicParams>;
     storageOperations: HeadlessCmsStorageOperations;
     plugins: PluginsContainer;
 }

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

@@ -147,16 +147,16 @@ const createOnBeforeCb = ({
  */
 const assignBeforeModelCreate = params => {
   const {
-    onBeforeCreate,
-    onBeforeCreateFrom,
+    onBeforeModelCreate,
+    onBeforeModelCreateFrom,
     storageOperations,
     plugins
   } = params;
-  onBeforeCreate.subscribe(createOnBeforeCb({
+  onBeforeModelCreate.subscribe(createOnBeforeCb({
     storageOperations,
     plugins
   }));
-  onBeforeCreateFrom.subscribe(createOnBeforeCb({
+  onBeforeModelCreateFrom.subscribe(createOnBeforeCb({
     storageOperations,
     plugins
   }));

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

@@ -2,7 +2,7 @@ import { Topic } from "@webiny/pubsub/types";
 import { BeforeModelDeleteTopicParams, HeadlessCmsStorageOperations } from "../../../../types";
 import { PluginsContainer } from "@webiny/plugins";
 export interface Params {
-    onBeforeDelete: Topic<BeforeModelDeleteTopicParams>;
+    onBeforeModelDelete: Topic<BeforeModelDeleteTopicParams>;
     storageOperations: HeadlessCmsStorageOperations;
     plugins: PluginsContainer;
 }

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

@@ -13,11 +13,11 @@ var _CmsModelPlugin = require("../../CmsModelPlugin");
 
 const assignBeforeModelDelete = params => {
   const {
-    onBeforeDelete,
+    onBeforeModelDelete,
     storageOperations,
     plugins
   } = params;
-  onBeforeDelete.subscribe(async params => {
+  onBeforeModelDelete.subscribe(async params => {
     const {
       model
     } = params;

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

@@ -2,7 +2,7 @@ import { Topic } from "@webiny/pubsub/types";
 import { BeforeModelUpdateTopicParams, HeadlessCmsStorageOperations } from "../../../../types";
 import { PluginsContainer } from "@webiny/plugins";
 export interface Params {
-    onBeforeUpdate: Topic<BeforeModelUpdateTopicParams>;
+    onBeforeModelUpdate: Topic<BeforeModelUpdateTopicParams>;
     storageOperations: HeadlessCmsStorageOperations;
     plugins: PluginsContainer;
 }

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

@@ -55,10 +55,10 @@ const getContentModelTitleFieldId = (fields, titleFieldId) => {
 
 const assignBeforeModelUpdate = params => {
   const {
-    onBeforeUpdate,
+    onBeforeModelUpdate,
     plugins
   } = params;
-  onBeforeUpdate.subscribe(async params => {
+  onBeforeModelUpdate.subscribe(async params => {
     const {
       model
     } = params;