@webiny/api-headless-cms 6.4.12-beta.5 → 6.5.0-beta.1

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.d.ts

@@ -1,12 +1,14 @@
-import { type ICreatePublishEntryDataFactory, type ICreatePublishEntryDataResponse } from "./abstractions.js";
+import { CreatePublishEntryDataFactory as FactoryAbstraction, type ICreatePublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../../features/shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 declare class CreatePublishEntryDataFactoryImpl implements ICreatePublishEntryDataFactory {
     private readonly cmsContext;
     private readonly identityContext;
-    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface);
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>, latestEntry: CmsEntry<TValues>): Promise<ICreatePublishEntryDataResponse<TValues>>;
+    private readonly getLatestRevision;
+    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface, getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface);
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<FactoryAbstraction.Return<TValues>>;
 }
 export declare const CreatePublishEntryDataFactory: import("@webiny/di").Implementation<typeof CreatePublishEntryDataFactoryImpl>;
 export {};

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js

@@ -1,23 +1,32 @@
-import { createImplementation } from "@webiny/feature/api";
+import { Result, createImplementation } from "@webiny/feature/api";
 import { CreatePublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { STATUS_PUBLISHED } from "../statuses.js";
-import { validateModelEntryDataOrThrow } from "../../../../crud/contentEntry/entryDataValidation.js";
+import { validateModelEntryData } from "../../../../crud/contentEntry/entryDataValidation.js";
+import { EntryValidationError } from "../../../../domain/contentEntry/errors.js";
 import { getIdentity } from "../../../../utils/identity.js";
 import { getDate } from "../../../../utils/date.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../GetLatestRevisionByEntryId/index.js";
 class CreatePublishEntryDataFactoryImpl {
-    constructor(cmsContext, identityContext){
+    constructor(cmsContext, identityContext, getLatestRevision){
         this.cmsContext = cmsContext;
         this.identityContext = identityContext;
+        this.getLatestRevision = getLatestRevision;
     }
-    async create(model, originalEntry, latestEntry) {
-        await validateModelEntryDataOrThrow({
+    async create(model, originalEntry) {
+        const latestResult = await this.getLatestRevision.execute(model, {
+            id: originalEntry.entryId
+        });
+        if (latestResult.isFail()) return Result.fail(latestResult.error);
+        const latestEntry = latestResult.value;
+        const invalidFields = await validateModelEntryData({
             context: this.cmsContext,
             model,
             values: originalEntry.values,
             entry: originalEntry
         });
+        if (invalidFields.length > 0) return Result.fail(new EntryValidationError("Validation failed.", invalidFields));
         const currentDateTime = new Date().toISOString();
         const currentIdentity = this.identityContext.getIdentity();
         const entry = {
@@ -25,32 +34,28 @@ class CreatePublishEntryDataFactoryImpl {
             status: STATUS_PUBLISHED,
             locked: true,
             createdOn: getDate(latestEntry.createdOn),
-            modifiedOn: getDate(currentDateTime),
-            savedOn: getDate(currentDateTime),
+            modifiedOn: getDate(latestEntry.modifiedOn),
+            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),
             firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),
             lastPublishedOn: getDate(currentDateTime),
             createdBy: getIdentity(latestEntry.createdBy),
-            modifiedBy: getIdentity(currentIdentity),
-            savedBy: getIdentity(currentIdentity),
+            modifiedBy: getIdentity(latestEntry.modifiedBy),
+            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),
             firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),
             lastPublishedBy: getIdentity(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),
             live: {
                 version: originalEntry.version
             }
         };
-        return {
+        return Result.ok({
             entry
-        };
+        });
     }
 }
 const CreatePublishEntryDataFactory_CreatePublishEntryDataFactory = createImplementation({
@@ -58,7 +63,8 @@ const CreatePublishEntryDataFactory_CreatePublishEntryDataFactory = createImplem
     implementation: CreatePublishEntryDataFactoryImpl,
     dependencies: [
         CmsContext,
-        IdentityContext
+        IdentityContext,
+        GetLatestRevisionByEntryIdUseCase
     ]
 });
 export { CreatePublishEntryDataFactory_CreatePublishEntryDataFactory as CreatePublishEntryDataFactory };

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreatePublishEntryDataFactory as FactoryAbstraction,\n    type ICreatePublishEntryDataFactory,\n    type ICreatePublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { 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\";\n\nclass CreatePublishEntryDataFactoryImpl implements ICreatePublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>,\n        latestEntry: CmsEntry<TValues>\n    ): Promise<ICreatePublishEntryDataResponse<TValues>> {\n        await validateModelEntryDataOrThrow({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            entry: originalEntry\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            locked: true,\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            revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\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            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreatePublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreatePublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["CreatePublishEntryDataFactoryImpl","cmsContext","identityContext","model","originalEntry","latestEntry","validateModelEntryDataOrThrow","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreatePublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":";;;;;;;;AAcA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,CAC7D;aAFmBD,UAAU,GAAVA;aACAC,eAAe,GAAfA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EAChCC,WAA8B,EACmB;QACjD,MAAMC,8BAA8B;YAChC,SAAS,IAAI,CAAC,UAAU;YACxBH;YACA,QAAQC,cAAc,MAAM;YAC5B,OAAOA;QACX;QAEA,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGN,aAAa;YAChB,QAAQO;YACR,QAAQ;YACR,WAAWC,QAAQP,YAAY,SAAS;YACxC,YAAYO,QAAQL;YACpB,SAASK,QAAQL;YACjB,kBAAkBK,QAAQP,YAAY,gBAAgB,EAAEE;YACxD,iBAAiBK,QAAQL;YACzB,WAAWM,YAAYR,YAAY,SAAS;YAC5C,YAAYQ,YAAYJ;YACxB,SAASI,YAAYJ;YACrB,kBAAkBI,YAAYR,YAAY,gBAAgB,EAAEI;YAC5D,iBAAiBI,YAAYJ;YAC7B,mBAAmBG,QAAQR,cAAc,iBAAiB;YAC1D,iBAAiBQ,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,0BAA0BK,QACtBR,cAAc,wBAAwB,EACtCG;YAEJ,yBAAyBK,QAAQL;YACjC,mBAAmBM,YAAYT,cAAc,iBAAiB;YAC9D,iBAAiBS,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,0BAA0BI,YACtBT,cAAc,wBAAwB,EACtCK;YAEJ,yBAAyBI,YAAYJ;YACrC,MAAM;gBACF,SAASL,cAAc,OAAO;YAClC;QACJ;QAEA,OAAO;YAAEM;QAAM;IACnB;AACJ;AAEO,MAAMI,8DAAgCC,qBAAqB;IAC9D,aAAaC;IACb,gBAAgBhB;IAChB,cAAc;QAACiB;QAAYC;KAAgB;AAC/C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/CreatePublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation, Result } from \"@webiny/feature/api\";\nimport {\n    CreatePublishEntryDataFactory as FactoryAbstraction,\n    type ICreatePublishEntryDataFactory\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { STATUS_PUBLISHED } from \"../statuses.js\";\nimport { validateModelEntryData } from \"~/crud/contentEntry/entryDataValidation.js\";\nimport { EntryValidationError } from \"~/domain/contentEntry/errors.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\n\nclass CreatePublishEntryDataFactoryImpl implements ICreatePublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<FactoryAbstraction.Return<TValues>> {\n        const latestResult = await this.getLatestRevision.execute<TValues>(model, {\n            id: originalEntry.entryId\n        });\n        if (latestResult.isFail()) {\n            return Result.fail(latestResult.error);\n        }\n        const latestEntry = latestResult.value;\n\n        const invalidFields = await validateModelEntryData({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            entry: originalEntry\n        });\n        if (invalidFields.length > 0) {\n            return Result.fail(new EntryValidationError(\"Validation failed.\", invalidFields));\n        }\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        /**\n         * Publishing is not a content modification, so saved/modified meta fields are kept.\n         * Entry-level values are taken from the latest revision, because storage copies them\n         * onto the latest revision when a non-latest revision is published. Revision-level\n         * values are the published revision's own, and come from `originalEntry`.\n         */\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            locked: true,\n            createdOn: getDate(latestEntry.createdOn),\n            modifiedOn: getDate(latestEntry.modifiedOn),\n            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),\n            firstPublishedOn: getDate(latestEntry.firstPublishedOn, currentDateTime),\n            lastPublishedOn: getDate(currentDateTime),\n            createdBy: getIdentity(latestEntry.createdBy),\n            modifiedBy: getIdentity(latestEntry.modifiedBy),\n            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),\n            firstPublishedBy: getIdentity(latestEntry.firstPublishedBy, currentIdentity),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionCreatedOn: getDate(originalEntry.revisionCreatedOn),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionCreatedBy: getIdentity(originalEntry.revisionCreatedBy),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return Result.ok({ entry });\n    }\n}\n\nexport const CreatePublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreatePublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext, GetLatestRevisionByEntryIdUseCase]\n});\n"],"names":["CreatePublishEntryDataFactoryImpl","cmsContext","identityContext","getLatestRevision","model","originalEntry","latestResult","Result","latestEntry","invalidFields","validateModelEntryData","EntryValidationError","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreatePublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext","GetLatestRevisionByEntryIdUseCase"],"mappings":";;;;;;;;;;AAeA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,EAC1CC,iBAA8D,CACjF;aAHmBF,UAAU,GAAVA;aACAC,eAAe,GAAfA;aACAC,iBAAiB,GAAjBA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACW;QAC3C,MAAMC,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAUF,OAAO;YACtE,IAAIC,cAAc,OAAO;QAC7B;QACA,IAAIC,aAAa,MAAM,IACnB,OAAOC,OAAO,IAAI,CAACD,aAAa,KAAK;QAEzC,MAAME,cAAcF,aAAa,KAAK;QAEtC,MAAMG,gBAAgB,MAAMC,uBAAuB;YAC/C,SAAS,IAAI,CAAC,UAAU;YACxBN;YACA,QAAQC,cAAc,MAAM;YAC5B,OAAOA;QACX;QACA,IAAII,cAAc,MAAM,GAAG,GACvB,OAAOF,OAAO,IAAI,CAAC,IAAII,qBAAqB,sBAAsBF;QAGtE,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAQxD,MAAMC,QAA2B;YAC7B,GAAGV,aAAa;YAChB,QAAQW;YACR,QAAQ;YACR,WAAWC,QAAQT,YAAY,SAAS;YACxC,YAAYS,QAAQT,YAAY,UAAU;YAC1C,SAASS,QAAQT,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC3D,kBAAkBY,QAAQT,YAAY,gBAAgB,EAAEI;YACxD,iBAAiBK,QAAQL;YACzB,WAAWM,YAAYV,YAAY,SAAS;YAC5C,YAAYU,YAAYV,YAAY,UAAU;YAC9C,SAASU,YAAYV,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC/D,kBAAkBa,YAAYV,YAAY,gBAAgB,EAAEM;YAC5D,iBAAiBI,YAAYJ;YAC7B,mBAAmBG,QAAQZ,cAAc,iBAAiB;YAC1D,0BAA0BY,QACtBZ,cAAc,wBAAwB,EACtCO;YAEJ,yBAAyBK,QAAQL;YACjC,mBAAmBM,YAAYb,cAAc,iBAAiB;YAC9D,0BAA0Ba,YACtBb,cAAc,wBAAwB,EACtCS;YAEJ,yBAAyBI,YAAYJ;YACrC,MAAM;gBACF,SAAST,cAAc,OAAO;YAClC;QACJ;QAEA,OAAOE,OAAO,EAAE,CAAC;YAAEQ;QAAM;IAC7B;AACJ;AAEO,MAAMI,8DAAgCC,qBAAqB;IAC9D,aAAaC;IACb,gBAAgBrB;IAChB,cAAc;QAACsB;QAAYC;QAAiBC;KAAkC;AAClF"}

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.d.ts

