@webiny/api-headless-cms 0.0.0-unstable.5e7233243f → 0.0.0-unstable.615a930a68

package/crud/contentEntry.crud.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createContentEntryCrud = exports.STATUS_UNPUBLISHED = exports.STATUS_REVIEW_REQUESTED = exports.STATUS_PUBLISHED = exports.STATUS_DRAFT = exports.STATUS_CHANGES_REQUESTED = void 0;
+exports.createContentEntryCrud = exports.STATUS_UNPUBLISHED = exports.STATUS_PUBLISHED = exports.STATUS_DRAFT = void 0;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _mdbid = _interopRequireDefault(require("mdbid"));
 
@@ -41,20 +41,18 @@ var _entryStorage = require("../utils/entryStorage");
 
 var _valueKeyStorageConverter = require("../utils/converters/valueKeyStorageConverter");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var _searchableFields = require("./contentEntry/searchableFields");
 
+/**
+ * Package mdbid does not have types.
+ */
+// @ts-ignore
 const STATUS_DRAFT = "draft";
 exports.STATUS_DRAFT = STATUS_DRAFT;
 const STATUS_PUBLISHED = "published";
 exports.STATUS_PUBLISHED = STATUS_PUBLISHED;
 const STATUS_UNPUBLISHED = "unpublished";
 exports.STATUS_UNPUBLISHED = STATUS_UNPUBLISHED;
