@webiny/api-headless-cms-ddb 6.4.5 → 6.6.0-alpha.0

package/operations/entry/DdbPublishEntry.js

@@ -0,0 +1,161 @@
+import error from "@webiny/error";
+import { CONTENT_ENTRY_STATUS } from "@webiny/api-headless-cms/types/index.js";
+import { PublishEntryStorageOperation } from "@webiny/api-headless-cms/features/shared/storageOperations/entry/PublishEntryStorageOperation.js";
+import { CmsDdbEntryEntity } from "../../abstractions/CmsDdbEntryEntity.js";
+import { CmsDdbDataLoaders } from "../../abstractions/CmsDdbDataLoaders.js";
+import { CmsStorageModelProvider } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { createEntryLatestKeys, createEntryPublishedKeys, createEntryRevisionKeys } from "./keys.js";
+import { isEntryLevelEntryMetaField, pickEntryMetaFields } from "@webiny/api-headless-cms/constants.js";
+import { convertFromStorageEntry, convertToStorageEntry } from "./storageEntryUtils.js";
+class DdbPublishEntryImpl {
+    constructor(entity, dataLoaders, storageModelProvider){
+        this.entity = entity;
+        this.dataLoaders = dataLoaders;
+        this.storageModelProvider = storageModelProvider;
+    }
+    async getLatestRevisionByEntryId(initialModel, params) {
+        const model = this.storageModelProvider.getModel(initialModel);
+        const items = await this.dataLoaders.getLatestRevisionByEntryId({
+            model,
+            ids: [
+                params.id
+            ]
+        });
+        const item = items.shift() || null;
+        if (!item) return null;
+        return convertFromStorageEntry({
+            storageEntry: item,
+            model
+        });
+    }
+    async getPublishedRevisionByEntryId(initialModel, params) {
+        const model = this.storageModelProvider.getModel(initialModel);
+        const items = await this.dataLoaders.getPublishedRevisionByEntryId({
+            model,
+            ids: [
+                params.id
+            ]
+        });
+        const item = items.shift() || null;
+        if (!item) return null;
+        return convertFromStorageEntry({
+            storageEntry: item,
+            model
+        });
+    }
+    async execute(initialModel, params) {
+        const { entry, storageEntry: initialStorageEntry } = params;
+        const model = this.storageModelProvider.getModel(initialModel);
+        const initialLatestStorageEntry = await this.getLatestRevisionByEntryId(model, entry);
+        if (!initialLatestStorageEntry) throw new error('Could not publish entry. Could not load latest ("L") record.', "PUBLISH_ERROR", {
+            entry
+        });
+        const initialPublishedStorageEntry = await this.getPublishedRevisionByEntryId(model, entry);
+        const storageEntry = convertToStorageEntry({
+            model,
+            storageEntry: initialStorageEntry
+        });
+        const entityBatch = this.entity.createEntityWriter({
+            put: [
+                {
+                    ...createEntryRevisionKeys(storageEntry),
+                    data: {
+                        ...storageEntry
+                    }
+                },
+                {
+                    ...createEntryPublishedKeys(storageEntry),
+                    data: {
+                        ...storageEntry
+                    }
+                }
+            ]
+        });
+        const publishedRevisionId = initialPublishedStorageEntry?.id;
+        const publishingLatestRevision = entry.id === initialLatestStorageEntry.id;
+        if (publishingLatestRevision) {
+            entityBatch.put({
+                ...createEntryLatestKeys(storageEntry),
+                data: {
+                    ...storageEntry
+                }
+            });
+            if (publishedRevisionId && publishedRevisionId !== entry.id) {
+                const publishedStorageEntry = convertToStorageEntry({
+                    storageEntry: initialPublishedStorageEntry,
+                    model
+                });
+                entityBatch.put({
+                    ...createEntryRevisionKeys(publishedStorageEntry),
+                    data: {
+                        ...publishedStorageEntry,
+                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+                    }
+                });
+            }
+        } else {
+            const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
+            const latestStorageEntry = convertToStorageEntry({
+                storageEntry: initialLatestStorageEntry,
+                model
+            });
+            let latestRevisionStatus = latestStorageEntry.status;
+            if (latestRevisionStatus === CONTENT_ENTRY_STATUS.PUBLISHED) latestRevisionStatus = CONTENT_ENTRY_STATUS.UNPUBLISHED;
+            const latestStorageEntryFields = {
+                ...latestStorageEntry,
+                ...updatedEntryLevelMetaFields,
+                status: latestRevisionStatus
+            };
+            entityBatch.put({
+                ...createEntryLatestKeys(latestStorageEntryFields),
+                data: {
+                    ...latestStorageEntryFields
+                }
+            });
+            entityBatch.put({
+                ...createEntryRevisionKeys(latestStorageEntryFields),
+                data: {
+                    ...latestStorageEntryFields
+                }
+            });
+            const publishedRevisionDifferentFromLatest = publishedRevisionId && publishedRevisionId !== latestStorageEntry.id;
+            if (publishedRevisionDifferentFromLatest) {
+                const publishedStorageEntry = convertToStorageEntry({
+                    storageEntry: initialPublishedStorageEntry,
+                    model
+                });
+                entityBatch.put({
+                    ...createEntryRevisionKeys(publishedStorageEntry),
+                    data: {
+                        ...publishedStorageEntry,
+                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+                    }
+                });
+            }
+        }
+        try {
+            await entityBatch.execute();
+            this.dataLoaders.clearAll({
+                tenant: entry.tenant
+            });
+            return initialStorageEntry;
+        } catch (ex) {
+            throw new error(ex.message || "Could not execute the publishing batch.", ex.code || "PUBLISH_ERROR", {
+                entry,
+                latestStorageEntry: initialLatestStorageEntry,
+                publishedStorageEntry: initialPublishedStorageEntry
+            });
+        }
+    }
+}
+const DdbPublishEntry = PublishEntryStorageOperation.createImplementation({
+    implementation: DdbPublishEntryImpl,
+    dependencies: [
+        CmsDdbEntryEntity,
+        CmsDdbDataLoaders,
+        CmsStorageModelProvider
+    ]
+});
+export { DdbPublishEntry };
+
+//# sourceMappingURL=DdbPublishEntry.js.map