@@ -1,12 +1,26 @@
+import { type Result } from "@webiny/feature/api";
+import type { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
+import type { EntryValidationError } from "../../../../domain/contentEntry/errors.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
 export interface ICreatePublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
     entry: CmsEntry<TValues>;
 }
+/**
+ * Expected failures of building the data of an entry being published.
+ */
+export interface ICreatePublishEntryDataFactoryErrors {
+    latest: GetLatestRevisionByEntryIdUseCase.Error;
+    validation: EntryValidationError;
+}
+type FactoryError = ICreatePublishEntryDataFactoryErrors[keyof ICreatePublishEntryDataFactoryErrors];
 export interface ICreatePublishEntryDataFactory {
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>, latestEntry: CmsEntry<TValues>): Promise<ICreatePublishEntryDataResponse<TValues>>;
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<Result<ICreatePublishEntryDataResponse<TValues>, FactoryError>>;
 }
 export declare const CreatePublishEntryDataFactory: import("@webiny/di").Abstraction<ICreatePublishEntryDataFactory>;
 export declare namespace CreatePublishEntryDataFactory {
     type Interface = ICreatePublishEntryDataFactory;
+    type Error = FactoryError;
+    type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<ICreatePublishEntryDataResponse<TValues>, FactoryError>;
     type Response<TValues extends CmsEntryValues = CmsEntryValues> = ICreatePublishEntryDataResponse<TValues>;
 }
