@webiny/api-headless-cms 5.38.0 → 5.39.0-beta.0

package/crud/contentEntry.crud.js

@@ -22,6 +22,7 @@ var _searchableFields = require("./contentEntry/searchableFields");
 var _filterAsync = require("../utils/filterAsync");
 var _apiSecurity = require("@webiny/api-security/");
 var _constants = require("../constants");
+var _date = require("../utils/date");
 const STATUS_DRAFT = _types.CONTENT_ENTRY_STATUS.DRAFT;
 exports.STATUS_DRAFT = STATUS_DRAFT;
 const STATUS_PUBLISHED = _types.CONTENT_ENTRY_STATUS.PUBLISHED;
@@ -178,24 +179,27 @@ const createSort = sort => {
   }
   return sort;
 };
+const getIdentity = (input, defaultValue) => {
+  const identity = input !== null && input !== void 0 && input.id && input !== null && input !== void 0 && input.displayName && input !== null && input !== void 0 && input.type ? input : defaultValue;
+  if (!identity) {
+    return null;
+  }
+  return {
+    id: identity.id,
+    displayName: identity.displayName,
+    type: identity.type
+  };
+};
 const createContentEntryCrud = params => {
   const {
     storageOperations,
     entriesPermissions,
     modelsPermissions,
     context,
-    getIdentity,
+    getIdentity: getSecurityIdentity,
     getTenant,
     getLocale
   } = params;
-  const getCreatedBy = () => {
-    const identity = getIdentity();
-    return {
-      id: identity.id,
-      displayName: identity.displayName,
-      type: identity.type
-    };
-  };
 
   /**
    * Create
@@ -450,7 +454,7 @@ const createContentEntryCrud = params => {
      * Or if searching for the owner set that value - in the case that user can see other entries than their own.
      */
     if (await entriesPermissions.canAccessOnlyOwnRecords()) {
-      where.ownedBy = getIdentity().id;
+      where.ownedBy = getSecurityIdentity().id;
     }
 
     /**
@@ -510,8 +514,8 @@ const createContentEntryCrud = params => {
       });
     }
   };
-  const createEntry = async (model, inputData, options) => {
-    var _inputData$wbyAco_loc;
+  const createEntry = async (model, rawInput, options) => {
+    var _rawInput$wbyAco_loca;
     await entriesPermissions.ensure({
       rwd: "w"
     });
@@ -522,7 +526,7 @@ const createContentEntryCrud = params => {
     /**
      * Make sure we only work with fields that are defined in the model.
      */
-    const initialInput = mapAndCleanCreateInputData(model, inputData);
+    const initialInput = mapAndCleanCreateInputData(model, rawInput);
     await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
       context,
       model,
@@ -536,16 +540,17 @@ const createContentEntryCrud = params => {
       validateEntries: true
     });
     const locale = getLocale();
-    const owner = getCreatedBy();
+    const identity = getSecurityIdentity();
     const {
       id,
       entryId,
       version
-    } = createEntryId(inputData);
+    } = createEntryId(rawInput);
     /**
      * There is a possibility that user sends an ID in the input, so we will use that one.
      * There is no check if the ID is unique or not, that is up to the user.
      */
+    const currentDate = new Date();
     const entry = {
       webinyVersion: context.WEBINY_VERSION,
       tenant: getTenant().id,
@@ -553,17 +558,18 @@ const createContentEntryCrud = params => {
       id,
       modelId: model.modelId,
       locale: locale.code,
-      createdOn: new Date().toISOString(),
-      savedOn: new Date().toISOString(),
-      createdBy: owner,
-      ownedBy: owner,
-      modifiedBy: null,
+      createdOn: (0, _date.getDate)(rawInput.createdOn, currentDate),
+      savedOn: (0, _date.getDate)(rawInput.savedOn, currentDate),
+      publishedOn: (0, _date.getDate)(rawInput.publishedOn),
+      createdBy: getIdentity(rawInput.createdBy, identity),
+      ownedBy: getIdentity(rawInput.ownedBy, identity),
+      modifiedBy: getIdentity(rawInput.modifiedBy, null),
       version,
       locked: false,
       status: STATUS_DRAFT,
       values: input,
       location: {
-        folderId: ((_inputData$wbyAco_loc = inputData.wbyAco_location) === null || _inputData$wbyAco_loc === void 0 ? void 0 : _inputData$wbyAco_loc.folderId) || _constants.ROOT_FOLDER
+        folderId: ((_rawInput$wbyAco_loca = rawInput.wbyAco_location) === null || _rawInput$wbyAco_loca === void 0 ? void 0 : _rawInput$wbyAco_loca.folderId) || _constants.ROOT_FOLDER
       }
     };
     let storageEntry = null;
@@ -600,7 +606,7 @@ const createContentEntryCrud = params => {
       });
     }
   };