package/operations/entry/DdbPublishEntry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operations/entry/DdbPublishEntry.js","sources":["../../../src/operations/entry/DdbPublishEntry.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryStorageOperationsPublishParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { CONTENT_ENTRY_STATUS } from \"@webiny/api-headless-cms/types/index.js\";\nimport { PublishEntryStorageOperation } from \"@webiny/api-headless-cms/features/shared/storageOperations/entry/PublishEntryStorageOperation.js\";\nimport { CmsDdbEntryEntity } from \"~/abstractions/CmsDdbEntryEntity.js\";\nimport { CmsDdbDataLoaders } from \"~/abstractions/CmsDdbDataLoaders.js\";\nimport { CmsStorageModelProvider } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport {\n    createEntryLatestKeys,\n    createEntryPublishedKeys,\n    createEntryRevisionKeys\n} from \"~/operations/entry/keys.js\";\nimport {\n    isEntryLevelEntryMetaField,\n    pickEntryMetaFields\n} from \"@webiny/api-headless-cms/constants.js\";\nimport { convertFromStorageEntry, convertToStorageEntry } from \"./storageEntryUtils.js\";\n\nclass DdbPublishEntryImpl implements PublishEntryStorageOperation.Interface {\n    constructor(\n        private entity: CmsDdbEntryEntity.Interface,\n        private dataLoaders: CmsDdbDataLoaders.Interface,\n        private storageModelProvider: CmsStorageModelProvider.Interface\n    ) {}\n\n    private async getLatestRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        initialModel: CmsModel,\n        params: { id: string }\n    ) {\n        const model = this.storageModelProvider.getModel<T>(initialModel);\n\n        const items = await this.dataLoaders.getLatestRevisionByEntryId<T>({\n            model,\n            ids: [params.id]\n        });\n        const item = items.shift() || null;\n        if (!item) {\n            return null;\n        }\n        return convertFromStorageEntry({\n            storageEntry: item,\n            model\n        });\n    }\n\n    private async getPublishedRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        initialModel: CmsModel,\n        params: { id: string }\n    ) {\n        const model = this.storageModelProvider.getModel<T>(initialModel);\n\n        const items = await this.dataLoaders.getPublishedRevisionByEntryId<T>({\n            model,\n            ids: [params.id]\n        });\n        const item = items.shift() || null;\n        if (!item) {\n            return null;\n        }\n        return convertFromStorageEntry({\n            storageEntry: item,\n            model\n        });\n    }\n\n    async execute<T extends CmsEntryValues = CmsEntryValues>(\n        initialModel: CmsModel,\n        params: CmsEntryStorageOperationsPublishParams<T>\n    ) {\n        const { entry, storageEntry: initialStorageEntry } = params;\n        const model = this.storageModelProvider.getModel(initialModel);\n\n        /**\n         * We need the latest and published entries to see if something needs to be updated alongside the publishing one.\n         */\n        const initialLatestStorageEntry = await this.getLatestRevisionByEntryId(model, entry);\n        if (!initialLatestStorageEntry) {\n            throw new WebinyError(\n                `Could not publish entry. Could not load latest (\"L\") record.`,\n                \"PUBLISH_ERROR\",\n                { entry }\n            );\n        }\n\n        const initialPublishedStorageEntry = await this.getPublishedRevisionByEntryId(model, entry);\n\n        const storageEntry = convertToStorageEntry({\n            model,\n            storageEntry: initialStorageEntry\n        });\n\n        // 1. Update REV# and P records with new data.\n        const entityBatch = this.entity.createEntityWriter({\n            put: [\n                {\n                    ...createEntryRevisionKeys(storageEntry),\n                    data: {\n                        ...storageEntry\n                    }\n                },\n                {\n                    ...createEntryPublishedKeys(storageEntry),\n                    data: {\n                        ...storageEntry\n                    }\n                }\n            ]\n        });\n\n        // 2. When it comes to the latest record, we need to perform a couple of different\n        // updates, based on whether the entry being published is the latest revision or not.\n        const publishedRevisionId = initialPublishedStorageEntry?.id;\n        const publishingLatestRevision = entry.id === initialLatestStorageEntry.id;\n\n        if (publishingLatestRevision) {\n            // 2.1 If we're publishing the latest revision, we first need to update the L record.\n            entityBatch.put({\n                ...createEntryLatestKeys(storageEntry),\n                data: {\n                    ...storageEntry\n                }\n            });\n\n            // 2.2 Additionally, if we have a previously published entry, we need to mark it as unpublished.\n            if (publishedRevisionId && publishedRevisionId !== entry.id) {\n                const publishedStorageEntry = convertToStorageEntry({\n                    storageEntry: initialPublishedStorageEntry,\n                    model\n                });\n\n                entityBatch.put({\n                    ...createEntryRevisionKeys(publishedStorageEntry),\n                    data: {\n                        ...publishedStorageEntry,\n                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED\n                    }\n                });\n            }\n        } else {\n            // 2.3 If the published revision is not the latest one, the situation is a bit\n            // more complex. We first need to update the L and REV# records with the new\n            // values of *only entry-level* meta fields.\n            const updatedEntryLevelMetaFields = pickEntryMetaFields(\n                entry,\n                isEntryLevelEntryMetaField\n            );\n\n            const latestStorageEntry = convertToStorageEntry({\n                storageEntry: initialLatestStorageEntry,\n                model\n            });\n\n            // 2.3.1 Update L record. Apart from updating the entry-level meta fields, we also need\n            //    to change the status from \"published\" to \"unpublished\" (if the status is set to \"published\").\n            let latestRevisionStatus = latestStorageEntry.status;\n            if (latestRevisionStatus === CONTENT_ENTRY_STATUS.PUBLISHED) {\n                latestRevisionStatus = CONTENT_ENTRY_STATUS.UNPUBLISHED;\n            }\n\n            const latestStorageEntryFields = {\n                ...latestStorageEntry,\n                ...updatedEntryLevelMetaFields,\n                status: latestRevisionStatus\n            };\n\n            entityBatch.put({\n                ...createEntryLatestKeys(latestStorageEntryFields),\n                data: {\n                    ...latestStorageEntryFields\n                }\n            });\n\n            // 2.3.2 Update REV# record.\n            entityBatch.put({\n                ...createEntryRevisionKeys(latestStorageEntryFields),\n                data: {\n                    ...latestStorageEntryFields\n                }\n            });\n\n            // 2.3.3 Finally, if we got a published entry, but it wasn't the latest one, we need to take\n            //    an extra step and mark it as unpublished.\n            const publishedRevisionDifferentFromLatest =\n                publishedRevisionId && publishedRevisionId !== latestStorageEntry.id;\n            if (publishedRevisionDifferentFromLatest) {\n                const publishedStorageEntry = convertToStorageEntry({\n                    storageEntry: initialPublishedStorageEntry,\n                    model\n                });\n\n                entityBatch.put({\n                    ...createEntryRevisionKeys(publishedStorageEntry),\n                    data: {\n                        ...publishedStorageEntry,\n                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED\n                    }\n                });\n            }\n        }\n\n        try {\n            await entityBatch.execute();\n            this.dataLoaders.clearAll({\n                tenant: entry.tenant\n            });\n            return initialStorageEntry;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not execute the publishing batch.\",\n                ex.code || \"PUBLISH_ERROR\",\n                {\n                    entry,\n                    latestStorageEntry: initialLatestStorageEntry,\n                    publishedStorageEntry: initialPublishedStorageEntry\n                }\n            );\n        }\n    }\n}\n\nexport const DdbPublishEntry = PublishEntryStorageOperation.createImplementation({\n    implementation: DdbPublishEntryImpl,\n    dependencies: [CmsDdbEntryEntity, CmsDdbDataLoaders, CmsStorageModelProvider]\n});\n"],"names":["DdbPublishEntryImpl","entity","dataLoaders","storageModelProvider","initialModel","params","model","items","item","convertFromStorageEntry","entry","initialStorageEntry","initialLatestStorageEntry","WebinyError","initialPublishedStorageEntry","storageEntry","convertToStorageEntry","entityBatch","createEntryRevisionKeys","createEntryPublishedKeys","publishedRevisionId","publishingLatestRevision","createEntryLatestKeys","publishedStorageEntry","CONTENT_ENTRY_STATUS","updatedEntryLevelMetaFields","pickEntryMetaFields","isEntryLevelEntryMetaField","latestStorageEntry","latestRevisionStatus","latestStorageEntryFields","publishedRevisionDifferentFromLatest","ex","DdbPublishEntry","PublishEntryStorageOperation","CmsDdbEntryEntity","CmsDdbDataLoaders","CmsStorageModelProvider"],"mappings":"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"}