+export {};

package/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreatePublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<TValues>;\n}\n\nexport interface ICreatePublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>,\n        latestEntry: CmsEntry<TValues>\n    ): Promise<ICreatePublishEntryDataResponse<TValues>>;\n}\n\nexport const CreatePublishEntryDataFactory = createAbstraction<ICreatePublishEntryDataFactory>(\n    \"Cms/Entry/CreatePublishEntryDataFactory\"\n);\n\nexport namespace CreatePublishEntryDataFactory {\n    export type Interface = ICreatePublishEntryDataFactory;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreatePublishEntryDataResponse<TValues>;\n}\n"],"names":["CreatePublishEntryDataFactory","createAbstraction"],"mappings":";AAeO,MAAMA,gCAAgCC,kBACzC"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreatePublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\nimport type { EntryValidationError } from \"~/domain/contentEntry/errors.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreatePublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<TValues>;\n}\n\n/**\n * Expected failures of building the data of an entry being published.\n */\nexport interface ICreatePublishEntryDataFactoryErrors {\n    latest: GetLatestRevisionByEntryIdUseCase.Error;\n    validation: EntryValidationError;\n}\n\ntype FactoryError =\n    ICreatePublishEntryDataFactoryErrors[keyof ICreatePublishEntryDataFactoryErrors];\n\nexport interface ICreatePublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<Result<ICreatePublishEntryDataResponse<TValues>, FactoryError>>;\n}\n\nexport const CreatePublishEntryDataFactory = createAbstraction<ICreatePublishEntryDataFactory>(\n    \"Cms/Entry/CreatePublishEntryDataFactory\"\n);\n\nexport namespace CreatePublishEntryDataFactory {\n    export type Interface = ICreatePublishEntryDataFactory;\n    export type Error = FactoryError;\n    export type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<\n        ICreatePublishEntryDataResponse<TValues>,\n        FactoryError\n    >;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreatePublishEntryDataResponse<TValues>;\n}\n"],"names":["CreatePublishEntryDataFactory","createAbstraction"],"mappings":";AA2BO,MAAMA,gCAAgCC,kBACzC"}

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.d.ts

@@ -1,12 +1,14 @@
-import { type ICreateRepublishEntryDataFactory, type ICreateRepublishEntryDataResponse } from "./abstractions.js";
+import { CreateRepublishEntryDataFactory as FactoryAbstraction, type ICreateRepublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../../features/shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 declare class CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEntryDataFactory {
     private readonly cmsContext;
     private readonly identityContext;
-    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface);
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<ICreateRepublishEntryDataResponse<TValues>>;
+    private readonly getLatestRevision;
+    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface, getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface);
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<FactoryAbstraction.Return<TValues>>;
 }
 export declare const CreateRepublishEntryDataFactory: import("@webiny/di").Implementation<typeof CreateRepublishEntryDataFactoryImpl>;
 export {};

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js

@@ -1,4 +1,4 @@
-import { createImplementation } from "@webiny/feature/api";
+import { Result, createImplementation } from "@webiny/feature/api";
 import { CreateRepublishEntryDataFactory } from "./abstractions.js";
 import { CmsContext } from "../../../shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