-const STATUS_CHANGES_REQUESTED = "changesRequested";
-exports.STATUS_CHANGES_REQUESTED = STATUS_CHANGES_REQUESTED;
-const STATUS_REVIEW_REQUESTED = "reviewRequested";
-exports.STATUS_REVIEW_REQUESTED = STATUS_REVIEW_REQUESTED;
 
 /**
  * Used for some fields to convert their values.
@@ -221,33 +219,10 @@ const increaseEntryIdVersion = id => {
   };
 };
 
-const getSearchableFields = params => {
-  const {
-    plugins,
-    model,
-    fields
-  } = params;
-  const fieldPluginMap = plugins.byType("cms-model-field-to-graphql").reduce((collection, field) => {
-    collection[field.fieldType] = field;
-    return collection;
-  }, {});
-  return model.fields.filter(field => {
-    if (!field.fieldId) {
-      return false;
-    }
-
-    const plugin = fieldPluginMap[field.type];
-
-    if (!plugin) {
-      return false;
-    } else if (!plugin.fullTextSearch) {
-      return false;
-    } else if (!fields || fields.length === 0) {
-      return true;
-    }
+const allowedEntryStatus = ["draft", "published", "unpublished"];
 
-    return fields.includes(field.fieldId);
-  }).map(field => field.fieldId);
+const transformEntryStatus = status => {
+  return allowedEntryStatus.includes(status) ? status : "draft";
 };
 
 const createContentEntryCrud = params => {
@@ -259,42 +234,54 @@ const createContentEntryCrud = params => {
   } = params;
   const {
     plugins
-  } = context;
-  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)();
+  } = context; // create
+
+  const onEntryBeforeCreate = (0, _pubsub.createTopic)("cms.onEntryBeforeCreate");
+  const onEntryAfterCreate = (0, _pubsub.createTopic)("cms.onEntryAfterCreate");
+  const onEntryCreateError = (0, _pubsub.createTopic)("cms.onEntryCreateError"); // create revision
+
+  const onEntryBeforeCreateRevision = (0, _pubsub.createTopic)("cms.onEntryBeforeCreateRevision");
+  const onEntryRevisionAfterCreate = (0, _pubsub.createTopic)("cms.onEntryRevisionAfterCreate");
+  const onEntryCreateRevisionError = (0, _pubsub.createTopic)("cms.onEntryCreateRevisionError"); // update
+
+  const onEntryBeforeUpdate = (0, _pubsub.createTopic)("cms.onEntryBeforeUpdate");
+  const onEntryAfterUpdate = (0, _pubsub.createTopic)("cms.onEntryAfterUpdate");
+  const onEntryUpdateError = (0, _pubsub.createTopic)("cms.onEntryUpdateError"); // publish
+
+  const onEntryBeforePublish = (0, _pubsub.createTopic)("cms.onEntryBeforePublish");
+  const onEntryAfterPublish = (0, _pubsub.createTopic)("cms.onEntryAfterPublic");
+  const onEntryPublishError = (0, _pubsub.createTopic)("cms.onEntryPublishError"); // unpublish
+
+  const onEntryBeforeUnpublish = (0, _pubsub.createTopic)("cms.onEntryBeforeUnpublish");
+  const onEntryAfterUnpublish = (0, _pubsub.createTopic)("cms.onEntryAfterUnpublish");
+  const onEntryUnpublishError = (0, _pubsub.createTopic)("cms.onEntryUnpublishError"); // delete
+
+  const onEntryBeforeDelete = (0, _pubsub.createTopic)("cms.onEntryBeforeDelete");
+  const onEntryAfterDelete = (0, _pubsub.createTopic)("cms.onEntryAfterDelete");
+  const onEntryDeleteError = (0, _pubsub.createTopic)("cms.onEntryDeleteError"); // delete revision
+
+  const onEntryRevisionBeforeDelete = (0, _pubsub.createTopic)("cms.onEntryRevisionBeforeDelete");
+  const onEntryRevisionAfterDelete = (0, _pubsub.createTopic)("cms.onEntryRevisionAfterDelete");
+  const onEntryRevisionDeleteError = (0, _pubsub.createTopic)("cms.onEntryRevisionDeleteError"); // get
+
+  const onEntryBeforeGet = (0, _pubsub.createTopic)("cms.onEntryBeforeGet"); // list
+
+  const onEntryBeforeList = (0, _pubsub.createTopic)("cms.onEntryBeforeList");
   /**
    * We need to assign some default behaviors.
    */
 
   (0, _beforeCreate.assignBeforeEntryCreate)({
     context,
-    onBeforeEntryCreate
+    onEntryBeforeCreate
   });
   (0, _beforeUpdate.assignBeforeEntryUpdate)({
     context,
-    onBeforeEntryUpdate
+    onEntryBeforeUpdate
   });
   (0, _afterDelete.assignAfterEntryDelete)({
     context,
-    onAfterEntryDelete
+    onEntryAfterDelete
   });
 
   const checkEntryPermissions = check => {
@@ -312,18 +299,23 @@ const createContentEntryCrud = params => {
     } = params;
 
     try {
-      await onBeforeEntryDelete.publish({
+      await onEntryBeforeDelete.publish({
         entry,
         model
       });
       await storageOperations.entries.delete(model, {
         entry
       });
-      await onAfterEntryDelete.publish({
+      await onEntryAfterDelete.publish({
         entry,
         model
       });
     } catch (ex) {
+      await onEntryDeleteError.publish({
+        entry,
+        model,
+        error: ex
+      });
       throw new _error.default(ex.message || "Could not delete entry.", ex.code || "DELETE_ERROR", {
         entry
       });
@@ -350,26 +342,52 @@ const createContentEntryCrud = params => {
   };
 
   return {
-    onBeforeEntryCreate,
-    onAfterEntryCreate,
-    onBeforeEntryCreateRevision,
-    onAfterEntryCreateRevision,
-    onBeforeEntryUpdate,
-    onAfterEntryUpdate,
-    onBeforeEntryDelete,
-    onAfterEntryDelete,
-    onBeforeEntryDeleteRevision,
-    onAfterEntryDeleteRevision,
-    onBeforeEntryPublish,
-    onAfterEntryPublish,
-    onBeforeEntryUnpublish,
-    onAfterEntryUnpublish,
-    onBeforeEntryRequestChanges,
-    onAfterEntryRequestChanges,
-    onBeforeEntryRequestReview,
-    onAfterEntryRequestReview,
-    onBeforeEntryGet,
-    onBeforeEntryList,
+    /**
+     * Deprecated - will be removed in 5.35.0
+     */
+    onBeforeEntryCreate: onEntryBeforeCreate,
+    onAfterEntryCreate: onEntryAfterCreate,
+    onBeforeEntryCreateRevision: onEntryBeforeCreateRevision,
+    onAfterEntryCreateRevision: onEntryRevisionAfterCreate,
+    onBeforeEntryUpdate: onEntryBeforeUpdate,
+    onAfterEntryUpdate: onEntryAfterUpdate,
+    onBeforeEntryDelete: onEntryBeforeDelete,
+    onAfterEntryDelete: onEntryAfterDelete,
+    onBeforeEntryDeleteRevision: onEntryRevisionBeforeDelete,
+    onAfterEntryDeleteRevision: onEntryRevisionAfterDelete,
+    onBeforeEntryPublish: onEntryBeforePublish,
+    onAfterEntryPublish: onEntryAfterPublish,
+    onBeforeEntryUnpublish: onEntryBeforeUnpublish,
+    onAfterEntryUnpublish: onEntryAfterUnpublish,
+    onBeforeEntryGet: onEntryBeforeGet,
+    onBeforeEntryList: onEntryBeforeList,
+
+    /**
+     * Released in 5.34.0
+     */
+    onEntryBeforeCreate,
+    onEntryAfterCreate,
+    onEntryCreateError,
+    onEntryRevisionBeforeCreate: onEntryBeforeCreateRevision,
+    onEntryRevisionAfterCreate,
+    onEntryRevisionCreateError: onEntryCreateRevisionError,
+    onEntryBeforeUpdate,
+    onEntryAfterUpdate,
+    onEntryUpdateError,
+    onEntryBeforeDelete,
+    onEntryAfterDelete,
+    onEntryDeleteError,
+    onEntryRevisionBeforeDelete,
+    onEntryRevisionAfterDelete,
+    onEntryRevisionDeleteError,
+    onEntryBeforePublish,
+    onEntryAfterPublish,
+    onEntryPublishError,
+    onEntryBeforeUnpublish,
+    onEntryAfterUnpublish,
+    onEntryUnpublishError,
+    onEntryBeforeGet,
+    onEntryBeforeList,
 
     /**
      * Get entries by exact revision IDs from the database.
@@ -379,7 +397,7 @@ const createContentEntryCrud = params => {
     /**
      * Get a single entry by revision ID from the database.
      */
-    getEntryById: async (initialModel, id) => {
+    async getEntryById(initialModel, id) {
       const where = {
         id
       };
@@ -387,7 +405,7 @@ const createContentEntryCrud = params => {
         model: initialModel,
         plugins
       });
-      await onBeforeEntryGet.publish({
+      await onEntryBeforeGet.publish({
         where,
         model
       });
@@ -403,7 +421,7 @@ const createContentEntryCrud = params => {
     /**
      * Get published revisions by entry IDs.
      */
-    getPublishedEntriesByIds: async (initialModel, ids) => {
+    async getPublishedEntriesByIds(initialModel, ids) {
       const permission = await checkEntryPermissions({
         rwd: "r"
       });
@@ -421,7 +439,7 @@ const createContentEntryCrud = params => {
     /**
      * Get latest revisions by entry IDs.
      */
-    getLatestEntriesByIds: async (initialModel, ids) => {
+    async getLatestEntriesByIds(initialModel, ids) {
       const permission = await checkEntryPermissions({
         rwd: "r"
       });
@@ -435,7 +453,8 @@ const createContentEntryCrud = params => {
       });
       return entries.filter(entry => (0, _ownership.validateOwnership)(context, permission, entry));
     },
-    getEntryRevisions: async (initialModel, entryId) => {
+
+    async getEntryRevisions(initialModel, entryId) {
       const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
         model: initialModel,
         plugins
@@ -450,7 +469,7 @@ const createContentEntryCrud = params => {
      *
      * @internal
      */
-    getEntry: async (initialModel, params) => {
+    async getEntry(initialModel, params) {
       await checkEntryPermissions({
         rwd: "r"
       });
@@ -462,11 +481,11 @@ const createContentEntryCrud = params => {
         where,
         sort
       } = params;
-      await onBeforeEntryGet.publish({
+      await onEntryBeforeGet.publish({
         where,
         model
       });
-      const [items] = await context.cms.listEntries(model, {
+      const [items] = await this.listEntries(model, {
         where,
         sort,
         limit: 1
@@ -484,7 +503,7 @@ const createContentEntryCrud = params => {
      *
      * @internal
      */
-    listEntries: async (initialModel, params) => {
+    async listEntries(initialModel, params) {
       const permission = await checkEntryPermissions({
         rwd: "r"
       });
@@ -500,13 +519,12 @@ const createContentEntryCrud = params => {
        * We always assign tenant and locale because we do not allow one model to have content through multiple tenants.
        */
 
-      const where = _objectSpread({}, initialWhere);
+      const where = (0, _objectSpread2.default)({}, initialWhere);
       /**
        * Possibly only get records which are owned by current user.
        * Or if searching for the owner set that value - in the case that user can see other entries than their own.
        */
 
-
       const ownedBy = permission.own ? getIdentity().id : where.ownedBy;
 
       if (ownedBy !== undefined) {
@@ -528,14 +546,14 @@ const createContentEntryCrud = params => {
         });
       }
 
-      const fields = getSearchableFields({
-        model,
+      const fields = (0, _searchableFields.getSearchableFields)({
+        fields: model.fields,
         plugins: context.plugins,
-        fields: params.fields || []
+        input: params.fields || []
       });
 
       try {
-        await onBeforeEntryList.publish({
+        await onEntryBeforeList.publish({
           where,
           model
         });
@@ -544,7 +562,7 @@ const createContentEntryCrud = params => {
           totalCount,
           cursor,
           items
-        } = await storageOperations.entries.list(model, _objectSpread(_objectSpread({}, params), {}, {
+        } = await storageOperations.entries.list(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
           where,
           fields
         }));
@@ -562,33 +580,40 @@ const createContentEntryCrud = params => {
       } catch (ex) {
         throw new _error.default("Error while fetching entries from storage.", "LIST_ENTRIES_ERROR", {
           params,
-          error: ex,
+          error: {
+            message: ex.message,
+            code: ex.code,
+            data: ex.data
+          },
           model,
           fields
         });
       }
     },
-    listLatestEntries: async function (model, params) {
+
+    async listLatestEntries(model, params) {
       const where = (params === null || params === void 0 ? void 0 : params.where) || {};
-      return context.cms.listEntries(model, _objectSpread(_objectSpread({
+      return this.listEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         sort: ["createdOn_DESC"]
       }, params || {}), {}, {
-        where: _objectSpread(_objectSpread({}, where), {}, {
+        where: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, where), {}, {
           latest: true
         })
       }));
     },
-    listPublishedEntries: async function (model, params) {
+
+    async listPublishedEntries(model, params) {
       const where = (params === null || params === void 0 ? void 0 : params.where) || {};
-      return context.cms.listEntries(model, _objectSpread(_objectSpread({
+      return this.listEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         sort: ["createdOn_DESC"]
       }, params || {}), {}, {
-        where: _objectSpread(_objectSpread({}, where), {}, {
+        where: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, where), {}, {
           published: true
         })
       }));
     },
-    createEntry: async (initialModel, inputData) => {
+
+    async createEntry(initialModel, inputData) {
       await checkEntryPermissions({
         rwd: "w"
       });
@@ -614,7 +639,7 @@ const createContentEntryCrud = params => {
         validateEntries: true
       });
       const identity = context.security.getIdentity();
-      const locale = context.cms.getLocale();
+      const locale = this.getLocale();
       const owner = {
         id: identity.id,
         displayName: identity.displayName,
@@ -644,7 +669,7 @@ const createContentEntryCrud = params => {
       let storageEntry = null;
 
       try {
-        await onBeforeEntryCreate.publish({
+        await onEntryBeforeCreate.publish({
           entry,
           input,
           model
@@ -654,7 +679,7 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterEntryCreate.publish({
+        await onEntryAfterCreate.publish({
           entry,
           storageEntry: result,
           model,
@@ -662,6 +687,12 @@ const createContentEntryCrud = params => {
         });
         return result;
       } catch (ex) {
+        await onEntryCreateError.publish({
+          error: ex,
+          entry,
+          model,
+          input
+        });
         throw new _error.default(ex.message || "Could not create content entry.", ex.code || "CREATE_ENTRY_ERROR", ex.data || {
           error: ex,
           input,
@@ -670,7 +701,8 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    createEntryRevisionFrom: async (initialModel, sourceId, inputData) => {
+
+    async createEntryRevisionFrom(initialModel, sourceId, inputData) {
       const permission = await checkEntryPermissions({
         rwd: "w"
       });
@@ -707,9 +739,7 @@ const createContentEntryCrud = params => {
 
 
       const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
-
-      const initialValues = _objectSpread(_objectSpread({}, originalEntry.values), input);
-
+      const initialValues = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry.values), input);
       await (0, _entryDataValidation.validateModelEntryData)({
         context,
         model,
@@ -729,8 +759,7 @@ const createContentEntryCrud = params => {
         id,
         version: nextVersion
       } = increaseEntryIdVersion(latestId);
-
-      const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
+      const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
         id,
         version: nextVersion,
         savedOn: new Date().toISOString(),
@@ -745,11 +774,10 @@ const createContentEntryCrud = params => {
         status: STATUS_DRAFT,
         values
       });
-
       let storageEntry = null;
 
       try {
-        await onBeforeEntryCreateRevision.publish({
+        await onEntryBeforeCreateRevision.publish({
           input,
           entry,
           original: originalEntry,
@@ -760,7 +788,7 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterEntryCreateRevision.publish({
+        await onEntryRevisionAfterCreate.publish({
           input,
           entry,
           model,
@@ -769,6 +797,12 @@ const createContentEntryCrud = params => {
         });
         return result;
       } catch (ex) {
+        await onEntryCreateRevisionError.publish({
+          entry,
+          model,
+          input,
+          error: ex
+        });
         throw new _error.default(ex.message || "Could not create entry from existing one.", ex.code || "CREATE_FROM_REVISION_ERROR", {
           error: ex,
           entry,
@@ -778,7 +812,8 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    updateEntry: async (initialModel, id, inputData, metaInput) => {
+
+    async updateEntry(initialModel, id, inputData, metaInput) {
       const permission = await checkEntryPermissions({
         rwd: "w"
       });
@@ -816,9 +851,7 @@ const createContentEntryCrud = params => {
         entry: originalEntry
       });
       (0, _ownership.checkOwnership)(context, permission, originalEntry);
-
-      const initialValues = _objectSpread(_objectSpread({}, originalEntry.values), input);
-
+      const initialValues = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry.values), input);
       const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
         context,
         model,
@@ -834,16 +867,16 @@ const createContentEntryCrud = params => {
        * We always send the full entry to the hooks and storage operations update.
        */
 
-      const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
+      const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
         savedOn: new Date().toISOString(),
         values,
-        meta
+        meta,
+        status: transformEntryStatus(originalEntry.status)
       });
-
       let storageEntry = null;
 
       try {
-        await onBeforeEntryUpdate.publish({
+        await onEntryBeforeUpdate.publish({
           entry,
           model,
           input,
@@ -854,7 +887,7 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterEntryUpdate.publish({
+        await onEntryAfterUpdate.publish({
           entry,
           storageEntry: result,
           model,
@@ -863,6 +896,12 @@ const createContentEntryCrud = params => {
         });
         return result;
       } catch (ex) {
+        await onEntryUpdateError.publish({
+          entry,
+          model,
+          input,
+          error: ex
+        });
         throw new _error.default(ex.message || "Could not update existing entry.", ex.code || "UPDATE_ERROR", {
           error: ex,
           entry,
@@ -872,7 +911,8 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    republishEntry: async (initialModel, id) => {
+
+    async republishEntry(initialModel, id) {
       await checkEntryPermissions({
         rwd: "w"
       });
@@ -911,13 +951,11 @@ const createContentEntryCrud = params => {
         input: originalEntry.values,
         validateEntries: false
       });
-
-      const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
+      const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
         savedOn: new Date().toISOString(),
         webinyVersion: context.WEBINY_VERSION,
         values
       });
-
       const storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
       /**
        * First we need to update existing entry.
@@ -949,7 +987,8 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    deleteEntryRevision: async (initialModel, revisionId) => {
+
+    async deleteEntryRevision(initialModel, revisionId) {
       const permission = await checkEntryPermissions({
         rwd: "d"
       });
@@ -1005,7 +1044,7 @@ const createContentEntryCrud = params => {
       }
 
       try {
-        await onBeforeEntryDeleteRevision.publish({
+        await onEntryRevisionBeforeDelete.publish({
           entry: entryToDelete,
           model
         });
@@ -1015,11 +1054,16 @@ const createContentEntryCrud = params => {
           latestEntry: entryToSetAsLatest,
           latestStorageEntry: storageEntryToSetAsLatest
         });
-        await onAfterEntryDeleteRevision.publish({
+        await onEntryRevisionAfterDelete.publish({
           entry: entryToDelete,
           model
         });
       } catch (ex) {
+        await onEntryRevisionDeleteError.publish({
+          entry: entryToDelete,
+          model,
+          error: ex
+        });
         throw new _error.default(ex.message, ex.code || "DELETE_REVISION_ERROR", {
           error: ex,
           entry: entryToDelete,
@@ -1029,7 +1073,8 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    deleteEntry: async (initialModel, entryId) => {
+
+    async deleteEntry(initialModel, entryId) {
       const permission = await checkEntryPermissions({
         rwd: "d"
       });
@@ -1053,7 +1098,8 @@ const createContentEntryCrud = params => {
         entry
       });
     },
-    publishEntry: async (initialModel, id) => {
+
+    async publishEntry(initialModel, id) {
       const permission = await checkEntryPermissions({
         pw: "p"
       });
@@ -1073,18 +1119,16 @@ const createContentEntryCrud = params => {
       (0, _ownership.checkOwnership)(context, permission, originalStorageEntry);
       const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
       const currentDate = new Date().toISOString();
-
-      const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
+      const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
         status: STATUS_PUBLISHED,
         locked: true,
         savedOn: currentDate,
         publishedOn: currentDate
       });
-
       let storageEntry = null;
 
       try {
-        await onBeforeEntryPublish.publish({
+        await onEntryBeforePublish.publish({
           entry,
           model
         });
@@ -1093,13 +1137,18 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterEntryPublish.publish({
+        await onEntryAfterPublish.publish({
           entry,
           storageEntry: result,
           model
         });
         return result;
       } catch (ex) {
+        await onEntryPublishError.publish({
+          entry,
+          model,
+          error: ex
+        });
         throw new _error.default(ex.message || "Could not publish entry.", ex.code || "PUBLISH_ERROR", {
           error: ex,
           entry,
@@ -1109,130 +1158,8 @@ const createContentEntryCrud = params => {
         });
       }
     },
-    requestEntryChanges: async (initialModel, id) => {
-      const permission = await checkEntryPermissions({
-        pw: "c"
-      });
-      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
-        model: initialModel,
-        plugins
-      });
-      const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
-        id
-      });
-
-      if (!originalStorageEntry) {
-        throw new _handlerGraphql.NotFoundError(`Entry "${id}" of model "${model.modelId}" was not found.`);
-      }
-
-      const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
 
-      if (originalEntry.status !== STATUS_REVIEW_REQUESTED) {
-        throw new _error.default("Cannot request changes on an entry that's not under review.", "ENTRY_NOT_UNDER_REVIEW");
-      }
-
-      const identity = context.security.getIdentity();
-
-      if (originalEntry.ownedBy.id === identity.id) {
-        throw new _error.default("You cannot request changes on your own entry.", "CANNOT_REQUEST_CHANGES_ON_OWN_ENTRY");
-      }
-
-      (0, _ownership.checkOwnership)(context, permission, originalEntry);
-
-      const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
-        status: STATUS_CHANGES_REQUESTED
-      });
-
-      let storageEntry = null;
-
-      try {
-        await onBeforeEntryRequestChanges.publish({
-          entry,
-          model
-        });
-        storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
-        const result = await storageOperations.entries.requestChanges(model, {
-          entry,
-          storageEntry
-        });
-        await onAfterEntryRequestChanges.publish({
-          entry,
-          storageEntry: result,
-          model
-        });
-        return result;
-      } catch (ex) {
-        throw new _error.default(ex.message || "Could not request changes for the entry.", ex.code || "REQUEST_CHANGES_ERROR", {
-          entry,
-          originalEntry
-        });
-      }
-    },
-    requestEntryReview: async (initialModel, id) => {
-      const permission = await checkEntryPermissions({
-        pw: "r"
-      });
-      const {
-        id: entryId
-      } = (0, _utils.parseIdentifier)(id);
-      const model = (0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
-        model: initialModel,
-        plugins
-      });
-      const originalStorageEntry = await storageOperations.entries.getRevisionById(model, {
-        id
-      });
-      const latestEntryRevision = await storageOperations.entries.getLatestRevisionByEntryId(model, {
-        id: entryId
-      });
-
-      if (!originalStorageEntry) {
-        throw new _handlerGraphql.NotFoundError(`Entry "${id}" of model "${model.modelId}" was not found.`);
-      } else if (!latestEntryRevision) {
-        throw new _handlerGraphql.NotFoundError(`Entry "${id}" does not have latest record`);
-      }
-
-      const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
-      const allowedStatuses = [STATUS_DRAFT, STATUS_CHANGES_REQUESTED];
-
-      if (!allowedStatuses.includes(originalEntry.status)) {
-        throw new _error.default("Cannot request review - entry is not a draft nor was a change request issued.", "REQUEST_REVIEW_ERROR", {
-          entry: originalEntry
-        });
-      }
-
-      (0, _ownership.checkOwnership)(context, permission, originalEntry);
-
-      const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
-        status: STATUS_REVIEW_REQUESTED
-      });
-
-      let storageEntry = null;
-
-      try {
-        await onBeforeEntryRequestReview.publish({
-          entry,
-          model
-        });
-        storageEntry = await (0, _entryStorage.entryToStorageTransform)(context, model, entry);
-        const result = await storageOperations.entries.requestReview(model, {
-          entry,
-          storageEntry
-        });
-        await onAfterEntryRequestReview.publish({
-          entry,
-          storageEntry: result,
-          model
-        });
-        return result;
-      } catch (ex) {
-        throw new _error.default(ex.message || "Could not request review on the entry.", ex.code || "REQUEST_REVIEW_ERROR", {
-          originalEntry,
-          entry
-        });
-      }
-    },
-    unpublishEntry: async (initialModel, id) => {
+    async unpublishEntry(initialModel, id) {
       const permission = await checkEntryPermissions({
         pw: "u"
       });
@@ -1259,15 +1186,13 @@ const createContentEntryCrud = params => {
 
       (0, _ownership.checkOwnership)(context, permission, originalStorageEntry);
       const originalEntry = await (0, _entryStorage.entryFromStorageTransform)(context, model, originalStorageEntry);
-
-      const entry = _objectSpread(_objectSpread({}, originalEntry), {}, {
+      const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
         status: STATUS_UNPUBLISHED
       });
-
       let storageEntry = null;
 
       try {
-        await onBeforeEntryUnpublish.publish({
+        await onEntryBeforeUnpublish.publish({
           entry,
           model
         });
@@ -1276,13 +1201,18 @@ const createContentEntryCrud = params => {
           entry,
           storageEntry
         });
-        await onAfterEntryUnpublish.publish({
+        await onEntryAfterUnpublish.publish({
           entry,
           storageEntry: result,
           model
         });
         return result;
       } catch (ex) {
+        await onEntryUnpublishError.publish({
+          entry,
+          model,
+          error: ex
+        });
         throw new _error.default(ex.message || "Could not unpublish entry.", ex.code || "UNPUBLISH_ERROR", {
           originalEntry,
           originalStorageEntry,
@@ -1291,6 +1221,7 @@ const createContentEntryCrud = params => {
         });
       }
     }
+
   };
 };