Merge remote-tracking branch 'origin/next' into stable

webiny · Jan 29, 2024 · 3846541 · 3846541
2 parents 1930393 + f494a04
commit 3846541
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 44 deletions.
diff --git a/packages/api-headless-cms/src/crud/contentEntry/entryDataFactories/createPublishEntryData.ts b/packages/api-headless-cms/src/crud/contentEntry/entryDataFactories/createPublishEntryData.ts
@@ -2,6 +2,8 @@ import { CmsContext, CmsEntry, CmsModel } from "~/types";
 import { STATUS_PUBLISHED } from "./statuses";
 import { SecurityIdentity } from "@webiny/api-security/types";
 import { validateModelEntryDataOrThrow } from "~/crud/contentEntry/entryDataValidation";
+import { getIdentity } from "~/utils/identity";
+import { getDate } from "~/utils/date";
 
 type CreatePublishEntryDataParams = {
     model: CmsModel;
@@ -38,30 +40,33 @@ export const createPublishEntryData = async ({
         /**
          * Entry-level meta fields. 👇
          */
-        createdOn: latestEntry.createdOn,
-        modifiedOn: currentDateTime,
-        savedOn: currentDateTime,
-        firstPublishedOn: latestEntry.firstPublishedOn || currentDateTime,
-        lastPublishedOn: currentDateTime,
-        createdBy: latestEntry.createdBy,
-        modifiedBy: currentIdentity,
-        savedBy: currentIdentity,
-        firstPublishedBy: latestEntry.firstPublishedBy || currentIdentity,
-        lastPublishedBy: currentIdentity,
+        createdOn: getDate(latestEntry.createdOn),
+        modifiedOn: getDate(currentDateTime),
+        savedOn: getDate(currentDateTime),
+        firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),
+        lastPublishedOn: getDate(currentDateTime),
+        createdBy: getIdentity(latestEntry.createdBy),
+        modifiedBy: getIdentity(currentIdentity),
+        savedBy: getIdentity(currentIdentity),
+        firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),
+        lastPublishedBy: getIdentity(currentIdentity),
 
         /**
          * Revision-level meta fields. 👇
          */
-        revisionCreatedOn: originalEntry.revisionCreatedOn,
-        revisionSavedOn: currentDateTime,
-        revisionModifiedOn: currentDateTime,
-        revisionFirstPublishedOn: originalEntry.revisionFirstPublishedOn || currentDateTime,
-        revisionLastPublishedOn: currentDateTime,
-        revisionCreatedBy: originalEntry.revisionCreatedBy,
-        revisionSavedBy: currentIdentity,
-        revisionModifiedBy: currentIdentity,
-        revisionFirstPublishedBy: originalEntry.revisionFirstPublishedBy || currentIdentity,
-        revisionLastPublishedBy: currentIdentity
+        revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),
+        revisionSavedOn: getDate(currentDateTime),
+        revisionModifiedOn: getDate(currentDateTime),
+        revisionFirstPublishedOn: getDate(originalEntry.revisionFirstPublishedOn, currentDateTime),
+        revisionLastPublishedOn: getDate(currentDateTime),
+        revisionCreatedBy: getIdentity(originalEntry.revisionCreatedBy),
+        revisionSavedBy: getIdentity(currentIdentity),
+        revisionModifiedBy: getIdentity(currentIdentity),
+        revisionFirstPublishedBy: getIdentity(
+            originalEntry.revisionFirstPublishedBy,
+            currentIdentity
+        ),
+        revisionLastPublishedBy: getIdentity(currentIdentity)
     };
 
     return { entry };

diff --git a/...ges/api-headless-cms/src/crud/contentEntry/entryDataFactories/createRepublishEntryData.ts b/...ges/api-headless-cms/src/crud/contentEntry/entryDataFactories/createRepublishEntryData.ts
@@ -2,6 +2,8 @@ import { CmsContext, CmsEntry, CmsModel } from "~/types";
 import { referenceFieldsMapping } from "~/crud/contentEntry/referenceFieldsMapping";
 import { STATUS_PUBLISHED } from "./statuses";
 import { SecurityIdentity } from "@webiny/api-security/types";