@@ -6,12 +6,19 @@ import { referenceFieldsMapping } from "../../../../crud/contentEntry/referenceF
 import { STATUS_PUBLISHED } from "../statuses.js";
 import { getIdentity } from "../../../../utils/identity.js";
 import { getDate } from "../../../../utils/date.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../GetLatestRevisionByEntryId/index.js";
 class CreateRepublishEntryDataFactoryImpl {
-    constructor(cmsContext, identityContext){
+    constructor(cmsContext, identityContext, getLatestRevision){
         this.cmsContext = cmsContext;
         this.identityContext = identityContext;
+        this.getLatestRevision = getLatestRevision;
     }
     async create(model, originalEntry) {
+        const latestResult = await this.getLatestRevision.execute(model, {
+            id: originalEntry.entryId
+        });
+        if (latestResult.isFail()) return Result.fail(latestResult.error);
+        const latestEntry = latestResult.value;
         const values = await referenceFieldsMapping({
             context: this.cmsContext,
             model,
@@ -23,18 +30,14 @@ class CreateRepublishEntryDataFactoryImpl {
         const entry = {
             ...originalEntry,
             status: STATUS_PUBLISHED,
-            savedOn: getDate(currentDateTime),
-            modifiedOn: getDate(currentDateTime),
-            savedBy: getIdentity(currentIdentity),
-            modifiedBy: getIdentity(currentIdentity),
+            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),
+            modifiedOn: getDate(latestEntry.modifiedOn),
+            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),
+            modifiedBy: getIdentity(latestEntry.modifiedBy),
             firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),
             firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),
             lastPublishedOn: getDate(currentDateTime),
             lastPublishedBy: getIdentity(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),
@@ -44,9 +47,9 @@ class CreateRepublishEntryDataFactoryImpl {
                 version: originalEntry.version
             }
         };
-        return {
+        return Result.ok({
             entry
-        };
+        });
     }
 }
 const CreateRepublishEntryDataFactory_CreateRepublishEntryDataFactory = createImplementation({
@@ -54,7 +57,8 @@ const CreateRepublishEntryDataFactory_CreateRepublishEntryDataFactory = createIm
     implementation: CreateRepublishEntryDataFactoryImpl,
     dependencies: [
         CmsContext,
-        IdentityContext
+        IdentityContext,
+        GetLatestRevisionByEntryIdUseCase
     ]
 });
 export { CreateRepublishEntryDataFactory_CreateRepublishEntryDataFactory as CreateRepublishEntryDataFactory };

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreateRepublishEntryDataFactory as FactoryAbstraction,\n    type ICreateRepublishEntryDataFactory,\n    type ICreateRepublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { 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\";\n\nclass CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateRepublishEntryDataResponse<TValues>> {\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            validateEntries: false\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\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            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionSavedBy: getIdentity(currentIdentity)!,\n            revisionModifiedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            values,\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreateRepublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateRepublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext]\n});\n"],"names":["CreateRepublishEntryDataFactoryImpl","cmsContext","identityContext","model","originalEntry","values","referenceFieldsMapping","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreateRepublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext"],"mappings":";;;;;;;;AAcA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,CAC7D;aAFmBD,UAAU,GAAVA;aACAC,eAAe,GAAfA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACmB;QACnD,MAAMC,SAAS,MAAMC,uBAAgC;YACjD,SAAS,IAAI,CAAC,UAAU;YACxBH;YACA,QAAQC,cAAc,MAAM;YAC5B,iBAAiB;QACrB;QAEA,MAAMG,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGN,aAAa;YAChB,QAAQO;YACR,SAASC,QAAQL;YACjB,YAAYK,QAAQL;YACpB,SAASM,YAAYJ;YACrB,YAAYI,YAAYJ;YACxB,kBAAkBG,QAAQR,cAAc,gBAAgB,EAAEG;YAC1D,kBAAkBM,YAAYT,cAAc,gBAAgB,EAAEK;YAC9D,iBAAiBG,QAAQL;YACzB,iBAAiBM,YAAYJ;YAC7B,iBAAiBG,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,iBAAiBM,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,0BAA0BG,QACtBR,cAAc,wBAAwB,EACtCG;YAEJ,0BAA0BM,YACtBT,cAAc,wBAAwB,EACtCK;YAEJ,yBAAyBG,QAAQL;YACjC,yBAAyBM,YAAYJ;YACrCJ;YACA,MAAM;gBACF,SAASD,cAAc,OAAO;YAClC;QACJ;QAEA,OAAO;YAAEM;QAAM;IACnB;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBhB;IAChB,cAAc;QAACiB;QAAYC;KAAgB;AAC/C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/CreateRepublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation, Result } from \"@webiny/feature/api\";\nimport {\n    CreateRepublishEntryDataFactory as FactoryAbstraction,\n    type ICreateRepublishEntryDataFactory\n} from \"./abstractions.js\";\nimport { CmsContext } from \"~/features/shared/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { 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 { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\n\nclass CreateRepublishEntryDataFactoryImpl implements ICreateRepublishEntryDataFactory {\n    public constructor(\n        private readonly cmsContext: CmsContext.Interface,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<FactoryAbstraction.Return<TValues>> {\n        const latestResult = await this.getLatestRevision.execute<TValues>(model, {\n            id: originalEntry.entryId\n        });\n        if (latestResult.isFail()) {\n            return Result.fail(latestResult.error);\n        }\n        const latestEntry = latestResult.value;\n\n        const values = await referenceFieldsMapping<TValues>({\n            context: this.cmsContext,\n            model,\n            values: originalEntry.values,\n            validateEntries: false\n        });\n\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        /**\n         * Republishing is not a content modification, so saved/modified meta fields are kept.\n         * Entry-level values are taken from the latest revision, because storage copies them\n         * onto the latest revision when a non-latest revision is republished. Revision-level\n         * values are the republished revision's own, and come from `originalEntry`.\n         */\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_PUBLISHED,\n            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),\n            modifiedOn: getDate(latestEntry.modifiedOn),\n            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),\n            modifiedBy: getIdentity(latestEntry.modifiedBy),\n            firstPublishedOn: getDate(originalEntry.firstPublishedOn, currentDateTime),\n            firstPublishedBy: getIdentity(originalEntry.firstPublishedBy, currentIdentity),\n            lastPublishedOn: getDate(currentDateTime),\n            lastPublishedBy: getIdentity(currentIdentity),\n            revisionFirstPublishedOn: getDate(\n                originalEntry.revisionFirstPublishedOn,\n                currentDateTime\n            ),\n            revisionFirstPublishedBy: getIdentity(\n                originalEntry.revisionFirstPublishedBy,\n                currentIdentity\n            ),\n            revisionLastPublishedOn: getDate(currentDateTime),\n            revisionLastPublishedBy: getIdentity(currentIdentity),\n            values,\n            live: {\n                version: originalEntry.version\n            }\n        };\n\n        return Result.ok({ entry });\n    }\n}\n\nexport const CreateRepublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateRepublishEntryDataFactoryImpl,\n    dependencies: [CmsContext, IdentityContext, GetLatestRevisionByEntryIdUseCase]\n});\n"],"names":["CreateRepublishEntryDataFactoryImpl","cmsContext","identityContext","getLatestRevision","model","originalEntry","latestResult","Result","latestEntry","values","referenceFieldsMapping","currentDateTime","Date","currentIdentity","entry","STATUS_PUBLISHED","getDate","getIdentity","CreateRepublishEntryDataFactory","createImplementation","FactoryAbstraction","CmsContext","IdentityContext","GetLatestRevisionByEntryIdUseCase"],"mappings":";;;;;;;;;AAcA,MAAMA;IACF,YACqBC,UAAgC,EAChCC,eAA0C,EAC1CC,iBAA8D,CACjF;aAHmBF,UAAU,GAAVA;aACAC,eAAe,GAAfA;aACAC,iBAAiB,GAAjBA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACW;QAC3C,MAAMC,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAUF,OAAO;YACtE,IAAIC,cAAc,OAAO;QAC7B;QACA,IAAIC,aAAa,MAAM,IACnB,OAAOC,OAAO,IAAI,CAACD,aAAa,KAAK;QAEzC,MAAME,cAAcF,aAAa,KAAK;QAEtC,MAAMG,SAAS,MAAMC,uBAAgC;YACjD,SAAS,IAAI,CAAC,UAAU;YACxBN;YACA,QAAQC,cAAc,MAAM;YAC5B,iBAAiB;QACrB;QAEA,MAAMM,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAQxD,MAAMC,QAA2B;YAC7B,GAAGT,aAAa;YAChB,QAAQU;YACR,SAASC,QAAQR,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC3D,YAAYW,QAAQR,YAAY,UAAU;YAC1C,SAASS,YAAYT,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC/D,YAAYY,YAAYT,YAAY,UAAU;YAC9C,kBAAkBQ,QAAQX,cAAc,gBAAgB,EAAEM;YAC1D,kBAAkBM,YAAYZ,cAAc,gBAAgB,EAAEQ;YAC9D,iBAAiBG,QAAQL;YACzB,iBAAiBM,YAAYJ;YAC7B,0BAA0BG,QACtBX,cAAc,wBAAwB,EACtCM;YAEJ,0BAA0BM,YACtBZ,cAAc,wBAAwB,EACtCQ;YAEJ,yBAAyBG,QAAQL;YACjC,yBAAyBM,YAAYJ;YACrCJ;YACA,MAAM;gBACF,SAASJ,cAAc,OAAO;YAClC;QACJ;QAEA,OAAOE,OAAO,EAAE,CAAC;YAAEO;QAAM;IAC7B;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBpB;IAChB,cAAc;QAACqB;QAAYC;QAAiBC;KAAkC;AAClF"}

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.d.ts

