@webiny/api-headless-cms 0.0.0-unstable.de38392959 → 0.0.0-unstable.df7a8bb475

package/crud/contentEntry/entryDataFactories/createEntryRevisionFromData.d.ts

@@ -1,21 +1,22 @@
-import { CmsContext, CmsEntry, CmsModel, CreateCmsEntryInput, CreateCmsEntryOptionsInput } from "../../../types";
-import { SecurityIdentity } from "@webiny/api-security/types";
-import { Tenant } from "@webiny/api-tenancy/types";
-import { I18NLocale } from "@webiny/api-i18n/types";
-declare type CreateEntryRevisionFromDataParams = {
+import type { CmsContext, CmsEntry, CmsEntryValues, CmsModel, CreateCmsEntryInput, CreateCmsEntryOptionsInput } from "../../../types/index.js";
+import type { SecurityIdentity } from "@webiny/api-core/types/security.js";
+import type { Tenant } from "@webiny/api-core/types/tenancy.js";
+import type { AccessControl } from "../../../crud/AccessControl/AccessControl.js";
+interface CreateEntryRevisionFromDataParams<TValues extends CmsEntryValues = CmsEntryValues> {
     sourceId: string;
     model: CmsModel;
-    rawInput: CreateCmsEntryInput;
+    rawInput: CreateCmsEntryInput<TValues>;
     options?: CreateCmsEntryOptionsInput;
     context: CmsContext;
     getIdentity: () => SecurityIdentity;
     getTenant: () => Tenant;
-    getLocale: () => I18NLocale;
-    originalEntry: CmsEntry;
-    latestStorageEntry: CmsEntry;
-};
-export declare const createEntryRevisionFromData: ({ sourceId, model, rawInput, options, context, getIdentity: getSecurityIdentity, originalEntry, latestStorageEntry }: CreateEntryRevisionFromDataParams) => Promise<{
-    entry: CmsEntry;
-    input: Record<string, any>;
-}>;
+    originalEntry: CmsEntry<TValues>;
+    latestStorageEntry: CmsEntry<TValues>;
+    accessControl: AccessControl;
+}
+interface ICreateEntryRevisionFromDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
+    entry: CmsEntry<TValues>;
+    input: CreateCmsEntryInput<TValues>;
+}
+export declare const createEntryRevisionFromData: <TValues extends CmsEntryValues = CmsEntryValues>({ sourceId, model, rawInput, options, context, getIdentity: getSecurityIdentity, originalEntry, latestStorageEntry, accessControl }: CreateEntryRevisionFromDataParams<TValues>) => Promise<ICreateEntryRevisionFromDataResponse<TValues>>;
 export {};

package/crud/contentEntry/entryDataFactories/createEntryRevisionFromData.js