+import { getIdentity } from "~/utils/identity";
+import { getDate } from "~/utils/date";
 
 type CreateRepublishEntryDataParams = {
     model: CmsModel;
@@ -35,26 +37,29 @@ export const createRepublishEntryData = async ({
         /**
          * Entry-level meta fields. 👇
          */
-        savedOn: currentDateTime,
-        modifiedOn: currentDateTime,
-        savedBy: currentIdentity,
-        modifiedBy: currentIdentity,
-        firstPublishedOn: originalEntry.firstPublishedOn || currentDateTime,
-        firstPublishedBy: originalEntry.firstPublishedBy || currentIdentity,
-        lastPublishedOn: currentDateTime,
-        lastPublishedBy: currentIdentity,
+        savedOn: getDate(currentDateTime),
+        modifiedOn: getDate(currentDateTime),
+        savedBy: getIdentity(currentIdentity),
+        modifiedBy: getIdentity(currentIdentity),
+        firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),
+        firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),
+        lastPublishedOn: getDate(currentDateTime),
+        lastPublishedBy: getIdentity(currentIdentity),
 
         /**
          * Revision-level meta fields. 👇
          */
-        revisionSavedOn: currentDateTime,
-        revisionModifiedOn: currentDateTime,
-        revisionSavedBy: currentIdentity,
-        revisionModifiedBy: currentIdentity,
-        revisionFirstPublishedOn: originalEntry.revisionFirstPublishedOn || currentDateTime,
-        revisionFirstPublishedBy: originalEntry.revisionFirstPublishedBy || currentIdentity,
-        revisionLastPublishedOn: currentDateTime,
-        revisionLastPublishedBy: currentIdentity,
+        revisionSavedOn: getDate(currentDateTime),
+        revisionModifiedOn: getDate(currentDateTime),
+        revisionSavedBy: getIdentity(currentIdentity),
+        revisionModifiedBy: getIdentity(currentIdentity),
+        revisionFirstPublishedOn: getDate(originalEntry.revisionFirstPublishedOn, currentDateTime),
+        revisionFirstPublishedBy: getIdentity(
+            originalEntry.revisionFirstPublishedBy,
+            currentIdentity
+        ),
+        revisionLastPublishedOn: getDate(currentDateTime),
+        revisionLastPublishedBy: getIdentity(currentIdentity),
 
         webinyVersion: context.WEBINY_VERSION,
         values

diff --git a/...ges/api-headless-cms/src/crud/contentEntry/entryDataFactories/createUnpublishEntryData.ts b/...ges/api-headless-cms/src/crud/contentEntry/entryDataFactories/createUnpublishEntryData.ts
@@ -1,6 +1,8 @@
 import { CmsContext, CmsEntry, CmsModel } from "~/types";
 import { STATUS_UNPUBLISHED } from "./statuses";
 import { SecurityIdentity } from "@webiny/api-security/types";
+import { getIdentity } from "~/utils/identity";
+import { getDate } from "~/utils/date";
 
 type CreateRepublishEntryDataParams = {
     model: CmsModel;
@@ -25,18 +27,18 @@ export const createUnpublishEntryData = async ({
         /**
          * Entry-level meta fields. 👇
          */
-        savedOn: currentDateTime,
-        modifiedOn: currentDateTime,
-        savedBy: currentIdentity,
-        modifiedBy: currentIdentity,
+        savedOn: getDate(currentDateTime),
+        modifiedOn: getDate(currentDateTime),
+        savedBy: getIdentity(currentIdentity),
+        modifiedBy: getIdentity(currentIdentity),
 
         /**
          * Revision-level meta fields. 👇
          */
-        revisionSavedOn: currentDateTime,
-        revisionModifiedOn: currentDateTime,
-        revisionSavedBy: currentIdentity,
-        revisionModifiedBy: currentIdentity
+        revisionSavedOn: getDate(currentDateTime),
+        revisionModifiedOn: getDate(currentDateTime),
+        revisionSavedBy: getIdentity(currentIdentity),
+        revisionModifiedBy: getIdentity(currentIdentity)
     };
 
     return { entry };