@@ -1,12 +1,24 @@
+import { type Result } from "@webiny/feature/api";
+import type { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
 export interface ICreateRepublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
     entry: CmsEntry<TValues>;
 }
+/**
+ * Expected failures of building the data of an entry being republished.
+ */
+export interface ICreateRepublishEntryDataFactoryErrors {
+    latest: GetLatestRevisionByEntryIdUseCase.Error;
+}
+type FactoryError = ICreateRepublishEntryDataFactoryErrors[keyof ICreateRepublishEntryDataFactoryErrors];
 export interface ICreateRepublishEntryDataFactory {
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<ICreateRepublishEntryDataResponse<TValues>>;
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<Result<ICreateRepublishEntryDataResponse<TValues>, FactoryError>>;
 }
 export declare const CreateRepublishEntryDataFactory: import("@webiny/di").Abstraction<ICreateRepublishEntryDataFactory>;
 export declare namespace CreateRepublishEntryDataFactory {
     type Interface = ICreateRepublishEntryDataFactory;
+    type Error = FactoryError;
+    type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<ICreateRepublishEntryDataResponse<TValues>, FactoryError>;
     type Response<TValues extends CmsEntryValues = CmsEntryValues> = ICreateRepublishEntryDataResponse<TValues>;
 }
+export {};

package/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreateRepublishEntryDataResponse<\n    TValues extends CmsEntryValues = CmsEntryValues\n> {\n    entry: CmsEntry<TValues>;\n}\n\nexport interface ICreateRepublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateRepublishEntryDataResponse<TValues>>;\n}\n\nexport const CreateRepublishEntryDataFactory = createAbstraction<ICreateRepublishEntryDataFactory>(\n    \"Cms/Entry/CreateRepublishEntryDataFactory\"\n);\n\nexport namespace CreateRepublishEntryDataFactory {\n    export type Interface = ICreateRepublishEntryDataFactory;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreateRepublishEntryDataResponse<TValues>;\n}\n"],"names":["CreateRepublishEntryDataFactory","createAbstraction"],"mappings":";AAgBO,MAAMA,kCAAkCC,kBAC3C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateRepublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreateRepublishEntryDataResponse<\n    TValues extends CmsEntryValues = CmsEntryValues\n> {\n    entry: CmsEntry<TValues>;\n}\n\n/**\n * Expected failures of building the data of an entry being republished.\n */\nexport interface ICreateRepublishEntryDataFactoryErrors {\n    latest: GetLatestRevisionByEntryIdUseCase.Error;\n}\n\ntype FactoryError =\n    ICreateRepublishEntryDataFactoryErrors[keyof ICreateRepublishEntryDataFactoryErrors];\n\nexport interface ICreateRepublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<Result<ICreateRepublishEntryDataResponse<TValues>, FactoryError>>;\n}\n\nexport const CreateRepublishEntryDataFactory = createAbstraction<ICreateRepublishEntryDataFactory>(\n    \"Cms/Entry/CreateRepublishEntryDataFactory\"\n);\n\nexport namespace CreateRepublishEntryDataFactory {\n    export type Interface = ICreateRepublishEntryDataFactory;\n    export type Error = FactoryError;\n    export type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<\n        ICreateRepublishEntryDataResponse<TValues>,\n        FactoryError\n    >;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreateRepublishEntryDataResponse<TValues>;\n}\n"],"names":["CreateRepublishEntryDataFactory","createAbstraction"],"mappings":";AA2BO,MAAMA,kCAAkCC,kBAC3C"}

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.d.ts