package/operations/entry/DdbRestoreFromBin.d.ts

@@ -0,0 +1,16 @@
+import type { CmsModel, CmsEntryValues, CmsEntryStorageOperationsRestoreFromBinParams, CmsStorageEntry } from "@webiny/api-headless-cms/types/index.js";
+import { RestoreFromBinStorageOperation } from "@webiny/api-headless-cms/features/shared/storageOperations/entry/RestoreFromBinStorageOperation.js";
+import { CmsDdbEntryEntity } from "../../abstractions/CmsDdbEntryEntity.js";
+import { CmsDdbDataLoaders } from "../../abstractions/CmsDdbDataLoaders.js";
+import { CmsStorageModelProvider } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+declare class DdbRestoreFromBinImpl implements RestoreFromBinStorageOperation.Interface {
+    private entity;
+    private dataLoaders;
+    private storageModelProvider;
+    constructor(entity: CmsDdbEntryEntity.Interface, dataLoaders: CmsDdbDataLoaders.Interface, storageModelProvider: CmsStorageModelProvider.Interface);
+    execute<T extends CmsEntryValues = CmsEntryValues>(initialModel: CmsModel, params: CmsEntryStorageOperationsRestoreFromBinParams<T>): Promise<CmsStorageEntry<T>>;
+}
+export declare const DdbRestoreFromBin: typeof DdbRestoreFromBinImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-headless-cms/features/shared/storageOperations/entry/RestoreFromBinStorageOperation.js").IRestoreFromBinStorageOperation>;
+};
+export {};

package/operations/entry/DdbRestoreFromBin.js

@@ -0,0 +1,78 @@
+import error from "@webiny/error";
+import { RestoreFromBinStorageOperation } from "@webiny/api-headless-cms/features/shared/storageOperations/entry/RestoreFromBinStorageOperation.js";
+import { CmsDdbEntryEntity } from "../../abstractions/CmsDdbEntryEntity.js";
+import { CmsDdbDataLoaders } from "../../abstractions/CmsDdbDataLoaders.js";
+import { CmsStorageModelProvider } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { createPartitionKey } from "./keys.js";
+import { isRestoredEntryMetaField, pickEntryMetaFields } from "@webiny/api-headless-cms/constants.js";
+import { convertToStorageEntry } from "./storageEntryUtils.js";
+class DdbRestoreFromBinImpl {
+    constructor(entity, dataLoaders, storageModelProvider){
+        this.entity = entity;
+        this.dataLoaders = dataLoaders;
+        this.storageModelProvider = storageModelProvider;
+    }
+    async execute(initialModel, params) {
+        const { entry, storageEntry: initialStorageEntry } = params;
+        const model = this.storageModelProvider.getModel(initialModel);
+        let records = [];
+        try {
+            records = await this.entity.queryAll({
+                partitionKey: createPartitionKey({
+                    id: entry.id,
+                    tenant: model.tenant
+                }),
+                options: {
+                    gte: " "
+                }
+            });
+        } catch (ex) {
+            throw new error(ex.message || "Could not load all records.", ex.code || "LOAD_ALL_RECORDS_ERROR", {
+                error: ex,
+                id: entry.id
+            });
+        }
+        if (0 === records.length) return initialStorageEntry;
+        const storageEntry = convertToStorageEntry({
+            model,
+            storageEntry: initialStorageEntry
+        });
+        const updatedRestoredMetaFields = pickEntryMetaFields(storageEntry, isRestoredEntryMetaField);
+        const entityBatch = this.entity.createEntityWriter({
+            put: records.map((record)=>({
+                    ...record,
+                    data: {
+                        ...record.data,
+                        ...updatedRestoredMetaFields,
+                        wbyDeleted: storageEntry.wbyDeleted,
+                        location: storageEntry.location,
+                        binOriginalFolderId: storageEntry.binOriginalFolderId
+                    }
+                }))
+        });
+        try {
+            await entityBatch.execute();
+            this.dataLoaders.clearAll({
+                tenant: entry.tenant
+            });
+            return initialStorageEntry;
+        } catch (ex) {
+            throw new error(ex.message || "Could not restore the entry from the bin.", ex.code || "RESTORE_ENTRY_ERROR", {
+                error: ex,
+                entry,
+                storageEntry
+            });
+        }
+    }
+}
+const DdbRestoreFromBin = RestoreFromBinStorageOperation.createImplementation({
+    implementation: DdbRestoreFromBinImpl,
+    dependencies: [
+        CmsDdbEntryEntity,
+        CmsDdbDataLoaders,
+        CmsStorageModelProvider
+    ]
+});
+export { DdbRestoreFromBin };
+
+//# sourceMappingURL=DdbRestoreFromBin.js.map