-  const createEntryRevisionFrom = async (model, sourceId, inputData, options) => {
+  const createEntryRevisionFrom = async (model, sourceId, rawInput, options) => {
     await entriesPermissions.ensure({
       rwd: "w"
     });
@@ -611,7 +617,7 @@ const createContentEntryCrud = params => {
     /**
      * Make sure we only work with fields that are defined in the model.
      */
-    const input = mapAndCleanUpdatedInputData(model, inputData);
+    const input = mapAndCleanUpdatedInputData(model, rawInput);
 
     /**
      * Entries are identified by a common parent ID + Revision number.
@@ -650,25 +656,22 @@ const createContentEntryCrud = params => {
     await entriesPermissions.ensure({
       owns: originalEntry.createdBy
     });
-    const identity = getIdentity();
     const latestId = latestStorageEntry ? latestStorageEntry.id : sourceId;
     const {
       id,
       version: nextVersion
     } = increaseEntryIdVersion(latestId);
+    const currentDate = new Date();
     const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
       id,
       version: nextVersion,
-      savedOn: new Date().toISOString(),
-      createdOn: new Date().toISOString(),
-      createdBy: {
-        id: identity.id,
-        displayName: identity.displayName,
-        type: identity.type
-      },
-      modifiedBy: null,
+      savedOn: (0, _date.getDate)(rawInput.savedOn, currentDate),
+      createdOn: (0, _date.getDate)(rawInput.createdOn, currentDate),
+      publishedOn: (0, _date.getDate)(rawInput.publishedOn, originalEntry.publishedOn),
+      createdBy: getIdentity(rawInput.createdBy, originalEntry.createdBy),
+      modifiedBy: getIdentity(rawInput.modifiedBy, null),
+      ownedBy: getIdentity(rawInput.ownedBy, originalEntry.ownedBy),
       locked: false,
-      publishedOn: undefined,
       status: STATUS_DRAFT,
       values
     });
@@ -710,8 +713,8 @@ const createContentEntryCrud = params => {
       });
     }
   };
-  const updateEntry = async (model, id, inputData, metaInput, options) => {
-    var _inputData$wbyAco_loc2;
+  const updateEntry = async (model, id, rawInput, metaInput, options) => {
+    var _rawInput$wbyAco_loca2;
     await entriesPermissions.ensure({
       rwd: "w"
     });
@@ -722,7 +725,7 @@ const createContentEntryCrud = params => {
     /**
      * Make sure we only work with fields that are defined in the model.
      */
-    const input = mapAndCleanUpdatedInputData(model, inputData);
+    const input = mapAndCleanUpdatedInputData(model, rawInput);
 
     /**
      * The entry we are going to update.
@@ -754,6 +757,7 @@ const createContentEntryCrud = params => {
       input: initialValues,
       validateEntries: false
     });
+
     /**
      * If users wants to remove a key from meta values, they need to send meta key with the null value.
      */
@@ -762,13 +766,17 @@ const createContentEntryCrud = params => {
      * We always send the full entry to the hooks and storage operations update.
      */
     const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
-      savedOn: new Date().toISOString(),
-      modifiedBy: getCreatedBy(),
+      savedOn: (0, _date.getDate)(rawInput.savedOn, new Date()),
+      createdOn: (0, _date.getDate)(rawInput.createdOn, originalEntry.createdOn),
+      publishedOn: (0, _date.getDate)(rawInput.publishedOn, originalEntry.publishedOn),
+      createdBy: getIdentity(rawInput.createdBy, originalEntry.createdBy),
+      modifiedBy: getIdentity(rawInput.modifiedBy, getSecurityIdentity()),
+      ownedBy: getIdentity(rawInput.ownedBy, originalEntry.ownedBy),
       values,
       meta,
       status: transformEntryStatus(originalEntry.status)
     });
-    const folderId = (_inputData$wbyAco_loc2 = inputData.wbyAco_location) === null || _inputData$wbyAco_loc2 === void 0 ? void 0 : _inputData$wbyAco_loc2.folderId;
+    const folderId = (_rawInput$wbyAco_loca2 = rawInput.wbyAco_location) === null || _rawInput$wbyAco_loca2 === void 0 ? void 0 : _rawInput$wbyAco_loca2.folderId;
     if (folderId) {
       entry.location = {
         folderId
@@ -916,8 +924,8 @@ const createContentEntryCrud = params => {
     });
     const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
       status: STATUS_PUBLISHED,
-      publishedOn: originalEntry.publishedOn || new Date().toISOString(),
-      savedOn: new Date().toISOString(),
+      publishedOn: (0, _date.getDate)(originalEntry.publishedOn, new Date()),
+      savedOn: (0, _date.getDate)(originalEntry.savedOn, new Date()),
       webinyVersion: context.WEBINY_VERSION,
       values
     });
@@ -1164,7 +1172,7 @@ const createContentEntryCrud = params => {
       entry
     });
   };