@@ -1,10 +1,10 @@
-import { type ICreateUnpublishEntryDataFactory, type ICreateUnpublishEntryDataResponse } from "./abstractions.js";
-import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
-import type { CmsEntry, CmsEntryValues } from "../../../../types/index.js";
+import { CreateUnpublishEntryDataFactory as FactoryAbstraction, type ICreateUnpublishEntryDataFactory } from "./abstractions.js";
+import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 declare class CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEntryDataFactory {
-    private readonly identityContext;
-    constructor(identityContext: IdentityContext.Interface);
-    create<TValues extends CmsEntryValues = CmsEntryValues>(originalEntry: CmsEntry<TValues>): Promise<ICreateUnpublishEntryDataResponse<TValues>>;
+    private readonly getLatestRevision;
+    constructor(getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface);
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<FactoryAbstraction.Return<TValues>>;
 }
 export declare const CreateUnpublishEntryDataFactory: import("@webiny/di").Implementation<typeof CreateUnpublishEntryDataFactoryImpl>;
 export {};

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js

@@ -1,39 +1,38 @@
-import { createImplementation } from "@webiny/feature/api";
+import { Result, createImplementation } from "@webiny/feature/api";
 import { CreateUnpublishEntryDataFactory } from "./abstractions.js";
-import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import { STATUS_UNPUBLISHED } from "../statuses.js";
 import { getIdentity } from "../../../../utils/identity.js";
 import { getDate } from "../../../../utils/date.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../GetLatestRevisionByEntryId/index.js";
 class CreateUnpublishEntryDataFactoryImpl {
-    constructor(identityContext){
-        this.identityContext = identityContext;
+    constructor(getLatestRevision){
+        this.getLatestRevision = getLatestRevision;
     }
-    async create(originalEntry) {
-        const currentDateTime = new Date().toISOString();
-        const currentIdentity = this.identityContext.getIdentity();
+    async create(model, originalEntry) {
+        const latestResult = await this.getLatestRevision.execute(model, {
+            id: originalEntry.entryId
+        });
+        if (latestResult.isFail()) return Result.fail(latestResult.error);
+        const latestEntry = latestResult.value;
         const entry = {
             ...originalEntry,
             status: STATUS_UNPUBLISHED,
-            savedOn: getDate(currentDateTime),
-            modifiedOn: getDate(currentDateTime),
-            savedBy: getIdentity(currentIdentity),
-            modifiedBy: getIdentity(currentIdentity),
-            revisionSavedOn: getDate(currentDateTime),
-            revisionModifiedOn: getDate(currentDateTime),
-            revisionSavedBy: getIdentity(currentIdentity),
-            revisionModifiedBy: getIdentity(currentIdentity),
+            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),
+            modifiedOn: getDate(latestEntry.modifiedOn),
+            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),
+            modifiedBy: getIdentity(latestEntry.modifiedBy),
             live: null
         };
-        return {
+        return Result.ok({
             entry
-        };
+        });
     }
 }
 const CreateUnpublishEntryDataFactory_CreateUnpublishEntryDataFactory = createImplementation({
     abstraction: CreateUnpublishEntryDataFactory,
     implementation: CreateUnpublishEntryDataFactoryImpl,
     dependencies: [
-        IdentityContext
+        GetLatestRevisionByEntryIdUseCase
     ]
 });
 export { CreateUnpublishEntryDataFactory_CreateUnpublishEntryDataFactory as CreateUnpublishEntryDataFactory };

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport {\n    CreateUnpublishEntryDataFactory as FactoryAbstraction,\n    type ICreateUnpublishEntryDataFactory,\n    type ICreateUnpublishEntryDataResponse\n} from \"./abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport type { CmsEntry, CmsEntryValues } from \"~/types/index.js\";\nimport { STATUS_UNPUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\n\nclass CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEntryDataFactory {\n    public constructor(private readonly identityContext: IdentityContext.Interface) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateUnpublishEntryDataResponse<TValues>> {\n        const currentDateTime = new Date().toISOString();\n        const currentIdentity = this.identityContext.getIdentity();\n\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_UNPUBLISHED,\n            savedOn: getDate(currentDateTime),\n            modifiedOn: getDate(currentDateTime),\n            savedBy: getIdentity(currentIdentity),\n            modifiedBy: getIdentity(currentIdentity),\n            revisionSavedOn: getDate(currentDateTime),\n            revisionModifiedOn: getDate(currentDateTime),\n            revisionSavedBy: getIdentity(currentIdentity),\n            revisionModifiedBy: getIdentity(currentIdentity),\n            live: null\n        };\n\n        return { entry };\n    }\n}\n\nexport const CreateUnpublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateUnpublishEntryDataFactoryImpl,\n    dependencies: [IdentityContext]\n});\n"],"names":["CreateUnpublishEntryDataFactoryImpl","identityContext","originalEntry","currentDateTime","Date","currentIdentity","entry","STATUS_UNPUBLISHED","getDate","getIdentity","CreateUnpublishEntryDataFactory","createImplementation","FactoryAbstraction","IdentityContext"],"mappings":";;;;;;AAYA,MAAMA;IACF,YAAoCC,eAA0C,CAAE;aAA5CA,eAAe,GAAfA;IAA6C;IAEjF,MAAa,OACTC,aAAgC,EACmB;QACnD,MAAMC,kBAAkB,IAAIC,OAAO,WAAW;QAC9C,MAAMC,kBAAkB,IAAI,CAAC,eAAe,CAAC,WAAW;QAExD,MAAMC,QAA2B;YAC7B,GAAGJ,aAAa;YAChB,QAAQK;YACR,SAASC,QAAQL;YACjB,YAAYK,QAAQL;YACpB,SAASM,YAAYJ;YACrB,YAAYI,YAAYJ;YACxB,iBAAiBG,QAAQL;YACzB,oBAAoBK,QAAQL;YAC5B,iBAAiBM,YAAYJ;YAC7B,oBAAoBI,YAAYJ;YAChC,MAAM;QACV;QAEA,OAAO;YAAEC;QAAM;IACnB;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBZ;IAChB,cAAc;QAACa;KAAgB;AACnC"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/CreateUnpublishEntryDataFactory.ts"],"sourcesContent":["import { createImplementation, Result } from \"@webiny/feature/api\";\nimport {\n    CreateUnpublishEntryDataFactory as FactoryAbstraction,\n    type ICreateUnpublishEntryDataFactory\n} from \"./abstractions.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport { STATUS_UNPUBLISHED } from \"../statuses.js\";\nimport { getIdentity } from \"~/utils/identity.js\";\nimport { getDate } from \"~/utils/date.js\";\nimport { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\n\nclass CreateUnpublishEntryDataFactoryImpl implements ICreateUnpublishEntryDataFactory {\n    public constructor(\n        private readonly getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface\n    ) {}\n\n    public async create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<FactoryAbstraction.Return<TValues>> {\n        const latestResult = await this.getLatestRevision.execute<TValues>(model, {\n            id: originalEntry.entryId\n        });\n        if (latestResult.isFail()) {\n            return Result.fail(latestResult.error);\n        }\n        const latestEntry = latestResult.value;\n\n        /**\n         * Unpublishing is not a content modification, so saved/modified meta fields are kept.\n         * Entry-level values are taken from the latest revision, because storage copies them\n         * onto the latest revision when a non-latest revision is unpublished. Revision-level\n         * values are the unpublished revision's own, and come from `originalEntry`.\n         */\n        const entry: CmsEntry<TValues> = {\n            ...originalEntry,\n            status: STATUS_UNPUBLISHED,\n            savedOn: getDate(latestEntry.savedOn, originalEntry.savedOn),\n            modifiedOn: getDate(latestEntry.modifiedOn),\n            savedBy: getIdentity(latestEntry.savedBy, originalEntry.savedBy),\n            modifiedBy: getIdentity(latestEntry.modifiedBy),\n            live: null\n        };\n\n        return Result.ok({ entry });\n    }\n}\n\nexport const CreateUnpublishEntryDataFactory = createImplementation({\n    abstraction: FactoryAbstraction,\n    implementation: CreateUnpublishEntryDataFactoryImpl,\n    dependencies: [GetLatestRevisionByEntryIdUseCase]\n});\n"],"names":["CreateUnpublishEntryDataFactoryImpl","getLatestRevision","model","originalEntry","latestResult","Result","latestEntry","entry","STATUS_UNPUBLISHED","getDate","getIdentity","CreateUnpublishEntryDataFactory","createImplementation","FactoryAbstraction","GetLatestRevisionByEntryIdUseCase"],"mappings":";;;;;;AAWA,MAAMA;IACF,YACqBC,iBAA8D,CACjF;aADmBA,iBAAiB,GAAjBA;IAClB;IAEH,MAAa,OACTC,KAAe,EACfC,aAAgC,EACW;QAC3C,MAAMC,eAAe,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAUF,OAAO;YACtE,IAAIC,cAAc,OAAO;QAC7B;QACA,IAAIC,aAAa,MAAM,IACnB,OAAOC,OAAO,IAAI,CAACD,aAAa,KAAK;QAEzC,MAAME,cAAcF,aAAa,KAAK;QAQtC,MAAMG,QAA2B;YAC7B,GAAGJ,aAAa;YAChB,QAAQK;YACR,SAASC,QAAQH,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC3D,YAAYM,QAAQH,YAAY,UAAU;YAC1C,SAASI,YAAYJ,YAAY,OAAO,EAAEH,cAAc,OAAO;YAC/D,YAAYO,YAAYJ,YAAY,UAAU;YAC9C,MAAM;QACV;QAEA,OAAOD,OAAO,EAAE,CAAC;YAAEE;QAAM;IAC7B;AACJ;AAEO,MAAMI,kEAAkCC,qBAAqB;IAChE,aAAaC;IACb,gBAAgBb;IAChB,cAAc;QAACc;KAAkC;AACrD"}

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/abstractions.d.ts