package/operations/entry/DdbRestoreFromBin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operations/entry/DdbRestoreFromBin.js","sources":["../../../src/operations/entry/DdbRestoreFromBin.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryStorageOperationsRestoreFromBinParams,\n    CmsStorageEntry\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { RestoreFromBinStorageOperation } from \"@webiny/api-headless-cms/features/shared/storageOperations/entry/RestoreFromBinStorageOperation.js\";\nimport { CmsDdbEntryEntity } from \"~/abstractions/CmsDdbEntryEntity.js\";\nimport { CmsDdbDataLoaders } from \"~/abstractions/CmsDdbDataLoaders.js\";\nimport { CmsStorageModelProvider } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { createPartitionKey } from \"~/operations/entry/keys.js\";\nimport {\n    isRestoredEntryMetaField,\n    pickEntryMetaFields\n} from \"@webiny/api-headless-cms/constants.js\";\nimport { convertToStorageEntry } from \"./storageEntryUtils.js\";\n\nclass DdbRestoreFromBinImpl implements RestoreFromBinStorageOperation.Interface {\n    constructor(\n        private entity: CmsDdbEntryEntity.Interface,\n        private dataLoaders: CmsDdbDataLoaders.Interface,\n        private storageModelProvider: CmsStorageModelProvider.Interface\n    ) {}\n\n    async execute<T extends CmsEntryValues = CmsEntryValues>(\n        initialModel: CmsModel,\n        params: CmsEntryStorageOperationsRestoreFromBinParams<T>\n    ): Promise<CmsStorageEntry<T>> {\n        const { entry, storageEntry: initialStorageEntry } = params;\n        const model = this.storageModelProvider.getModel(initialModel);\n\n        /**\n         * First we need to load all the revisions and published / latest entries.\n         */\n        let records: Awaited<ReturnType<typeof this.entity.queryAll>> = [];\n        try {\n            records = await this.entity.queryAll({\n                partitionKey: createPartitionKey({\n                    id: entry.id,\n                    tenant: model.tenant\n                }),\n                options: {\n                    gte: \" \"\n                }\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not load all records.\",\n                ex.code || \"LOAD_ALL_RECORDS_ERROR\",\n                {\n                    error: ex,\n                    id: entry.id\n                }\n            );\n        }\n        if (records.length === 0) {\n            return initialStorageEntry;\n        }\n\n        const storageEntry = convertToStorageEntry({\n            model,\n            storageEntry: initialStorageEntry\n        });\n\n        /**\n         * Let's pick the `restored` meta fields from the storage entry.\n         */\n        const updatedRestoredMetaFields = pickEntryMetaFields(\n            storageEntry,\n            isRestoredEntryMetaField\n        );\n\n        const entityBatch = this.entity.createEntityWriter({\n            put: records.map(record => {\n                return {\n                    ...record,\n                    data: {\n                        ...record.data,\n                        ...updatedRestoredMetaFields,\n                        wbyDeleted: storageEntry.wbyDeleted,\n                        location: storageEntry.location,\n                        binOriginalFolderId: storageEntry.binOriginalFolderId\n                    }\n                };\n            })\n        });\n\n        /**\n         * And finally write it...\n         */\n        try {\n            await entityBatch.execute();\n\n            this.dataLoaders.clearAll({\n                tenant: entry.tenant\n            });\n\n            return initialStorageEntry;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not restore the entry from the bin.\",\n                ex.code || \"RESTORE_ENTRY_ERROR\",\n                {\n                    error: ex,\n                    entry,\n                    storageEntry\n                }\n            );\n        }\n    }\n}\n\nexport const DdbRestoreFromBin = RestoreFromBinStorageOperation.createImplementation({\n    implementation: DdbRestoreFromBinImpl,\n    dependencies: [CmsDdbEntryEntity, CmsDdbDataLoaders, CmsStorageModelProvider]\n});\n"],"names":["DdbRestoreFromBinImpl","entity","dataLoaders","storageModelProvider","initialModel","params","entry","initialStorageEntry","model","records","createPartitionKey","ex","WebinyError","storageEntry","convertToStorageEntry","updatedRestoredMetaFields","pickEntryMetaFields","isRestoredEntryMetaField","entityBatch","record","DdbRestoreFromBin","RestoreFromBinStorageOperation","CmsDdbEntryEntity","CmsDdbDataLoaders","CmsStorageModelProvider"],"mappings":";;;;;;;;AAkBA,MAAMA;IACF,YACYC,MAAmC,EACnCC,WAAwC,EACxCC,oBAAuD,CACjE;aAHUF,MAAM,GAANA;aACAC,WAAW,GAAXA;aACAC,oBAAoB,GAApBA;IACT;IAEH,MAAM,QACFC,YAAsB,EACtBC,MAAwD,EAC7B;QAC3B,MAAM,EAAEC,KAAK,EAAE,cAAcC,mBAAmB,EAAE,GAAGF;QACrD,MAAMG,QAAQ,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAACJ;QAKjD,IAAIK,UAA4D,EAAE;QAClE,IAAI;YACAA,UAAU,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACjC,cAAcC,mBAAmB;oBAC7B,IAAIJ,MAAM,EAAE;oBACZ,QAAQE,MAAM,MAAM;gBACxB;gBACA,SAAS;oBACL,KAAK;gBACT;YACJ;QACJ,EAAE,OAAOG,IAAI;YACT,MAAM,IAAIC,MACND,GAAG,OAAO,IAAI,+BACdA,GAAG,IAAI,IAAI,0BACX;gBACI,OAAOA;gBACP,IAAIL,MAAM,EAAE;YAChB;QAER;QACA,IAAIG,AAAmB,MAAnBA,QAAQ,MAAM,EACd,OAAOF;QAGX,MAAMM,eAAeC,sBAAsB;YACvCN;YACA,cAAcD;QAClB;QAKA,MAAMQ,4BAA4BC,oBAC9BH,cACAI;QAGJ,MAAMC,cAAc,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;YAC/C,KAAKT,QAAQ,GAAG,CAACU,CAAAA,SACN;oBACH,GAAGA,MAAM;oBACT,MAAM;wBACF,GAAGA,OAAO,IAAI;wBACd,GAAGJ,yBAAyB;wBAC5B,YAAYF,aAAa,UAAU;wBACnC,UAAUA,aAAa,QAAQ;wBAC/B,qBAAqBA,aAAa,mBAAmB;oBACzD;gBACJ;QAER;QAKA,IAAI;YACA,MAAMK,YAAY,OAAO;YAEzB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;gBACtB,QAAQZ,MAAM,MAAM;YACxB;YAEA,OAAOC;QACX,EAAE,OAAOI,IAAI;YACT,MAAM,IAAIC,MACND,GAAG,OAAO,IAAI,6CACdA,GAAG,IAAI,IAAI,uBACX;gBACI,OAAOA;gBACPL;gBACAO;YACJ;QAER;IACJ;AACJ;AAEO,MAAMO,oBAAoBC,+BAA+B,oBAAoB,CAAC;IACjF,gBAAgBrB;IAChB,cAAc;QAACsB;QAAmBC;QAAmBC;KAAwB;AACjF"}

package/operations/entry/DdbUnpublishEntry.d.ts

@@ -0,0 +1,17 @@
+import type { CmsModel, CmsEntryValues, CmsEntryStorageOperationsUnpublishParams } from "@webiny/api-headless-cms/types/index.js";
+import { UnpublishEntryStorageOperation } from "@webiny/api-headless-cms/features/shared/storageOperations/entry/UnpublishEntryStorageOperation.js";
+import { CmsDdbEntryEntity } from "../../abstractions/CmsDdbEntryEntity.js";
+import { CmsDdbDataLoaders } from "../../abstractions/CmsDdbDataLoaders.js";
+import { CmsStorageModelProvider } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+declare class DdbUnpublishEntryImpl implements UnpublishEntryStorageOperation.Interface {
+    private entity;
+    private dataLoaders;
+    private storageModelProvider;
+    constructor(entity: CmsDdbEntryEntity.Interface, dataLoaders: CmsDdbDataLoaders.Interface, storageModelProvider: CmsStorageModelProvider.Interface);
+    private getLatestRevisionByEntryId;
+    execute<T extends CmsEntryValues = CmsEntryValues>(initialModel: CmsModel, params: CmsEntryStorageOperationsUnpublishParams<T>): Promise<import("@webiny/api-headless-cms/types/types.js").CmsStorageEntry<T>>;
+}
+export declare const DdbUnpublishEntry: typeof DdbUnpublishEntryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-headless-cms/features/shared/storageOperations/entry/UnpublishEntryStorageOperation.js").IUnpublishEntryStorageOperation>;
+};
+export {};

package/operations/entry/DdbUnpublishEntry.js