-  const publishEntry = async (model, id) => {
+  const publishEntry = async (model, id, options) => {
     await entriesPermissions.ensure({
       pw: "p"
     });
@@ -1188,15 +1196,34 @@ const createContentEntryCrud = params => {
       entry: originalEntry
     });
     const currentDate = new Date().toISOString();
+    /**
+     * The existing functionality is to set the publishedOn date to the current date.
+     * Users can now choose to skip updating the publishedOn date - unless it is not set.
+     *
+     * Same logic goes for the savedOn date.
+     */
+    const {
+      updatePublishedOn = true,
+      updateSavedOn = true
+    } = options || {};
+    let publishedOn = originalEntry.publishedOn;
+    if (updatePublishedOn || !publishedOn) {
+      publishedOn = currentDate;
+    }
+    let savedOn = originalEntry.savedOn;
+    if (updateSavedOn || !savedOn) {
+      savedOn = currentDate;
+    }
     const entry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, originalEntry), {}, {
       status: STATUS_PUBLISHED,
       locked: true,
-      savedOn: currentDate,
-      publishedOn: currentDate
+      savedOn,
+      publishedOn
     });
     let storageEntry = null;
     try {
       await onEntryBeforePublish.publish({
+        original: originalEntry,
         entry,
         model
       });
@@ -1206,6 +1233,7 @@ const createContentEntryCrud = params => {
         storageEntry
       });
       await onEntryAfterPublish.publish({
+        original: originalEntry,
         entry,
         storageEntry: result,
         model
@@ -1213,6 +1241,7 @@ const createContentEntryCrud = params => {
       return entry;
     } catch (ex) {
       await onEntryPublishError.publish({
+        original: originalEntry,
         entry,
         model,
         error: ex
@@ -1299,7 +1328,7 @@ const createContentEntryCrud = params => {
      * Or if searching for the owner set that value - in the case that user can see other entries than their own.
      */
     if (await entriesPermissions.canAccessOnlyOwnRecords()) {
-      where.ownedBy = getIdentity().id;
+      where.ownedBy = getSecurityIdentity().id;
     }
 
     /**
@@ -1498,9 +1527,9 @@ const createContentEntryCrud = params => {
         return deleteMultipleEntries(model, ids);
       });
     },
-    async publishEntry(model, id) {
+    async publishEntry(model, id, options) {
       return context.benchmark.measure("headlessCms.crud.entries.publishEntry", async () => {
-        return publishEntry(model, id);
+        return publishEntry(model, id, options);
       });
     },
     async unpublishEntry(model, id) {