@@ -1,12 +1,24 @@
-import type { CmsEntry, CmsEntryValues } from "../../../../types/index.js";
+import { type Result } from "@webiny/feature/api";
+import type { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
+import type { CmsEntry, CmsEntryValues, CmsModel } from "../../../../types/index.js";
 export interface ICreateUnpublishEntryDataResponse<TValues extends CmsEntryValues = CmsEntryValues> {
     entry: CmsEntry<TValues>;
 }
+/**
+ * Expected failures of building the data of an entry being unpublished.
+ */
+export interface ICreateUnpublishEntryDataFactoryErrors {
+    latest: GetLatestRevisionByEntryIdUseCase.Error;
+}
+type FactoryError = ICreateUnpublishEntryDataFactoryErrors[keyof ICreateUnpublishEntryDataFactoryErrors];
 export interface ICreateUnpublishEntryDataFactory {
-    create<TValues extends CmsEntryValues = CmsEntryValues>(originalEntry: CmsEntry<TValues>): Promise<ICreateUnpublishEntryDataResponse<TValues>>;
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, originalEntry: CmsEntry<TValues>): Promise<Result<ICreateUnpublishEntryDataResponse<TValues>, FactoryError>>;
 }
 export declare const CreateUnpublishEntryDataFactory: import("@webiny/di").Abstraction<ICreateUnpublishEntryDataFactory>;
 export declare namespace CreateUnpublishEntryDataFactory {
     type Interface = ICreateUnpublishEntryDataFactory;
+    type Error = FactoryError;
+    type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<ICreateUnpublishEntryDataResponse<TValues>, FactoryError>;
     type Response<TValues extends CmsEntryValues = CmsEntryValues> = ICreateUnpublishEntryDataResponse<TValues>;
 }