@@ -0,0 +1,112 @@
+import error from "@webiny/error";
+import { UnpublishEntryStorageOperation } from "@webiny/api-headless-cms/features/shared/storageOperations/entry/UnpublishEntryStorageOperation.js";
+import { CmsDdbEntryEntity } from "../../abstractions/CmsDdbEntryEntity.js";
+import { CmsDdbDataLoaders } from "../../abstractions/CmsDdbDataLoaders.js";
+import { CmsStorageModelProvider } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { createEntryLatestKeys, createEntryRevisionKeys, createPartitionKey, createPublishedSortKey } from "./keys.js";
+import { isEntryLevelEntryMetaField, pickEntryMetaFields } from "@webiny/api-headless-cms/constants.js";
+import { convertFromStorageEntry, convertToStorageEntry } from "./storageEntryUtils.js";
+class DdbUnpublishEntryImpl {
+    constructor(entity, dataLoaders, storageModelProvider){
+        this.entity = entity;
+        this.dataLoaders = dataLoaders;
+        this.storageModelProvider = storageModelProvider;
+    }
+    async getLatestRevisionByEntryId(initialModel, params) {
+        const model = this.storageModelProvider.getModel(initialModel);
+        const items = await this.dataLoaders.getLatestRevisionByEntryId({
+            model,
+            ids: [
+                params.id
+            ]
+        });
+        const item = items.shift() || null;
+        if (!item) return null;
+        return convertFromStorageEntry({
+            storageEntry: item,
+            model
+        });
+    }
+    async execute(initialModel, params) {
+        const { entry, storageEntry: initialStorageEntry } = params;
+        const model = this.storageModelProvider.getModel(initialModel);
+        const partitionKey = createPartitionKey({
+            id: entry.id,
+            tenant: model.tenant
+        });
+        const storageEntry = convertToStorageEntry({
+            storageEntry: initialStorageEntry,
+            model
+        });
+        const entityBatch = this.entity.createEntityWriter({
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createPublishedSortKey()
+                }
+            ],
+            put: [
+                {
+                    ...createEntryRevisionKeys(storageEntry),
+                    data: {
+                        ...storageEntry
+                    }
+                }
+            ]
+        });
+        const initialLatestStorageEntry = await this.getLatestRevisionByEntryId(model, entry);
+        if (initialLatestStorageEntry) {
+            const unpublishingLatestRevision = entry.id === initialLatestStorageEntry.id;
+            if (unpublishingLatestRevision) entityBatch.put({
+                ...createEntryLatestKeys(storageEntry),
+                data: {
+                    ...storageEntry
+                }
+            });
+            else {
+                const latestStorageEntry = convertToStorageEntry({
+                    storageEntry: initialLatestStorageEntry,
+                    model
+                });
+                const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
+                entityBatch.put({
+                    ...createEntryRevisionKeys(latestStorageEntry),
+                    data: {
+                        ...latestStorageEntry,
+                        ...updatedEntryLevelMetaFields
+                    }
+                });
+                entityBatch.put({
+                    ...createEntryLatestKeys(latestStorageEntry),
+                    data: {
+                        ...latestStorageEntry,
+                        ...updatedEntryLevelMetaFields
+                    }
+                });
+            }
+        }
+        try {
+            await entityBatch.execute();
+            this.dataLoaders.clearAll({
+                tenant: entry.tenant
+            });
+            return initialStorageEntry;
+        } catch (ex) {
+            throw new error(ex.message || "Could not execute unpublish batch.", ex.code || "UNPUBLISH_ERROR", {
+                entry,
+                storageEntry
+            });
+        }
+    }
+}
+const DdbUnpublishEntry = UnpublishEntryStorageOperation.createImplementation({
+    implementation: DdbUnpublishEntryImpl,
+    dependencies: [
+        CmsDdbEntryEntity,
+        CmsDdbDataLoaders,
+        CmsStorageModelProvider
+    ]
+});
+export { DdbUnpublishEntry };
+
+//# sourceMappingURL=DdbUnpublishEntry.js.map