@@ -1,19 +1,13 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createEntryRevisionFromData = void 0;
-var _date = require("../../../utils/date");
-var _identity = require("../../../utils/identity");
-var _mapAndCleanUpdatedInputData = require(".//mapAndCleanUpdatedInputData");
-var _entryDataValidation = require("../entryDataValidation");
-var _referenceFieldsMapping = require("../referenceFieldsMapping");
-var _utils = require("@webiny/utils");
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _statuses = require("./statuses");
-const createEntryRevisionFromData = async ({
+import { getDate } from "../../../utils/date.js";
+import { getIdentity } from "../../../utils/identity.js";
+import { mapAndCleanUpdatedInputData } from ".//mapAndCleanUpdatedInputData.js";
+import { validateModelEntryDataOrThrow } from "../entryDataValidation.js";
+import { referenceFieldsMapping } from "../referenceFieldsMapping.js";
+import { createIdentifier, parseIdentifier } from "@webiny/utils";
+import WebinyError from "@webiny/error";
+import { STATUS_DRAFT, STATUS_PUBLISHED, STATUS_UNPUBLISHED } from "./statuses.js";
+import { getState } from "./state.js";
+export const createEntryRevisionFromData = async ({
   sourceId,
   model,
   rawInput,
@@ -21,27 +15,29 @@ const createEntryRevisionFromData = async ({
   context,
   getIdentity: getSecurityIdentity,
   originalEntry,
-  latestStorageEntry
+  latestStorageEntry,
+  accessControl
 }) => {
   /**
    * Make sure we only work with fields that are defined in the model.
+   *
+   * Also, we can be certain to cast as TValues because originalValues and new ones are being merged.
    */
-  const input = (0, _mapAndCleanUpdatedInputData.mapAndCleanUpdatedInputData)(model, rawInput);
   const initialValues = {
     ...originalEntry.values,
-    ...input
+    ...mapAndCleanUpdatedInputData(model, rawInput.values)
   };
-  await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
+  await validateModelEntryDataOrThrow({
     context,
     model,
-    data: initialValues,
+    values: initialValues,
     entry: originalEntry,
     skipValidators: options?.skipValidators
   });
-  const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
+  const values = await referenceFieldsMapping({
     context,
     model,
-    input: initialValues,
+    values: initialValues,
     validateEntries: false
   });
   const latestId = latestStorageEntry ? latestStorageEntry.id : sourceId;
@@ -51,6 +47,54 @@ const createEntryRevisionFromData = async ({
   } = increaseEntryIdVersion(latestId);
   const currentIdentity = getSecurityIdentity();
   const currentDateTime = new Date();
+
+  /**
+   * Users can set the initial status of the entry. If so, we need to make
+   * sure they have the required permissions and also that all the fields
+   * are filled in correctly.
+   */
+  const status = rawInput.status || STATUS_DRAFT;
+  if (status !== STATUS_DRAFT) {
+    if (status === STATUS_PUBLISHED) {
+      await accessControl.ensureCanAccessEntry({
+        model,
+        pw: "p"
+      });
+    } else if (status === STATUS_UNPUBLISHED) {
+      // If setting the status other than draft, we have to check if the user has permissions to publish.
+      await accessControl.ensureCanAccessEntry({
+        model,
+        pw: "u"
+      });
+    }
+  }
+  const locked = status !== STATUS_DRAFT;
+  let revisionLevelPublishingMetaFields = {
+    revisionFirstPublishedOn: getDate(rawInput.revisionFirstPublishedOn, null),
+    revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, null),
+    revisionFirstPublishedBy: getIdentity(rawInput.revisionFirstPublishedBy, null),
+    revisionLastPublishedBy: getIdentity(rawInput.revisionLastPublishedBy, null)
+  };
+  let entryLevelPublishingMetaFields = {
+    firstPublishedOn: getDate(rawInput.firstPublishedOn, latestStorageEntry.firstPublishedOn),
+    lastPublishedOn: getDate(rawInput.lastPublishedOn, latestStorageEntry.lastPublishedOn),
+    firstPublishedBy: getIdentity(rawInput.firstPublishedBy, latestStorageEntry.firstPublishedBy),
+    lastPublishedBy: getIdentity(rawInput.lastPublishedBy, latestStorageEntry.lastPublishedBy)
+  };
+  if (status === STATUS_PUBLISHED) {
+    revisionLevelPublishingMetaFields = {
+      revisionFirstPublishedOn: getDate(rawInput.revisionFirstPublishedOn, currentDateTime),
+      revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, currentDateTime),
+      revisionFirstPublishedBy: getIdentity(rawInput.revisionFirstPublishedBy, currentIdentity),
+      revisionLastPublishedBy: getIdentity(rawInput.revisionLastPublishedBy, currentIdentity)
+    };
+    entryLevelPublishingMetaFields = {
+      firstPublishedOn: getDate(rawInput.firstPublishedOn, latestStorageEntry.firstPublishedOn),
+      lastPublishedOn: getDate(rawInput.lastPublishedOn, currentDateTime),
+      firstPublishedBy: getIdentity(rawInput.firstPublishedBy, latestStorageEntry.firstPublishedBy),
+      lastPublishedBy: getIdentity(rawInput.lastPublishedBy, currentIdentity)
+    };
+  }
   const entry = {
     ...originalEntry,
     id,
@@ -58,53 +102,53 @@ const createEntryRevisionFromData = async ({
     /**
      * Entry-level meta fields. 👇
      */
-    createdOn: (0, _date.getDate)(rawInput.createdOn, latestStorageEntry.createdOn),
-    savedOn: (0, _date.getDate)(rawInput.savedOn, currentDateTime),
-    modifiedOn: (0, _date.getDate)(rawInput.modifiedOn, currentDateTime),
-    firstPublishedOn: (0, _date.getDate)(rawInput.firstPublishedOn, latestStorageEntry.firstPublishedOn),
-    lastPublishedOn: (0, _date.getDate)(rawInput.lastPublishedOn, latestStorageEntry.lastPublishedOn),
-    createdBy: (0, _identity.getIdentity)(rawInput.createdBy, latestStorageEntry.createdBy),
-    savedBy: (0, _identity.getIdentity)(rawInput.savedBy, currentIdentity),
-    modifiedBy: (0, _identity.getIdentity)(rawInput.modifiedBy, currentIdentity),
-    firstPublishedBy: (0, _identity.getIdentity)(rawInput.firstPublishedBy, latestStorageEntry.firstPublishedBy),
-    lastPublishedBy: (0, _identity.getIdentity)(rawInput.lastPublishedBy, latestStorageEntry.lastPublishedBy),
+    createdOn: getDate(rawInput.createdOn, latestStorageEntry.createdOn),
+    savedOn: getDate(rawInput.savedOn, currentDateTime),
+    modifiedOn: getDate(rawInput.modifiedOn, currentDateTime),
+    createdBy: getIdentity(rawInput.createdBy, latestStorageEntry.createdBy),
+    savedBy: getIdentity(rawInput.savedBy, currentIdentity),
+    modifiedBy: getIdentity(rawInput.modifiedBy, currentIdentity),
+    ...entryLevelPublishingMetaFields,
     /**
      * Revision-level meta fields. 👇
      */
-    revisionCreatedOn: (0, _date.getDate)(rawInput.revisionCreatedOn, currentDateTime),
-    revisionSavedOn: (0, _date.getDate)(rawInput.revisionSavedOn, currentDateTime),
-    revisionModifiedOn: (0, _date.getDate)(rawInput.revisionModifiedOn, null),
-    revisionFirstPublishedOn: (0, _date.getDate)(rawInput.revisionFirstPublishedOn, null),
-    revisionLastPublishedOn: (0, _date.getDate)(rawInput.revisionLastPublishedOn, null),
-    revisionCreatedBy: (0, _identity.getIdentity)(rawInput.revisionCreatedBy, currentIdentity),
-    revisionSavedBy: (0, _identity.getIdentity)(rawInput.revisionSavedBy, currentIdentity),
-    revisionModifiedBy: (0, _identity.getIdentity)(rawInput.revisionModifiedBy, null),
-    revisionFirstPublishedBy: (0, _identity.getIdentity)(rawInput.revisionFirstPublishedBy, null),
-    revisionLastPublishedBy: (0, _identity.getIdentity)(rawInput.revisionLastPublishedBy, null),
-    locked: false,
-    status: _statuses.STATUS_DRAFT,
-    values
+    revisionCreatedOn: getDate(rawInput.revisionCreatedOn, currentDateTime),
+    revisionSavedOn: getDate(rawInput.revisionSavedOn, currentDateTime),
+    revisionModifiedOn: getDate(rawInput.revisionModifiedOn, null),
+    revisionCreatedBy: getIdentity(rawInput.revisionCreatedBy, currentIdentity),
+    revisionSavedBy: getIdentity(rawInput.revisionSavedBy, currentIdentity),
+    revisionModifiedBy: getIdentity(rawInput.revisionModifiedBy, null),
+    ...revisionLevelPublishingMetaFields,
+    locked,
+    status,
+    values,
+    state: getState({
+      input: rawInput,
+      original: originalEntry
+    })
   };
   return {
     entry,
-    input
+    input: {
+      ...rawInput,
+      values: structuredClone(values)
+    }
   };
 };
-exports.createEntryRevisionFromData = createEntryRevisionFromData;
 const increaseEntryIdVersion = id => {
   const {
     id: entryId,
     version
-  } = (0, _utils.parseIdentifier)(id);
+  } = parseIdentifier(id);
   if (!version) {
-    throw new _error.default("Cannot increase version on the ID without the version part.", "WRONG_ID", {
+    throw new WebinyError("Cannot increase version on the ID without the version part.", "WRONG_ID", {
       id
     });
   }
   return {
     entryId,
     version: version + 1,
-    id: (0, _utils.createIdentifier)({
+    id: createIdentifier({
       id: entryId,
       version: version + 1
     })

package/crud/contentEntry/entryDataFactories/createEntryRevisionFromData.js.map

@@ -1 +1 @@
-{"version":3,"names":["_date","require","_identity","_mapAndCleanUpdatedInputData","_entryDataValidation","_referenceFieldsMapping","_utils","_error","_interopRequireDefault","_statuses","createEntryRevisionFromData","sourceId","model","rawInput","options","context","getIdentity","getSecurityIdentity","originalEntry","latestStorageEntry","input","mapAndCleanUpdatedInputData","initialValues","values","validateModelEntryDataOrThrow","data","entry","skipValidators","referenceFieldsMapping","validateEntries","latestId","id","version","nextVersion","increaseEntryIdVersion","currentIdentity","currentDateTime","Date","createdOn","getDate","savedOn","modifiedOn","firstPublishedOn","lastPublishedOn","createdBy","savedBy","modifiedBy","firstPublishedBy","lastPublishedBy","revisionCreatedOn","revisionSavedOn","revisionModifiedOn","revisionFirstPublishedOn","revisionLastPublishedOn","revisionCreatedBy","revisionSavedBy","revisionModifiedBy","revisionFirstPublishedBy","revisionLastPublishedBy","locked","status","STATUS_DRAFT","exports","entryId","parseIdentifier","WebinyError","createIdentifier"],"sources":["createEntryRevisionFromData.ts"],"sourcesContent":["import {\n    CmsContext,\n    CmsEntry,\n    CmsModel,\n    CreateCmsEntryInput,\n    CreateCmsEntryOptionsInput\n} from \"~/types\";\nimport { getDate } from \"~/utils/date\";\nimport { getIdentity } from \"~/utils/identity\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { Tenant } from \"@webiny/api-tenancy/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { mapAndCleanUpdatedInputData } from \".//mapAndCleanUpdatedInputData\";\nimport { validateModelEntryDataOrThrow } from \"../entryDataValidation\";\nimport { referenceFieldsMapping } from \"../referenceFieldsMapping\";\nimport { createIdentifier, parseIdentifier } from \"@webiny/utils\";\nimport WebinyError from \"@webiny/error\";\nimport { STATUS_DRAFT } from \"./statuses\";\n\ntype CreateEntryRevisionFromDataParams = {\n    sourceId: string;\n    model: CmsModel;\n    rawInput: CreateCmsEntryInput;\n    options?: CreateCmsEntryOptionsInput;\n    context: CmsContext;\n    getIdentity: () => SecurityIdentity;\n    getTenant: () => Tenant;\n    getLocale: () => I18NLocale;\n    originalEntry: CmsEntry;\n    latestStorageEntry: CmsEntry;\n};\n\nexport const createEntryRevisionFromData = async ({\n    sourceId,\n    model,\n    rawInput,\n    options,\n    context,\n    getIdentity: getSecurityIdentity,\n    originalEntry,\n    latestStorageEntry\n}: CreateEntryRevisionFromDataParams): Promise<{\n    entry: CmsEntry;\n    input: Record<string, any>;\n}> => {\n    /**\n     * Make sure we only work with fields that are defined in the model.\n     */\n    const input = mapAndCleanUpdatedInputData(model, rawInput);\n\n    const initialValues = {\n        ...originalEntry.values,\n        ...input\n    };\n\n    await validateModelEntryDataOrThrow({\n        context,\n        model,\n        data: initialValues,\n        entry: originalEntry,\n        skipValidators: options?.skipValidators\n    });\n\n    const values = await referenceFieldsMapping({\n        context,\n        model,\n        input: initialValues,\n        validateEntries: false\n    });\n\n    const latestId = latestStorageEntry ? latestStorageEntry.id : sourceId;\n    const { id, version: nextVersion } = increaseEntryIdVersion(latestId);\n\n    const currentIdentity = getSecurityIdentity();\n    const currentDateTime = new Date();\n\n    const entry: CmsEntry = {\n        ...originalEntry,\n        id,\n        version: nextVersion,\n\n        /**\n         * Entry-level meta fields. 👇\n         */\n        createdOn: getDate(rawInput.createdOn, latestStorageEntry.createdOn),\n        savedOn: getDate(rawInput.savedOn, currentDateTime),\n        modifiedOn: getDate(rawInput.modifiedOn, currentDateTime),\n        firstPublishedOn: getDate(rawInput.firstPublishedOn, latestStorageEntry.firstPublishedOn),\n        lastPublishedOn: getDate(rawInput.lastPublishedOn, latestStorageEntry.lastPublishedOn),\n        createdBy: getIdentity(rawInput.createdBy, latestStorageEntry.createdBy),\n        savedBy: getIdentity(rawInput.savedBy, currentIdentity),\n        modifiedBy: getIdentity(rawInput.modifiedBy, currentIdentity),\n        firstPublishedBy: getIdentity(\n            rawInput.firstPublishedBy,\n            latestStorageEntry.firstPublishedBy\n        ),\n        lastPublishedBy: getIdentity(rawInput.lastPublishedBy, latestStorageEntry.lastPublishedBy),\n\n        /**\n         * Revision-level meta fields. 👇\n         */\n        revisionCreatedOn: getDate(rawInput.revisionCreatedOn, currentDateTime),\n        revisionSavedOn: getDate(rawInput.revisionSavedOn, currentDateTime),\n        revisionModifiedOn: getDate(rawInput.revisionModifiedOn, null),\n        revisionFirstPublishedOn: getDate(rawInput.revisionFirstPublishedOn, null),\n        revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, null),\n        revisionCreatedBy: getIdentity(rawInput.revisionCreatedBy, currentIdentity),\n        revisionSavedBy: getIdentity(rawInput.revisionSavedBy, currentIdentity),\n        revisionModifiedBy: getIdentity(rawInput.revisionModifiedBy, null),\n        revisionFirstPublishedBy: getIdentity(rawInput.revisionFirstPublishedBy, null),\n        revisionLastPublishedBy: getIdentity(rawInput.revisionLastPublishedBy, null),\n\n        locked: false,\n        status: STATUS_DRAFT,\n        values\n    };\n\n    return { entry, input };\n};\n\nconst increaseEntryIdVersion = (id: string) => {\n    const { id: entryId, version } = parseIdentifier(id);\n    if (!version) {\n        throw new WebinyError(\n            \"Cannot increase version on the ID without the version part.\",\n            \"WRONG_ID\",\n            {\n                id\n            }\n        );\n    }\n    return {\n        entryId,\n        version: version + 1,\n        id: createIdentifier({\n            id: entryId,\n            version: version + 1\n        })\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["getDate","getIdentity","mapAndCleanUpdatedInputData","validateModelEntryDataOrThrow","referenceFieldsMapping","createIdentifier","parseIdentifier","WebinyError","STATUS_DRAFT","STATUS_PUBLISHED","STATUS_UNPUBLISHED","getState","createEntryRevisionFromData","sourceId","model","rawInput","options","context","getSecurityIdentity","originalEntry","latestStorageEntry","accessControl","initialValues","values","entry","skipValidators","validateEntries","latestId","id","version","nextVersion","increaseEntryIdVersion","currentIdentity","currentDateTime","Date","status","ensureCanAccessEntry","pw","locked","revisionLevelPublishingMetaFields","revisionFirstPublishedOn","revisionLastPublishedOn","revisionFirstPublishedBy","revisionLastPublishedBy","entryLevelPublishingMetaFields","firstPublishedOn","lastPublishedOn","firstPublishedBy","lastPublishedBy","createdOn","savedOn","modifiedOn","createdBy","savedBy","modifiedBy","revisionCreatedOn","revisionSavedOn","revisionModifiedOn","revisionCreatedBy","revisionSavedBy","revisionModifiedBy","state","input","original","structuredClone","entryId"],"sources":["createEntryRevisionFromData.ts"],"sourcesContent":["import type {\n    CmsContext,\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CreateCmsEntryInput,\n    CreateCmsEntryOptionsInput\n} from \"~/types/index.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { mapAndCleanUpdatedInputData } from \".//mapAndCleanUpdatedInputData.js\";\nimport { validateModelEntryDataOrThrow } from \"../entryDataValidation.js\";\nimport { referenceFieldsMapping } from \"../referenceFieldsMapping.js\";\nimport { createIdentifier, parseIdentifier } from \"@webiny/utils\";\nimport WebinyError from \"@webiny/error\";\nimport type { SecurityIdentity } from \"@webiny/api-core/types/security.js\";\nimport type { Tenant } from \"@webiny/api-core/types/tenancy.js\";\nimport { STATUS_DRAFT, STATUS_PUBLISHED, STATUS_UNPUBLISHED } from \"./statuses.js\";\nimport type { AccessControl } from \"~/crud/AccessControl/AccessControl.js\";\nimport { getState } from \"./state.js\";\n\ninterface CreateEntryRevisionFromDataParams<TValues extends CmsEntryValues = CmsEntryValues> {\n    sourceId: string;\n    model: CmsModel;\n    rawInput: CreateCmsEntryInput<TValues>;\n    options?: CreateCmsEntryOptionsInput;\n    context: CmsContext;\n    getIdentity: () => SecurityIdentity;\n    getTenant: () => Tenant;\n    originalEntry: CmsEntry<TValues>;\n    latestStorageEntry: CmsEntry<TValues>;\n    accessControl: AccessControl;\n}\n\ninterface ICreateEntryRevisionFromDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<TValues>;\n    input: CreateCmsEntryInput<TValues>;\n}\n\nexport const createEntryRevisionFromData = async <TValues extends CmsEntryValues = CmsEntryValues>({\n    sourceId,\n    model,\n    rawInput,\n    options,\n    context,\n    getIdentity: getSecurityIdentity,\n    originalEntry,\n    latestStorageEntry,\n    accessControl\n}: CreateEntryRevisionFromDataParams<TValues>): Promise<\n    ICreateEntryRevisionFromDataResponse<TValues>\n> => {\n    /**\n     * Make sure we only work with fields that are defined in the model.\n     *\n     * Also, we can be certain to cast as TValues because originalValues and new ones are being merged.\n     */\n    const initialValues = {\n        ...originalEntry.values,\n        ...mapAndCleanUpdatedInputData<TValues>(model, rawInput.values)\n    };\n\n    await validateModelEntryDataOrThrow({\n        context,\n        model,\n        values: initialValues,\n        entry: originalEntry,\n        skipValidators: options?.skipValidators\n    });\n\n    const values = await referenceFieldsMapping<TValues>({\n        context,\n        model,\n        values: initialValues,\n        validateEntries: false\n    });\n\n    const latestId = latestStorageEntry ? latestStorageEntry.id : sourceId;\n    const { id, version: nextVersion } = increaseEntryIdVersion(latestId);\n\n    const currentIdentity = getSecurityIdentity();\n    const currentDateTime = new Date();\n\n    /**\n     * Users can set the initial status of the entry. If so, we need to make\n     * sure they have the required permissions and also that all the fields\n     * are filled in correctly.\n     */\n    const status = rawInput.status || STATUS_DRAFT;\n    if (status !== STATUS_DRAFT) {\n        if (status === STATUS_PUBLISHED) {\n            await accessControl.ensureCanAccessEntry({ model, pw: \"p\" });\n        } else if (status === STATUS_UNPUBLISHED) {\n            // If setting the status other than draft, we have to check if the user has permissions to publish.\n            await accessControl.ensureCanAccessEntry({ model, pw: \"u\" });\n        }\n    }\n\n    const locked = status !== STATUS_DRAFT;\n\n    let revisionLevelPublishingMetaFields: Pick<\n        CmsEntry,\n        | \"revisionFirstPublishedOn\"\n        | \"revisionLastPublishedOn\"\n        | \"revisionFirstPublishedBy\"\n        | \"revisionLastPublishedBy\"\n    > = {\n        revisionFirstPublishedOn: getDate(rawInput.revisionFirstPublishedOn, null),\n        revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, null),\n        revisionFirstPublishedBy: getIdentity(rawInput.revisionFirstPublishedBy, null),\n        revisionLastPublishedBy: getIdentity(rawInput.revisionLastPublishedBy, null)\n    };\n\n    let entryLevelPublishingMetaFields: Pick<\n        CmsEntry,\n        \"firstPublishedOn\" | \"lastPublishedOn\" | \"firstPublishedBy\" | \"lastPublishedBy\"\n    > = {\n        firstPublishedOn: getDate(rawInput.firstPublishedOn, latestStorageEntry.firstPublishedOn),\n        lastPublishedOn: getDate(rawInput.lastPublishedOn, latestStorageEntry.lastPublishedOn),\n        firstPublishedBy: getIdentity(\n            rawInput.firstPublishedBy,\n            latestStorageEntry.firstPublishedBy\n        ),\n        lastPublishedBy: getIdentity(rawInput.lastPublishedBy, latestStorageEntry.lastPublishedBy)\n    };\n\n    if (status === STATUS_PUBLISHED) {\n        revisionLevelPublishingMetaFields = {\n            revisionFirstPublishedOn: getDate(rawInput.revisionFirstPublishedOn, currentDateTime),\n            revisionLastPublishedOn: getDate(rawInput.revisionLastPublishedOn, currentDateTime),\n            revisionFirstPublishedBy: getIdentity(\n                rawInput.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedBy: getIdentity(rawInput.revisionLastPublishedBy, currentIdentity)\n        };\n\n        entryLevelPublishingMetaFields = {\n            firstPublishedOn: getDate(\n                rawInput.firstPublishedOn,\n                latestStorageEntry.firstPublishedOn\n            ),\n            lastPublishedOn: getDate(rawInput.lastPublishedOn, currentDateTime),\n            firstPublishedBy: getIdentity(\n                rawInput.firstPublishedBy,\n                latestStorageEntry.firstPublishedBy\n            ),\n            lastPublishedBy: getIdentity(rawInput.lastPublishedBy, currentIdentity)\n        };\n    }\n\n    const entry: CmsEntry<TValues> = {\n        ...originalEntry,\n        id,\n        version: nextVersion,\n\n        /**\n         * Entry-level meta fields. 👇\n         */\n        createdOn: getDate(rawInput.createdOn, latestStorageEntry.createdOn),\n        savedOn: getDate(rawInput.savedOn, currentDateTime),\n        modifiedOn: getDate(rawInput.modifiedOn, currentDateTime),\n        createdBy: getIdentity(rawInput.createdBy, latestStorageEntry.createdBy)!,\n        savedBy: getIdentity(rawInput.savedBy, currentIdentity)!,\n        modifiedBy: getIdentity(rawInput.modifiedBy, currentIdentity),\n        ...entryLevelPublishingMetaFields,\n\n        /**\n         * Revision-level meta fields. 👇\n         */\n        revisionCreatedOn: getDate(rawInput.revisionCreatedOn, currentDateTime),\n        revisionSavedOn: getDate(rawInput.revisionSavedOn, currentDateTime),\n        revisionModifiedOn: getDate(rawInput.revisionModifiedOn, null),\n        revisionCreatedBy: getIdentity(rawInput.revisionCreatedBy, currentIdentity)!,\n        revisionSavedBy: getIdentity(rawInput.revisionSavedBy, currentIdentity)!,\n        revisionModifiedBy: getIdentity(rawInput.revisionModifiedBy, null),\n        ...revisionLevelPublishingMetaFields,\n\n        locked,\n        status,\n        values,\n        state: getState({\n            input: rawInput,\n            original: originalEntry\n        })\n    };\n\n    return {\n        entry,\n        input: {\n            ...rawInput,\n            values: structuredClone(values)\n        }\n    };\n};\n\nconst increaseEntryIdVersion = (id: string) => {\n    const { id: entryId, version } = parseIdentifier(id);\n    if (!version) {\n        throw new WebinyError(\n            \"Cannot increase version on the ID without the version part.\",\n            \"WRONG_ID\",\n            {\n                id\n            }\n        );\n    }\n    return {\n        entryId,\n        version: version + 1,\n        id: createIdentifier({\n            id: entryId,\n            version: version + 1\n        })\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/crud/contentEntry/entryDataFactories/createPublishEntryData.d.ts

@@ -1,13 +1,14 @@
-import { CmsContext, CmsEntry, CmsModel } from "../../../types";
-import { SecurityIdentity } from "@webiny/api-security/types";
-declare type CreatePublishEntryDataParams = {
+import type { CmsContext, CmsEntry, CmsEntryValues, CmsModel } from "../../../types/index.js";
+import type { SecurityIdentity } from "@webiny/api-core/types/security.js";
+interface ICreatePublishEntryDataParams<TValues extends CmsEntryValues = CmsEntryValues> {
     model: CmsModel;
     context: CmsContext;
     getIdentity: () => SecurityIdentity;
-    originalEntry: CmsEntry;
-    latestEntry: CmsEntry;
-};
-export declare const createPublishEntryData: ({ model, context, getIdentity: getSecurityIdentity, originalEntry, latestEntry }: CreatePublishEntryDataParams) => Promise<{
-    entry: CmsEntry;
-}>;
+    originalEntry: CmsEntry<TValues>;
+    latestEntry: CmsEntry<TValues>;
+}
+interface ICreatePublishEntryDataResponse<T extends CmsEntryValues = CmsEntryValues> {
+    entry: CmsEntry<T>;
+}
+export declare const createPublishEntryData: <T extends CmsEntryValues = CmsEntryValues>({ model, context, getIdentity: getSecurityIdentity, originalEntry, latestEntry }: ICreatePublishEntryDataParams<T>) => Promise<ICreatePublishEntryDataResponse<T>>;
 export {};

package/crud/contentEntry/entryDataFactories/createPublishEntryData.js

@@ -1,61 +1,56 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createPublishEntryData = void 0;
-var _statuses = require("./statuses");
-var _entryDataValidation = require("../entryDataValidation");
-const createPublishEntryData = async ({
+import { STATUS_PUBLISHED } from "./statuses.js";
+import { validateModelEntryDataOrThrow } from "../entryDataValidation.js";
+import { getIdentity } from "../../../utils/identity.js";
+import { getDate } from "../../../utils/date.js";
+export const createPublishEntryData = async ({
   model,
   context,
   getIdentity: getSecurityIdentity,
   originalEntry,
   latestEntry
 }) => {
-  await (0, _entryDataValidation.validateModelEntryDataOrThrow)({
+  await validateModelEntryDataOrThrow({
     context,
     model,
-    data: originalEntry.values,
+    values: originalEntry.values,
     entry: originalEntry
   });
   const currentDateTime = new Date().toISOString();
   const currentIdentity = getSecurityIdentity();
   const entry = {
     ...originalEntry,
-    status: _statuses.STATUS_PUBLISHED,
+    status: STATUS_PUBLISHED,
     locked: true,
     /**
      * 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
   };
 };
-exports.createPublishEntryData = createPublishEntryData;
 
 //# sourceMappingURL=createPublishEntryData.js.map

package/crud/contentEntry/entryDataFactories/createPublishEntryData.js.map

@@ -1 +1 @@
-{"version":3,"names":["_statuses","require","_entryDataValidation","createPublishEntryData","model","context","getIdentity","getSecurityIdentity","originalEntry","latestEntry","validateModelEntryDataOrThrow","data","values","entry","currentDateTime","Date","toISOString","currentIdentity","status","STATUS_PUBLISHED","locked","createdOn","modifiedOn","savedOn","firstPublishedOn","lastPublishedOn","createdBy","modifiedBy","savedBy","firstPublishedBy","lastPublishedBy","revisionCreatedOn","revisionSavedOn","revisionModifiedOn","revisionFirstPublishedOn","revisionLastPublishedOn","revisionCreatedBy","revisionSavedBy","revisionModifiedBy","revisionFirstPublishedBy","revisionLastPublishedBy","exports"],"sources":["createPublishEntryData.ts"],"sourcesContent":["import { CmsContext, CmsEntry, CmsModel } from \"~/types\";\nimport { STATUS_PUBLISHED } from \"./statuses\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation\";\n\ntype CreatePublishEntryDataParams = {\n    model: CmsModel;\n    context: CmsContext;\n    getIdentity: () => SecurityIdentity;\n    originalEntry: CmsEntry;\n    latestEntry: CmsEntry;\n};\n\nexport const createPublishEntryData = async ({\n    model,\n    context,\n    getIdentity: getSecurityIdentity,\n    originalEntry,\n    latestEntry\n}: CreatePublishEntryDataParams): Promise<{\n    entry: CmsEntry;\n}> => {\n    await validateModelEntryDataOrThrow({\n        context,\n        model,\n        data: originalEntry.values,\n        entry: originalEntry\n    });\n\n    const currentDateTime = new Date().toISOString();\n    const currentIdentity = getSecurityIdentity();\n\n    const entry: CmsEntry = {\n        ...originalEntry,\n        status: STATUS_PUBLISHED,\n        locked: true,\n\n        /**\n         * Entry-level meta fields. 👇\n         */\n        createdOn: latestEntry.createdOn,\n        modifiedOn: currentDateTime,\n        savedOn: currentDateTime,\n        firstPublishedOn: latestEntry.firstPublishedOn || currentDateTime,\n        lastPublishedOn: currentDateTime,\n        createdBy: latestEntry.createdBy,\n        modifiedBy: currentIdentity,\n        savedBy: currentIdentity,\n        firstPublishedBy: latestEntry.firstPublishedBy || currentIdentity,\n        lastPublishedBy: currentIdentity,\n\n        /**\n         * Revision-level meta fields. 👇\n         */\n        revisionCreatedOn: originalEntry.revisionCreatedOn,\n        revisionSavedOn: currentDateTime,\n        revisionModifiedOn: currentDateTime,\n        revisionFirstPublishedOn: originalEntry.revisionFirstPublishedOn || currentDateTime,\n        revisionLastPublishedOn: currentDateTime,\n        revisionCreatedBy: originalEntry.revisionCreatedBy,\n        revisionSavedBy: currentIdentity,\n        revisionModifiedBy: currentIdentity,\n        revisionFirstPublishedBy: originalEntry.revisionFirstPublishedBy || currentIdentity,\n        revisionLastPublishedBy: currentIdentity\n    };\n\n    return { entry };\n};\n"],"mappings":";;;;;;AACA,IAAAA,SAAA,GAAAC,OAAA;AAEA,IAAAC,oBAAA,GAAAD,OAAA;AAUO,MAAME,sBAAsB,GAAG,MAAAA,CAAO;EACzCC,KAAK;EACLC,OAAO;EACPC,WAAW,EAAEC,mBAAmB;EAChCC,aAAa;EACbC;AAC0B,CAAC,KAEzB;EACF,MAAM,IAAAC,kDAA6B,EAAC;IAChCL,OAAO;IACPD,KAAK;IACLO,IAAI,EAAEH,aAAa,CAACI,MAAM;IAC1BC,KAAK,EAAEL;EACX,CAAC,CAAC;EAEF,MAAMM,eAAe,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;EAChD,MAAMC,eAAe,GAAGV,mBAAmB,CAAC,CAAC;EAE7C,MAAMM,KAAe,GAAG;IACpB,GAAGL,aAAa;IAChBU,MAAM,EAAEC,0BAAgB;IACxBC,MAAM,EAAE,IAAI;IAEZ;AACR;AACA;IACQC,SAAS,EAAEZ,WAAW,CAACY,SAAS;IAChCC,UAAU,EAAER,eAAe;IAC3BS,OAAO,EAAET,eAAe;IACxBU,gBAAgB,EAAEf,WAAW,CAACe,gBAAgB,IAAIV,eAAe;IACjEW,eAAe,EAAEX,eAAe;IAChCY,SAAS,EAAEjB,WAAW,CAACiB,SAAS;IAChCC,UAAU,EAAEV,eAAe;IAC3BW,OAAO,EAAEX,eAAe;IACxBY,gBAAgB,EAAEpB,WAAW,CAACoB,gBAAgB,IAAIZ,eAAe;IACjEa,eAAe,EAAEb,eAAe;IAEhC;AACR;AACA;IACQc,iBAAiB,EAAEvB,aAAa,CAACuB,iBAAiB;IAClDC,eAAe,EAAElB,eAAe;IAChCmB,kBAAkB,EAAEnB,eAAe;IACnCoB,wBAAwB,EAAE1B,aAAa,CAAC0B,wBAAwB,IAAIpB,eAAe;IACnFqB,uBAAuB,EAAErB,eAAe;IACxCsB,iBAAiB,EAAE5B,aAAa,CAAC4B,iBAAiB;IAClDC,eAAe,EAAEpB,eAAe;IAChCqB,kBAAkB,EAAErB,eAAe;IACnCsB,wBAAwB,EAAE/B,aAAa,CAAC+B,wBAAwB,IAAItB,eAAe;IACnFuB,uBAAuB,EAAEvB;EAC7B,CAAC;EAED,OAAO;IAAEJ;EAAM,CAAC;AACpB,CAAC;AAAC4B,OAAA,CAAAtC,sBAAA,GAAAA,sBAAA"}
+{"version":3,"names":["STATUS_PUBLISHED","validateModelEntryDataOrThrow","getIdentity","getDate","createPublishEntryData","model","context","getSecurityIdentity","originalEntry","latestEntry","values","entry","currentDateTime","Date","toISOString","currentIdentity","status","locked","createdOn","modifiedOn","savedOn","firstPublishedOn","lastPublishedOn","createdBy","modifiedBy","savedBy","firstPublishedBy","lastPublishedBy","revisionCreatedOn","revisionSavedOn","revisionModifiedOn","revisionFirstPublishedOn","revisionLastPublishedOn","revisionCreatedBy","revisionSavedBy","revisionModifiedBy","revisionFirstPublishedBy","revisionLastPublishedBy"],"sources":["createPublishEntryData.ts"],"sourcesContent":["import type { CmsContext, CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { STATUS_PUBLISHED } from \"./statuses.js\";\nimport { validateModelEntryDataOrThrow } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport type { SecurityIdentity } from \"@webiny/api-core/types/security.js\";\n\ninterface ICreatePublishEntryDataParams<TValues extends CmsEntryValues = CmsEntryValues> {\n    model: CmsModel;\n    context: CmsContext;\n    getIdentity: () => SecurityIdentity;\n    originalEntry: CmsEntry<TValues>;\n    latestEntry: CmsEntry<TValues>;\n}\n\ninterface ICreatePublishEntryDataResponse<T extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<T>;\n}\n\nexport const createPublishEntryData = async <T extends CmsEntryValues = CmsEntryValues>({\n    model,\n    context,\n    getIdentity: getSecurityIdentity,\n    originalEntry,\n    latestEntry\n}: ICreatePublishEntryDataParams<T>): Promise<ICreatePublishEntryDataResponse<T>> => {\n    await validateModelEntryDataOrThrow({\n        context,\n        model,\n        values: originalEntry.values,\n        entry: originalEntry\n    });\n\n    const currentDateTime = new Date().toISOString();\n    const currentIdentity = getSecurityIdentity();\n\n    const entry: CmsEntry<T> = {\n        ...originalEntry,\n        status: STATUS_PUBLISHED,\n        locked: true,\n\n        /**\n         * Entry-level meta fields. 👇\n         */\n        createdOn: getDate(latestEntry.createdOn),\n        modifiedOn: getDate(currentDateTime),\n        savedOn: getDate(currentDateTime),\n        firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),\n        lastPublishedOn: getDate(currentDateTime),\n        createdBy: getIdentity(latestEntry.createdBy),\n        modifiedBy: getIdentity(currentIdentity),\n        savedBy: getIdentity(currentIdentity),\n        firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),\n        lastPublishedBy: getIdentity(currentIdentity),\n\n        /**\n         * Revision-level meta fields. 👇\n         */\n        revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),\n        revisionSavedOn: getDate(currentDateTime),\n        revisionModifiedOn: getDate(currentDateTime),\n        revisionFirstPublishedOn: getDate(originalEntry.revisionFirstPublishedOn, currentDateTime),\n        revisionLastPublishedOn: getDate(currentDateTime),\n        revisionCreatedBy: getIdentity(originalEntry.revisionCreatedBy),\n        revisionSavedBy: getIdentity(currentIdentity),\n        revisionModifiedBy: getIdentity(currentIdentity),\n        revisionFirstPublishedBy: getIdentity(\n            originalEntry.revisionFirstPublishedBy,\n            currentIdentity\n        ),\n        revisionLastPublishedBy: getIdentity(currentIdentity)\n    };\n\n    return { entry };\n};\n"],"mappings":"AACA,SAASA,gBAAgB;AACzB,SAASC,6BAA6B;AACtC,SAASC,WAAW;AACpB,SAASC,OAAO;AAehB,OAAO,MAAMC,sBAAsB,GAAG,MAAAA,CAAkD;EACpFC,KAAK;EACLC,OAAO;EACPJ,WAAW,EAAEK,mBAAmB;EAChCC,aAAa;EACbC;AAC8B,CAAC,KAAkD;EACjF,MAAMR,6BAA6B,CAAC;IAChCK,OAAO;IACPD,KAAK;IACLK,MAAM,EAAEF,aAAa,CAACE,MAAM;IAC5BC,KAAK,EAAEH;EACX,CAAC,CAAC;EAEF,MAAMI,eAAe,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;EAChD,MAAMC,eAAe,GAAGR,mBAAmB,CAAC,CAAC;EAE7C,MAAMI,KAAkB,GAAG;IACvB,GAAGH,aAAa;IAChBQ,MAAM,EAAEhB,gBAAgB;IACxBiB,MAAM,EAAE,IAAI;IAEZ;AACR;AACA;IACQC,SAAS,EAAEf,OAAO,CAACM,WAAW,CAACS,SAAS,CAAC;IACzCC,UAAU,EAAEhB,OAAO,CAACS,eAAe,CAAC;IACpCQ,OAAO,EAAEjB,OAAO,CAACS,eAAe,CAAC;IACjCS,gBAAgB,EAAElB,OAAO,CAACM,WAAW,CAACY,gBAAgB,EAAET,eAAe,CAAC;IACxEU,eAAe,EAAEnB,OAAO,CAACS,eAAe,CAAC;IACzCW,SAAS,EAAErB,WAAW,CAACO,WAAW,CAACc,SAAS,CAAC;IAC7CC,UAAU,EAAEtB,WAAW,CAACa,eAAe,CAAC;IACxCU,OAAO,EAAEvB,WAAW,CAACa,eAAe,CAAC;IACrCW,gBAAgB,EAAExB,WAAW,CAACO,WAAW,CAACiB,gBAAgB,EAAEX,eAAe,CAAC;IAC5EY,eAAe,EAAEzB,WAAW,CAACa,eAAe,CAAC;IAE7C;AACR;AACA;IACQa,iBAAiB,EAAEzB,OAAO,CAACK,aAAa,CAACoB,iBAAiB,CAAC;IAC3DC,eAAe,EAAE1B,OAAO,CAACS,eAAe,CAAC;IACzCkB,kBAAkB,EAAE3B,OAAO,CAACS,eAAe,CAAC;IAC5CmB,wBAAwB,EAAE5B,OAAO,CAACK,aAAa,CAACuB,wBAAwB,EAAEnB,eAAe,CAAC;IAC1FoB,uBAAuB,EAAE7B,OAAO,CAACS,eAAe,CAAC;IACjDqB,iBAAiB,EAAE/B,WAAW,CAACM,aAAa,CAACyB,iBAAiB,CAAC;IAC/DC,eAAe,EAAEhC,WAAW,CAACa,eAAe,CAAC;IAC7CoB,kBAAkB,EAAEjC,WAAW,CAACa,eAAe,CAAC;IAChDqB,wBAAwB,EAAElC,WAAW,CACjCM,aAAa,CAAC4B,wBAAwB,EACtCrB,eACJ,CAAC;IACDsB,uBAAuB,EAAEnC,WAAW,CAACa,eAAe;EACxD,CAAC;EAED,OAAO;IAAEJ;EAAM,CAAC;AACpB,CAAC","ignoreList":[]}

package/crud/contentEntry/entryDataFactories/createRepublishEntryData.d.ts

@@ -1,12 +1,13 @@
-import { CmsContext, CmsEntry, CmsModel } from "../../../types";
-import { SecurityIdentity } from "@webiny/api-security/types";
-declare type CreateRepublishEntryDataParams = {
+import type { CmsContext, CmsEntry, CmsEntryValues, CmsModel } from "../../../types/index.js";
+import type { SecurityIdentity } from "@webiny/api-core/types/security.js";
+type CreateRepublishEntryDataParams<TValues extends CmsEntryValues = CmsEntryValues> = {
     model: CmsModel;
     context: CmsContext;
     getIdentity: () => SecurityIdentity;
-    originalEntry: CmsEntry;
+    originalEntry: CmsEntry<TValues>;
 };
-export declare const createRepublishEntryData: ({ model, context, getIdentity: getSecurityIdentity, originalEntry }: CreateRepublishEntryDataParams) => Promise<{
-    entry: CmsEntry;
-}>;
+interface ICreateRepublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
+    entry: CmsEntry<TValues>;
+}
+export declare const createRepublishEntryData: <TValues extends CmsEntryValues = CmsEntryValues>({ model, context, getIdentity: getSecurityIdentity, originalEntry }: CreateRepublishEntryDataParams<TValues>) => Promise<ICreateRepublishEntryDataResponse<TValues>>;
 export {};

package/crud/contentEntry/entryDataFactories/createRepublishEntryData.js

@@ -1,57 +1,51 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createRepublishEntryData = void 0;
-var _referenceFieldsMapping = require("../referenceFieldsMapping");
-var _statuses = require("./statuses");
-const createRepublishEntryData = async ({
+import { referenceFieldsMapping } from "../referenceFieldsMapping.js";
+import { STATUS_PUBLISHED } from "./statuses.js";
+import { getIdentity } from "../../../utils/identity.js";
+import { getDate } from "../../../utils/date.js";
+export const createRepublishEntryData = async ({
   model,
   context,
   getIdentity: getSecurityIdentity,
   originalEntry
 }) => {
-  const values = await (0, _referenceFieldsMapping.referenceFieldsMapping)({
+  const values = await referenceFieldsMapping({
     context,
     model,
-    input: originalEntry.values,
+    values: originalEntry.values,
     validateEntries: false
   });
   const currentDateTime = new Date().toISOString();
   const currentIdentity = getSecurityIdentity();
   const entry = {
     ...originalEntry,
-    status: _statuses.STATUS_PUBLISHED,
+    status: STATUS_PUBLISHED,
     /**
      * 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,
-    webinyVersion: context.WEBINY_VERSION,
+    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),
     values
   };
   return {
     entry
   };
 };
-exports.createRepublishEntryData = createRepublishEntryData;
 
 //# sourceMappingURL=createRepublishEntryData.js.map

package/crud/contentEntry/entryDataFactories/createRepublishEntryData.js.map

@@ -1 +1 @@
-{"version":3,"names":["_referenceFieldsMapping","require","_statuses","createRepublishEntryData","model","context","getIdentity","getSecurityIdentity","originalEntry","values","referenceFieldsMapping","input","validateEntries","currentDateTime","Date","toISOString","currentIdentity","entry","status","STATUS_PUBLISHED","savedOn","modifiedOn","savedBy","modifiedBy","firstPublishedOn","firstPublishedBy","lastPublishedOn","lastPublishedBy","revisionSavedOn","revisionModifiedOn","revisionSavedBy","revisionModifiedBy","revisionFirstPublishedOn","revisionFirstPublishedBy","revisionLastPublishedOn","revisionLastPublishedBy","webinyVersion","WEBINY_VERSION","exports"],"sources":["createRepublishEntryData.ts"],"sourcesContent":["import { CmsContext, CmsEntry, CmsModel } from \"~/types\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping\";\nimport { STATUS_PUBLISHED } from \"./statuses\";\nimport { SecurityIdentity } from \"@webiny/api-security/types\";\n\ntype CreateRepublishEntryDataParams = {\n    model: CmsModel;\n    context: CmsContext;\n    getIdentity: () => SecurityIdentity;\n    originalEntry: CmsEntry;\n};\n\nexport const createRepublishEntryData = async ({\n    model,\n    context,\n    getIdentity: getSecurityIdentity,\n    originalEntry\n}: CreateRepublishEntryDataParams): Promise<{\n    entry: CmsEntry;\n}> => {\n    const values = await referenceFieldsMapping({\n        context,\n        model,\n        input: originalEntry.values,\n        validateEntries: false\n    });\n\n    const currentDateTime = new Date().toISOString();\n    const currentIdentity = getSecurityIdentity();\n\n    const entry: CmsEntry = {\n        ...originalEntry,\n        status: STATUS_PUBLISHED,\n\n        /**\n         * Entry-level meta fields. 👇\n         */\n        savedOn: currentDateTime,\n        modifiedOn: currentDateTime,\n        savedBy: currentIdentity,\n        modifiedBy: currentIdentity,\n        firstPublishedOn: originalEntry.firstPublishedOn || currentDateTime,\n        firstPublishedBy: originalEntry.firstPublishedBy || currentIdentity,\n        lastPublishedOn: currentDateTime,\n        lastPublishedBy: currentIdentity,\n\n        /**\n         * Revision-level meta fields. 👇\n         */\n        revisionSavedOn: currentDateTime,\n        revisionModifiedOn: currentDateTime,\n        revisionSavedBy: currentIdentity,\n        revisionModifiedBy: currentIdentity,\n        revisionFirstPublishedOn: originalEntry.revisionFirstPublishedOn || currentDateTime,\n        revisionFirstPublishedBy: originalEntry.revisionFirstPublishedBy || currentIdentity,\n        revisionLastPublishedOn: currentDateTime,\n        revisionLastPublishedBy: currentIdentity,\n\n        webinyVersion: context.WEBINY_VERSION,\n        values\n    };\n\n    return { entry };\n};\n"],"mappings":";;;;;;AACA,IAAAA,uBAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAUO,MAAME,wBAAwB,GAAG,MAAAA,CAAO;EAC3CC,KAAK;EACLC,OAAO;EACPC,WAAW,EAAEC,mBAAmB;EAChCC;AAC4B,CAAC,KAE3B;EACF,MAAMC,MAAM,GAAG,MAAM,IAAAC,8CAAsB,EAAC;IACxCL,OAAO;IACPD,KAAK;IACLO,KAAK,EAAEH,aAAa,CAACC,MAAM;IAC3BG,eAAe,EAAE;EACrB,CAAC,CAAC;EAEF,MAAMC,eAAe,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;EAChD,MAAMC,eAAe,GAAGT,mBAAmB,CAAC,CAAC;EAE7C,MAAMU,KAAe,GAAG;IACpB,GAAGT,aAAa;IAChBU,MAAM,EAAEC,0BAAgB;IAExB;AACR;AACA;IACQC,OAAO,EAAEP,eAAe;IACxBQ,UAAU,EAAER,eAAe;IAC3BS,OAAO,EAAEN,eAAe;IACxBO,UAAU,EAAEP,eAAe;IAC3BQ,gBAAgB,EAAEhB,aAAa,CAACgB,gBAAgB,IAAIX,eAAe;IACnEY,gBAAgB,EAAEjB,aAAa,CAACiB,gBAAgB,IAAIT,eAAe;IACnEU,eAAe,EAAEb,eAAe;IAChCc,eAAe,EAAEX,eAAe;IAEhC;AACR;AACA;IACQY,eAAe,EAAEf,eAAe;IAChCgB,kBAAkB,EAAEhB,eAAe;IACnCiB,eAAe,EAAEd,eAAe;IAChCe,kBAAkB,EAAEf,eAAe;IACnCgB,wBAAwB,EAAExB,aAAa,CAACwB,wBAAwB,IAAInB,eAAe;IACnFoB,wBAAwB,EAAEzB,aAAa,CAACyB,wBAAwB,IAAIjB,eAAe;IACnFkB,uBAAuB,EAAErB,eAAe;IACxCsB,uBAAuB,EAAEnB,eAAe;IAExCoB,aAAa,EAAE/B,OAAO,CAACgC,cAAc;IACrC5B;EACJ,CAAC;EAED,OAAO;IAAEQ;EAAM,CAAC;AACpB,CAAC;AAACqB,OAAA,CAAAnC,wBAAA,GAAAA,wBAAA"}
+{"version":3,"names":["referenceFieldsMapping","STATUS_PUBLISHED","getIdentity","getDate","createRepublishEntryData","model","context","getSecurityIdentity","originalEntry","values","validateEntries","currentDateTime","Date","toISOString","currentIdentity","entry","status","savedOn","modifiedOn","savedBy","modifiedBy","firstPublishedOn","firstPublishedBy","lastPublishedOn","lastPublishedBy","revisionSavedOn","revisionModifiedOn","revisionSavedBy","revisionModifiedBy","revisionFirstPublishedOn","revisionFirstPublishedBy","revisionLastPublishedOn","revisionLastPublishedBy"],"sources":["createRepublishEntryData.ts"],"sourcesContent":["import type { CmsContext, CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { referenceFieldsMapping } from \"~/crud/contentEntry/referenceFieldsMapping.js\";\nimport { STATUS_PUBLISHED } from \"./statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport type { SecurityIdentity } from \"@webiny/api-core/types/security.js\";\n\ntype CreateRepublishEntryDataParams<TValues extends CmsEntryValues = CmsEntryValues> = {\n    model: CmsModel;\n    context: CmsContext;\n    getIdentity: () => SecurityIdentity;\n    originalEntry: CmsEntry<TValues>;\n};\n\ninterface ICreateRepublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<TValues>;\n}\n\nexport const createRepublishEntryData = async <TValues extends CmsEntryValues = CmsEntryValues>({\n    model,\n    context,\n    getIdentity: getSecurityIdentity,\n    originalEntry\n}: CreateRepublishEntryDataParams<TValues>): Promise<\n    ICreateRepublishEntryDataResponse<TValues>\n> => {\n    const values = await referenceFieldsMapping<TValues>({\n        context,\n        model,\n        values: originalEntry.values,\n        validateEntries: false\n    });\n\n    const currentDateTime = new Date().toISOString();\n    const currentIdentity = getSecurityIdentity();\n\n    const entry: CmsEntry<TValues> = {\n        ...originalEntry,\n        status: STATUS_PUBLISHED,\n        /**\n         * Entry-level meta fields. 👇\n         */\n        savedOn: getDate(currentDateTime),\n        modifiedOn: getDate(currentDateTime),\n        savedBy: getIdentity(currentIdentity)!,\n        modifiedBy: getIdentity(currentIdentity),\n        firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),\n        firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),\n        lastPublishedOn: getDate(currentDateTime),\n        lastPublishedBy: getIdentity(currentIdentity),\n\n        /**\n         * Revision-level meta fields. 👇\n         */\n        revisionSavedOn: getDate(currentDateTime),\n        revisionModifiedOn: getDate(currentDateTime),\n        revisionSavedBy: getIdentity(currentIdentity)!,\n        revisionModifiedBy: getIdentity(currentIdentity),\n        revisionFirstPublishedOn: getDate(originalEntry.revisionFirstPublishedOn, currentDateTime),\n        revisionFirstPublishedBy: getIdentity(\n            originalEntry.revisionFirstPublishedBy,\n            currentIdentity\n        ),\n        revisionLastPublishedOn: getDate(currentDateTime),\n        revisionLastPublishedBy: getIdentity(currentIdentity),\n        values\n    };\n\n    return {\n        entry\n    };\n};\n"],"mappings":"AACA,SAASA,sBAAsB;AAC/B,SAASC,gBAAgB;AACzB,SAASC,WAAW;AACpB,SAASC,OAAO;AAchB,OAAO,MAAMC,wBAAwB,GAAG,MAAAA,CAAwD;EAC5FC,KAAK;EACLC,OAAO;EACPJ,WAAW,EAAEK,mBAAmB;EAChCC;AACqC,CAAC,KAErC;EACD,MAAMC,MAAM,GAAG,MAAMT,sBAAsB,CAAU;IACjDM,OAAO;IACPD,KAAK;IACLI,MAAM,EAAED,aAAa,CAACC,MAAM;IAC5BC,eAAe,EAAE;EACrB,CAAC,CAAC;EAEF,MAAMC,eAAe,GAAG,IAAIC,IAAI,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC;EAChD,MAAMC,eAAe,GAAGP,mBAAmB,CAAC,CAAC;EAE7C,MAAMQ,KAAwB,GAAG;IAC7B,GAAGP,aAAa;IAChBQ,MAAM,EAAEf,gBAAgB;IACxB;AACR;AACA;IACQgB,OAAO,EAAEd,OAAO,CAACQ,eAAe,CAAC;IACjCO,UAAU,EAAEf,OAAO,CAACQ,eAAe,CAAC;IACpCQ,OAAO,EAAEjB,WAAW,CAACY,eAAe,CAAE;IACtCM,UAAU,EAAElB,WAAW,CAACY,eAAe,CAAC;IACxCO,gBAAgB,EAAElB,OAAO,CAACK,aAAa,CAACa,gBAAgB,EAAEV,eAAe,CAAC;IAC1EW,gBAAgB,EAAEpB,WAAW,CAACM,aAAa,CAACc,gBAAgB,EAAER,eAAe,CAAC;IAC9ES,eAAe,EAAEpB,OAAO,CAACQ,eAAe,CAAC;IACzCa,eAAe,EAAEtB,WAAW,CAACY,eAAe,CAAC;IAE7C;AACR;AACA;IACQW,eAAe,EAAEtB,OAAO,CAACQ,eAAe,CAAC;IACzCe,kBAAkB,EAAEvB,OAAO,CAACQ,eAAe,CAAC;IAC5CgB,eAAe,EAAEzB,WAAW,CAACY,eAAe,CAAE;IAC9Cc,kBAAkB,EAAE1B,WAAW,CAACY,eAAe,CAAC;IAChDe,wBAAwB,EAAE1B,OAAO,CAACK,aAAa,CAACqB,wBAAwB,EAAElB,eAAe,CAAC;IAC1FmB,wBAAwB,EAAE5B,WAAW,CACjCM,aAAa,CAACsB,wBAAwB,EACtChB,eACJ,CAAC;IACDiB,uBAAuB,EAAE5B,OAAO,CAACQ,eAAe,CAAC;IACjDqB,uBAAuB,EAAE9B,WAAW,CAACY,eAAe,CAAC;IACrDL;EACJ,CAAC;EAED,OAAO;IACHM;EACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/crud/contentEntry/entryDataFactories/createUnpublishEntryData.d.ts

@@ -1,12 +1,11 @@
-import { CmsContext, CmsEntry, CmsModel } from "../../../types";
-import { SecurityIdentity } from "@webiny/api-security/types";
-declare type CreateRepublishEntryDataParams = {
-    model: CmsModel;
-    context: CmsContext;
+import type { CmsEntry, CmsEntryValues } from "../../../types/index.js";
+import type { SecurityIdentity } from "@webiny/api-core/types/security.js";
+interface CreateRepublishEntryDataParams<TValues extends CmsEntryValues = CmsEntryValues> {
     getIdentity: () => SecurityIdentity;
-    originalEntry: CmsEntry;
-};
-export declare const createUnpublishEntryData: ({ getIdentity: getSecurityIdentity, originalEntry }: CreateRepublishEntryDataParams) => Promise<{
-    entry: CmsEntry;
-}>;
+    originalEntry: CmsEntry<TValues>;
+}
+interface ICreateUnpublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
+    entry: CmsEntry<TValues>;
+}
+export declare const createUnpublishEntryData: <TValues extends CmsEntryValues = CmsEntryValues>({ getIdentity: getSecurityIdentity, originalEntry }: CreateRepublishEntryDataParams<TValues>) => Promise<ICreateUnpublishEntryDataResponse<TValues>>;
 export {};