+export {};

package/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsEntry, CmsEntryValues } from \"~/types/index.js\";\n\nexport interface ICreateUnpublishEntryDataResponse<\n    TValues extends CmsEntryValues = CmsEntryValues\n> {\n    entry: CmsEntry<TValues>;\n}\n\nexport interface ICreateUnpublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        originalEntry: CmsEntry<TValues>\n    ): Promise<ICreateUnpublishEntryDataResponse<TValues>>;\n}\n\nexport const CreateUnpublishEntryDataFactory = createAbstraction<ICreateUnpublishEntryDataFactory>(\n    \"Cms/Entry/CreateUnpublishEntryDataFactory\"\n);\n\nexport namespace CreateUnpublishEntryDataFactory {\n    export type Interface = ICreateUnpublishEntryDataFactory;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreateUnpublishEntryDataResponse<TValues>;\n}\n"],"names":["CreateUnpublishEntryDataFactory","createAbstraction"],"mappings":";AAeO,MAAMA,kCAAkCC,kBAC3C"}
+{"version":3,"file":"features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/abstractions.js","sources":["../../../../../src/features/contentEntry/entryDataFactories/CreateUnpublishEntryDataFactory/abstractions.ts"],"sourcesContent":["import { createAbstraction, type Result } from \"@webiny/feature/api\";\nimport type { GetLatestRevisionByEntryIdUseCase } from \"~/features/contentEntry/GetLatestRevisionByEntryId/index.js\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"~/types/index.js\";\n\nexport interface ICreateUnpublishEntryDataResponse<\n    TValues extends CmsEntryValues = CmsEntryValues\n> {\n    entry: CmsEntry<TValues>;\n}\n\n/**\n * Expected failures of building the data of an entry being unpublished.\n */\nexport interface ICreateUnpublishEntryDataFactoryErrors {\n    latest: GetLatestRevisionByEntryIdUseCase.Error;\n}\n\ntype FactoryError =\n    ICreateUnpublishEntryDataFactoryErrors[keyof ICreateUnpublishEntryDataFactoryErrors];\n\nexport interface ICreateUnpublishEntryDataFactory {\n    create<TValues extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel,\n        originalEntry: CmsEntry<TValues>\n    ): Promise<Result<ICreateUnpublishEntryDataResponse<TValues>, FactoryError>>;\n}\n\nexport const CreateUnpublishEntryDataFactory = createAbstraction<ICreateUnpublishEntryDataFactory>(\n    \"Cms/Entry/CreateUnpublishEntryDataFactory\"\n);\n\nexport namespace CreateUnpublishEntryDataFactory {\n    export type Interface = ICreateUnpublishEntryDataFactory;\n    export type Error = FactoryError;\n    export type Return<TValues extends CmsEntryValues = CmsEntryValues> = Result<\n        ICreateUnpublishEntryDataResponse<TValues>,\n        FactoryError\n    >;\n    export type Response<TValues extends CmsEntryValues = CmsEntryValues> =\n        ICreateUnpublishEntryDataResponse<TValues>;\n}\n"],"names":["CreateUnpublishEntryDataFactory","createAbstraction"],"mappings":";AA2BO,MAAMA,kCAAkCC,kBAC3C"}

package/features/contentEntry/entryDataFactories/UpdateEntryDataFactory/UpdateEntryDataFactory.d.ts

@@ -1,12 +1,16 @@
-import { type IUpdateEntryDataFactory, type IUpdateEntryDataResponse } from "./abstractions.js";
+import { type IUpdateEntryDataFactory, UpdateEntryDataFactory as FactoryAbstraction } from "./abstractions.js";
 import { CmsContext } from "../../../../features/shared/abstractions.js";
 import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
 import type { CmsEntry, CmsEntryValues, CmsModel, UpdateCmsEntryInput, UpdateCmsEntryOptionsInput } from "../../../../types/index.js";
+import { ModelToAstConverter } from "../../../../features/contentModel/ModelToAstConverter/abstractions.js";
+import { GetLatestRevisionByEntryIdUseCase } from "../../../../features/contentEntry/GetLatestRevisionByEntryId/index.js";
 declare class UpdateEntryDataFactoryImpl implements IUpdateEntryDataFactory {
     private readonly cmsContext;
     private readonly identityContext;
-    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface);
-    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, rawInput: UpdateCmsEntryInput<TValues>, originalEntry: CmsEntry<TValues>, options?: UpdateCmsEntryOptionsInput): Promise<IUpdateEntryDataResponse<TValues>>;
+    private readonly modelToAstConverter;
+    private readonly getLatestRevision;
+    constructor(cmsContext: CmsContext.Interface, identityContext: IdentityContext.Interface, modelToAstConverter: ModelToAstConverter.Interface, getLatestRevision: GetLatestRevisionByEntryIdUseCase.Interface);
+    create<TValues extends CmsEntryValues = CmsEntryValues>(model: CmsModel, rawInput: UpdateCmsEntryInput<TValues>, originalEntry: CmsEntry<TValues>, options?: UpdateCmsEntryOptionsInput): Promise<FactoryAbstraction.Return<TValues>>;
 }
 export declare const UpdateEntryDataFactory: import("@webiny/di").Implementation<typeof UpdateEntryDataFactoryImpl>;
 export {};