package/operations/entry/DdbUnpublishEntry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operations/entry/DdbUnpublishEntry.js","sources":["../../../src/operations/entry/DdbUnpublishEntry.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryStorageOperationsUnpublishParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { UnpublishEntryStorageOperation } from \"@webiny/api-headless-cms/features/shared/storageOperations/entry/UnpublishEntryStorageOperation.js\";\nimport { CmsDdbEntryEntity } from \"~/abstractions/CmsDdbEntryEntity.js\";\nimport { CmsDdbDataLoaders } from \"~/abstractions/CmsDdbDataLoaders.js\";\nimport { CmsStorageModelProvider } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport {\n    createEntryLatestKeys,\n    createEntryRevisionKeys,\n    createPartitionKey,\n    createPublishedSortKey\n} from \"~/operations/entry/keys.js\";\nimport {\n    isEntryLevelEntryMetaField,\n    pickEntryMetaFields\n} from \"@webiny/api-headless-cms/constants.js\";\nimport { convertFromStorageEntry, convertToStorageEntry } from \"./storageEntryUtils.js\";\n\nclass DdbUnpublishEntryImpl implements UnpublishEntryStorageOperation.Interface {\n    constructor(\n        private entity: CmsDdbEntryEntity.Interface,\n        private dataLoaders: CmsDdbDataLoaders.Interface,\n        private storageModelProvider: CmsStorageModelProvider.Interface\n    ) {}\n\n    private async getLatestRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        initialModel: CmsModel,\n        params: { id: string }\n    ) {\n        const model = this.storageModelProvider.getModel<T>(initialModel);\n\n        const items = await this.dataLoaders.getLatestRevisionByEntryId<T>({\n            model,\n            ids: [params.id]\n        });\n        const item = items.shift() || null;\n        if (!item) {\n            return null;\n        }\n        return convertFromStorageEntry({\n            storageEntry: item,\n            model\n        });\n    }\n\n    async execute<T extends CmsEntryValues = CmsEntryValues>(\n        initialModel: CmsModel,\n        params: CmsEntryStorageOperationsUnpublishParams<T>\n    ) {\n        const { entry, storageEntry: initialStorageEntry } = params;\n        const model = this.storageModelProvider.getModel(initialModel);\n\n        const partitionKey = createPartitionKey({\n            id: entry.id,\n            tenant: model.tenant\n        });\n\n        const storageEntry = convertToStorageEntry({\n            storageEntry: initialStorageEntry,\n            model\n        });\n        /**\n         * We need to:\n         *  - delete currently published entry\n         *  - update current entry revision with new data\n         *  - update the latest entry status - if entry being unpublished is latest\n         */\n        const entityBatch = this.entity.createEntityWriter({\n            delete: [\n                {\n                    PK: partitionKey,\n                    SK: createPublishedSortKey()\n                }\n            ],\n            put: [\n                {\n                    ...createEntryRevisionKeys(storageEntry),\n                    data: {\n                        ...storageEntry\n                    }\n                }\n            ]\n        });\n\n        /**\n         * We need the latest entry to see if something needs to be updated alongside the unpublishing one.\n         */\n        const initialLatestStorageEntry = await this.getLatestRevisionByEntryId(model, entry);\n\n        if (initialLatestStorageEntry) {\n            const unpublishingLatestRevision = entry.id === initialLatestStorageEntry.id;\n            if (unpublishingLatestRevision) {\n                entityBatch.put({\n                    ...createEntryLatestKeys(storageEntry),\n                    data: {\n                        ...storageEntry\n                    }\n                });\n            } else {\n                const latestStorageEntry = convertToStorageEntry({\n                    storageEntry: initialLatestStorageEntry,\n                    model\n                });\n\n                // If the unpublished revision is not the latest one, we still need to\n                // update the latest record with the new values of entry-level meta fields.\n                const updatedEntryLevelMetaFields = pickEntryMetaFields(\n                    entry,\n                    isEntryLevelEntryMetaField\n                );\n\n                // 1. Update actual revision record.\n                entityBatch.put({\n                    ...createEntryRevisionKeys(latestStorageEntry),\n                    data: {\n                        ...latestStorageEntry,\n                        ...updatedEntryLevelMetaFields\n                    }\n                });\n\n                // 2. Update latest record.\n                entityBatch.put({\n                    ...createEntryLatestKeys(latestStorageEntry),\n                    data: {\n                        ...latestStorageEntry,\n                        ...updatedEntryLevelMetaFields\n                    }\n                });\n            }\n        }\n\n        try {\n            await entityBatch.execute();\n            this.dataLoaders.clearAll({\n                tenant: entry.tenant\n            });\n            return initialStorageEntry;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not execute unpublish batch.\",\n                ex.code || \"UNPUBLISH_ERROR\",\n                {\n                    entry,\n                    storageEntry\n                }\n            );\n        }\n    }\n}\n\nexport const DdbUnpublishEntry = UnpublishEntryStorageOperation.createImplementation({\n    implementation: DdbUnpublishEntryImpl,\n    dependencies: [CmsDdbEntryEntity, CmsDdbDataLoaders, CmsStorageModelProvider]\n});\n"],"names":["DdbUnpublishEntryImpl","entity","dataLoaders","storageModelProvider","initialModel","params","model","items","item","convertFromStorageEntry","entry","initialStorageEntry","partitionKey","createPartitionKey","storageEntry","convertToStorageEntry","entityBatch","createPublishedSortKey","createEntryRevisionKeys","initialLatestStorageEntry","unpublishingLatestRevision","createEntryLatestKeys","latestStorageEntry","updatedEntryLevelMetaFields","pickEntryMetaFields","isEntryLevelEntryMetaField","ex","WebinyError","DdbUnpublishEntry","UnpublishEntryStorageOperation","CmsDdbEntryEntity","CmsDdbDataLoaders","CmsStorageModelProvider"],"mappings":";;;;;;;;AAsBA,MAAMA;IACF,YACYC,MAAmC,EACnCC,WAAwC,EACxCC,oBAAuD,CACjE;aAHUF,MAAM,GAANA;aACAC,WAAW,GAAXA;aACAC,oBAAoB,GAApBA;IACT;IAEH,MAAc,2BACVC,YAAsB,EACtBC,MAAsB,EACxB;QACE,MAAMC,QAAQ,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAIF;QAEpD,MAAMG,QAAQ,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,CAAI;YAC/DD;YACA,KAAK;gBAACD,OAAO,EAAE;aAAC;QACpB;QACA,MAAMG,OAAOD,MAAM,KAAK,MAAM;QAC9B,IAAI,CAACC,MACD,OAAO;QAEX,OAAOC,wBAAwB;YAC3B,cAAcD;YACdF;QACJ;IACJ;IAEA,MAAM,QACFF,YAAsB,EACtBC,MAAmD,EACrD;QACE,MAAM,EAAEK,KAAK,EAAE,cAAcC,mBAAmB,EAAE,GAAGN;QACrD,MAAMC,QAAQ,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAACF;QAEjD,MAAMQ,eAAeC,mBAAmB;YACpC,IAAIH,MAAM,EAAE;YACZ,QAAQJ,MAAM,MAAM;QACxB;QAEA,MAAMQ,eAAeC,sBAAsB;YACvC,cAAcJ;YACdL;QACJ;QAOA,MAAMU,cAAc,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;YAC/C,QAAQ;gBACJ;oBACI,IAAIJ;oBACJ,IAAIK;gBACR;aACH;YACD,KAAK;gBACD;oBACI,GAAGC,wBAAwBJ,aAAa;oBACxC,MAAM;wBACF,GAAGA,YAAY;oBACnB;gBACJ;aACH;QACL;QAKA,MAAMK,4BAA4B,MAAM,IAAI,CAAC,0BAA0B,CAACb,OAAOI;QAE/E,IAAIS,2BAA2B;YAC3B,MAAMC,6BAA6BV,MAAM,EAAE,KAAKS,0BAA0B,EAAE;YAC5E,IAAIC,4BACAJ,YAAY,GAAG,CAAC;gBACZ,GAAGK,sBAAsBP,aAAa;gBACtC,MAAM;oBACF,GAAGA,YAAY;gBACnB;YACJ;iBACG;gBACH,MAAMQ,qBAAqBP,sBAAsB;oBAC7C,cAAcI;oBACdb;gBACJ;gBAIA,MAAMiB,8BAA8BC,oBAChCd,OACAe;gBAIJT,YAAY,GAAG,CAAC;oBACZ,GAAGE,wBAAwBI,mBAAmB;oBAC9C,MAAM;wBACF,GAAGA,kBAAkB;wBACrB,GAAGC,2BAA2B;oBAClC;gBACJ;gBAGAP,YAAY,GAAG,CAAC;oBACZ,GAAGK,sBAAsBC,mBAAmB;oBAC5C,MAAM;wBACF,GAAGA,kBAAkB;wBACrB,GAAGC,2BAA2B;oBAClC;gBACJ;YACJ;QACJ;QAEA,IAAI;YACA,MAAMP,YAAY,OAAO;YACzB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;gBACtB,QAAQN,MAAM,MAAM;YACxB;YACA,OAAOC;QACX,EAAE,OAAOe,IAAI;YACT,MAAM,IAAIC,MACND,GAAG,OAAO,IAAI,sCACdA,GAAG,IAAI,IAAI,mBACX;gBACIhB;gBACAI;YACJ;QAER;IACJ;AACJ;AAEO,MAAMc,oBAAoBC,+BAA+B,oBAAoB,CAAC;IACjF,gBAAgB7B;IAChB,cAAc;QAAC8B;QAAmBC;QAAmBC;KAAwB;AACjF"}

package/operations/entry/DdbUpdateEntry.d.ts

@@ -0,0 +1,17 @@
+import type { CmsModel, CmsEntryValues, CmsEntryStorageOperationsUpdateParams } from "@webiny/api-headless-cms/types/index.js";
+import { UpdateEntryStorageOperation } from "@webiny/api-headless-cms/features/shared/storageOperations/entry/UpdateEntryStorageOperation.js";
+import { CmsDdbEntryEntity } from "../../abstractions/CmsDdbEntryEntity.js";
+import { CmsDdbDataLoaders } from "../../abstractions/CmsDdbDataLoaders.js";
+import { CmsStorageModelProvider } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+declare class DdbUpdateEntryImpl implements UpdateEntryStorageOperation.Interface {
+    private entity;
+    private dataLoaders;
+    private storageModelProvider;
+    constructor(entity: CmsDdbEntryEntity.Interface, dataLoaders: CmsDdbDataLoaders.Interface, storageModelProvider: CmsStorageModelProvider.Interface);
+    private getLatestRevisionByEntryId;
+    execute<T extends CmsEntryValues = CmsEntryValues>(initialModel: CmsModel, params: CmsEntryStorageOperationsUpdateParams<T>): Promise<import("@webiny/api-headless-cms/types/types.js").CmsStorageEntry<T>>;
+}
+export declare const DdbUpdateEntry: typeof DdbUpdateEntryImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-headless-cms/features/shared/storageOperations/entry/UpdateEntryStorageOperation.js").IUpdateEntryStorageOperation>;
+};
+export {};

package/operations/entry/DdbUpdateEntry.js

@@ -0,0 +1,110 @@
+import error from "@webiny/error";
+import { UpdateEntryStorageOperation } from "@webiny/api-headless-cms/features/shared/storageOperations/entry/UpdateEntryStorageOperation.js";
+import { CmsDdbEntryEntity } from "../../abstractions/CmsDdbEntryEntity.js";
+import { CmsDdbDataLoaders } from "../../abstractions/CmsDdbDataLoaders.js";
+import { CmsStorageModelProvider } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { createEntryLatestKeys, createEntryPublishedKeys, createEntryRevisionKeys } from "./keys.js";
+import { isEntryLevelEntryMetaField, pickEntryMetaFields } from "@webiny/api-headless-cms/constants.js";
+import { convertFromStorageEntry, convertToStorageEntry } from "./storageEntryUtils.js";
+class DdbUpdateEntryImpl {
+    constructor(entity, dataLoaders, storageModelProvider){
+        this.entity = entity;
+        this.dataLoaders = dataLoaders;
+        this.storageModelProvider = storageModelProvider;
+    }
+    async getLatestRevisionByEntryId(initialModel, params) {
+        const model = this.storageModelProvider.getModel(initialModel);
+        const items = await this.dataLoaders.getLatestRevisionByEntryId({
+            model,
+            ids: [
+                params.id
+            ]
+        });
+        const item = items.shift() || null;
+        if (!item) return null;
+        return convertFromStorageEntry({
+            storageEntry: item,
+            model
+        });
+    }
+    async execute(initialModel, params) {
+        const { entry, storageEntry: initialStorageEntry } = params;
+        const model = this.storageModelProvider.getModel(initialModel);
+        const isPublished = "published" === entry.status;
+        const locked = isPublished ? true : entry.locked;
+        const storageEntry = convertToStorageEntry({
+            model,
+            storageEntry: initialStorageEntry
+        });
+        const entityBatch = this.entity.createEntityWriter({
+            put: [
+                {
+                    ...createEntryRevisionKeys(storageEntry),
+                    data: {
+                        ...storageEntry,
+                        locked
+                    }
+                }
+            ]
+        });
+        if (isPublished) entityBatch.put({
+            ...createEntryPublishedKeys(storageEntry),
+            data: {
+                ...storageEntry,
+                locked
+            }
+        });
+        const latestStorageEntry = await this.getLatestRevisionByEntryId(model, entry);
+        if (latestStorageEntry) {
+            const updatingLatestRevision = latestStorageEntry.id === entry.id;
+            if (updatingLatestRevision) entityBatch.put({
+                ...createEntryLatestKeys(storageEntry),
+                data: {
+                    ...storageEntry,
+                    locked
+                }
+            });
+            else {
+                const updatedEntryLevelMetaFields = pickEntryMetaFields(entry, isEntryLevelEntryMetaField);
+                entityBatch.put({
+                    ...createEntryRevisionKeys(latestStorageEntry),
+                    data: {
+                        ...latestStorageEntry,
+                        ...updatedEntryLevelMetaFields
+                    }
+                });
+                entityBatch.put({
+                    ...createEntryLatestKeys(latestStorageEntry),
+                    data: {
+                        ...latestStorageEntry,
+                        ...updatedEntryLevelMetaFields
+                    }
+                });
+            }
+        }
+        try {
+            await entityBatch.execute();
+            this.dataLoaders.clearAll({
+                tenant: entry.tenant
+            });
+            return initialStorageEntry;
+        } catch (ex) {
+            throw new error(ex.message || "Could not update entry.", ex.code || "UPDATE_ERROR", {
+                error: ex,
+                entry,
+                latestStorageEntry
+            });
+        }
+    }
+}
+const DdbUpdateEntry = UpdateEntryStorageOperation.createImplementation({
+    implementation: DdbUpdateEntryImpl,
+    dependencies: [
+        CmsDdbEntryEntity,
+        CmsDdbDataLoaders,
+        CmsStorageModelProvider
+    ]
+});
+export { DdbUpdateEntry };
+
+//# sourceMappingURL=DdbUpdateEntry.js.map

package/operations/entry/DdbUpdateEntry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operations/entry/DdbUpdateEntry.js","sources":["../../../src/operations/entry/DdbUpdateEntry.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsModel,\n    CmsEntryValues,\n    CmsEntryStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { UpdateEntryStorageOperation } from \"@webiny/api-headless-cms/features/shared/storageOperations/entry/UpdateEntryStorageOperation.js\";\nimport { CmsDdbEntryEntity } from \"~/abstractions/CmsDdbEntryEntity.js\";\nimport { CmsDdbDataLoaders } from \"~/abstractions/CmsDdbDataLoaders.js\";\nimport { CmsStorageModelProvider } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport {\n    createEntryLatestKeys,\n    createEntryPublishedKeys,\n    createEntryRevisionKeys\n} from \"~/operations/entry/keys.js\";\nimport {\n    isEntryLevelEntryMetaField,\n    pickEntryMetaFields\n} from \"@webiny/api-headless-cms/constants.js\";\nimport { convertFromStorageEntry, convertToStorageEntry } from \"./storageEntryUtils.js\";\n\nclass DdbUpdateEntryImpl implements UpdateEntryStorageOperation.Interface {\n    constructor(\n        private entity: CmsDdbEntryEntity.Interface,\n        private dataLoaders: CmsDdbDataLoaders.Interface,\n        private storageModelProvider: CmsStorageModelProvider.Interface\n    ) {}\n\n    private async getLatestRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        initialModel: CmsModel,\n        params: { id: string }\n    ) {\n        const model = this.storageModelProvider.getModel<T>(initialModel);\n\n        const items = await this.dataLoaders.getLatestRevisionByEntryId<T>({\n            model,\n            ids: [params.id]\n        });\n        const item = items.shift() || null;\n        if (!item) {\n            return null;\n        }\n        return convertFromStorageEntry({\n            storageEntry: item,\n            model\n        });\n    }\n\n    async execute<T extends CmsEntryValues = CmsEntryValues>(\n        initialModel: CmsModel,\n        params: CmsEntryStorageOperationsUpdateParams<T>\n    ) {\n        const { entry, storageEntry: initialStorageEntry } = params;\n        const model = this.storageModelProvider.getModel(initialModel);\n\n        const isPublished = entry.status === \"published\";\n        const locked = isPublished ? true : entry.locked;\n\n        const storageEntry = convertToStorageEntry({\n            model,\n            storageEntry: initialStorageEntry\n        });\n        /**\n         * We need to:\n         *  - update the current entry\n         *  - update the latest entry if the current entry is the latest one\n         */\n\n        const entityBatch = this.entity.createEntityWriter({\n            put: [\n                {\n                    ...createEntryRevisionKeys(storageEntry),\n                    data: {\n                        ...storageEntry,\n                        locked\n                    }\n                }\n            ]\n        });\n\n        if (isPublished) {\n            entityBatch.put({\n                ...createEntryPublishedKeys(storageEntry),\n                data: {\n                    ...storageEntry,\n                    locked\n                }\n            });\n        }\n\n        /**\n         * We need the latest entry to update it as well if necessary.\n         */\n        const latestStorageEntry = await this.getLatestRevisionByEntryId(model, entry);\n\n        if (latestStorageEntry) {\n            const updatingLatestRevision = latestStorageEntry.id === entry.id;\n            if (updatingLatestRevision) {\n                entityBatch.put({\n                    ...createEntryLatestKeys(storageEntry),\n                    data: {\n                        ...storageEntry,\n                        locked\n                    }\n                });\n            } else {\n                /**\n                 * If not updating latest revision, we still want to update the latest revision's\n                 * entry-level meta fields to match the current revision's entry-level meta fields.\n                 */\n                const updatedEntryLevelMetaFields = pickEntryMetaFields(\n                    entry,\n                    isEntryLevelEntryMetaField\n                );\n\n                /**\n                 * First we update the regular DynamoDB table. Two updates are needed:\n                 * - one for the actual revision record\n                 * - one for the latest record\n                 */\n                entityBatch.put({\n                    ...createEntryRevisionKeys(latestStorageEntry),\n                    data: {\n                        ...latestStorageEntry,\n                        ...updatedEntryLevelMetaFields\n                    }\n                });\n\n                entityBatch.put({\n                    ...createEntryLatestKeys(latestStorageEntry),\n                    data: {\n                        ...latestStorageEntry,\n                        ...updatedEntryLevelMetaFields\n                    }\n                });\n            }\n        }\n\n        try {\n            await entityBatch.execute();\n            this.dataLoaders.clearAll({\n                tenant: entry.tenant\n            });\n            return initialStorageEntry;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update entry.\",\n                ex.code || \"UPDATE_ERROR\",\n                {\n                    error: ex,\n                    entry,\n                    latestStorageEntry\n                }\n            );\n        }\n    }\n}\n\nexport const DdbUpdateEntry = UpdateEntryStorageOperation.createImplementation({\n    implementation: DdbUpdateEntryImpl,\n    dependencies: [CmsDdbEntryEntity, CmsDdbDataLoaders, CmsStorageModelProvider]\n});\n"],"names":["DdbUpdateEntryImpl","entity","dataLoaders","storageModelProvider","initialModel","params","model","items","item","convertFromStorageEntry","entry","initialStorageEntry","isPublished","locked","storageEntry","convertToStorageEntry","entityBatch","createEntryRevisionKeys","createEntryPublishedKeys","latestStorageEntry","updatingLatestRevision","createEntryLatestKeys","updatedEntryLevelMetaFields","pickEntryMetaFields","isEntryLevelEntryMetaField","ex","WebinyError","DdbUpdateEntry","UpdateEntryStorageOperation","CmsDdbEntryEntity","CmsDdbDataLoaders","CmsStorageModelProvider"],"mappings":";;;;;;;;AAqBA,MAAMA;IACF,YACYC,MAAmC,EACnCC,WAAwC,EACxCC,oBAAuD,CACjE;aAHUF,MAAM,GAANA;aACAC,WAAW,GAAXA;aACAC,oBAAoB,GAApBA;IACT;IAEH,MAAc,2BACVC,YAAsB,EACtBC,MAAsB,EACxB;QACE,MAAMC,QAAQ,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAIF;QAEpD,MAAMG,QAAQ,MAAM,IAAI,CAAC,WAAW,CAAC,0BAA0B,CAAI;YAC/DD;YACA,KAAK;gBAACD,OAAO,EAAE;aAAC;QACpB;QACA,MAAMG,OAAOD,MAAM,KAAK,MAAM;QAC9B,IAAI,CAACC,MACD,OAAO;QAEX,OAAOC,wBAAwB;YAC3B,cAAcD;YACdF;QACJ;IACJ;IAEA,MAAM,QACFF,YAAsB,EACtBC,MAAgD,EAClD;QACE,MAAM,EAAEK,KAAK,EAAE,cAAcC,mBAAmB,EAAE,GAAGN;QACrD,MAAMC,QAAQ,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAACF;QAEjD,MAAMQ,cAAcF,AAAiB,gBAAjBA,MAAM,MAAM;QAChC,MAAMG,SAASD,cAAc,OAAOF,MAAM,MAAM;QAEhD,MAAMI,eAAeC,sBAAsB;YACvCT;YACA,cAAcK;QAClB;QAOA,MAAMK,cAAc,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;YAC/C,KAAK;gBACD;oBACI,GAAGC,wBAAwBH,aAAa;oBACxC,MAAM;wBACF,GAAGA,YAAY;wBACfD;oBACJ;gBACJ;aACH;QACL;QAEA,IAAID,aACAI,YAAY,GAAG,CAAC;YACZ,GAAGE,yBAAyBJ,aAAa;YACzC,MAAM;gBACF,GAAGA,YAAY;gBACfD;YACJ;QACJ;QAMJ,MAAMM,qBAAqB,MAAM,IAAI,CAAC,0BAA0B,CAACb,OAAOI;QAExE,IAAIS,oBAAoB;YACpB,MAAMC,yBAAyBD,mBAAmB,EAAE,KAAKT,MAAM,EAAE;YACjE,IAAIU,wBACAJ,YAAY,GAAG,CAAC;gBACZ,GAAGK,sBAAsBP,aAAa;gBACtC,MAAM;oBACF,GAAGA,YAAY;oBACfD;gBACJ;YACJ;iBACG;gBAKH,MAAMS,8BAA8BC,oBAChCb,OACAc;gBAQJR,YAAY,GAAG,CAAC;oBACZ,GAAGC,wBAAwBE,mBAAmB;oBAC9C,MAAM;wBACF,GAAGA,kBAAkB;wBACrB,GAAGG,2BAA2B;oBAClC;gBACJ;gBAEAN,YAAY,GAAG,CAAC;oBACZ,GAAGK,sBAAsBF,mBAAmB;oBAC5C,MAAM;wBACF,GAAGA,kBAAkB;wBACrB,GAAGG,2BAA2B;oBAClC;gBACJ;YACJ;QACJ;QAEA,IAAI;YACA,MAAMN,YAAY,OAAO;YACzB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;gBACtB,QAAQN,MAAM,MAAM;YACxB;YACA,OAAOC;QACX,EAAE,OAAOc,IAAI;YACT,MAAM,IAAIC,MACND,GAAG,OAAO,IAAI,2BACdA,GAAG,IAAI,IAAI,gBACX;gBACI,OAAOA;gBACPf;gBACAS;YACJ;QAER;IACJ;AACJ;AAEO,MAAMQ,iBAAiBC,4BAA4B,oBAAoB,CAAC;IAC3E,gBAAgB5B;IAChB,cAAc;QAAC6B;QAAmBC;QAAmBC;KAAwB;AACjF"}

package/operations/entry/dataLoaders.d.ts

@@ -1,16 +1,14 @@
 import type { CmsEntryValues, CmsModel, CmsStorageEntry } from "@webiny/api-headless-cms/types/index.js";
-import type { DataLoadersHandlerInterfaceClearAllParams, IDataLoadersHandler, IEntryEntity } from "../../types.js";
+import type { DataLoadersHandlerInterfaceClearAllParams, IDataLoadersHandler } from "../../types.js";
+import { CmsDdbEntryEntity } from "../../abstractions/CmsDdbEntryEntity.js";
 interface DataLoaderParams {
     model: Pick<CmsModel, "tenant" | "modelId">;
     ids: readonly string[];
 }
-interface IDataLoadersHandlerParams {
-    entity: IEntryEntity;
-}
-export declare class DataLoadersHandler implements IDataLoadersHandler {
+declare class DataLoadersHandlerImpl implements IDataLoadersHandler {
     private readonly entity;
     private readonly cache;
-    constructor(params: IDataLoadersHandlerParams);
+    constructor(entity: CmsDdbEntryEntity.Interface);
     getAllEntryRevisions<T extends CmsEntryValues = CmsEntryValues>(params: DataLoaderParams): Promise<CmsStorageEntry<T>[]>;
     getRevisionById<T extends CmsEntryValues = CmsEntryValues>(params: DataLoaderParams): Promise<CmsStorageEntry<T>[]>;
     getPublishedRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(params: DataLoaderParams): Promise<CmsStorageEntry<T>[]>;
@@ -23,4 +21,7 @@ export declare class DataLoadersHandler implements IDataLoadersHandler {
     private loadMany;
     clearAll(params?: DataLoadersHandlerInterfaceClearAllParams): void;
 }
+export declare const DataLoadersHandler: typeof DataLoadersHandlerImpl & {
+    __abstraction: import("@webiny/di").Abstraction<IDataLoadersHandler>;
+};
 export {};