fix(api-headless-cms): improve moveEntryToBin operation (#4292)

webiny · Sep 25, 2024 · 8f43ff3 · 8f43ff3
1 parent 6860ae8
commit 8f43ff3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/packages/api-headless-cms/src/crud/contentEntry/afterDelete.ts b/packages/api-headless-cms/src/crud/contentEntry/afterDelete.ts
@@ -10,8 +10,12 @@ export const assignAfterEntryDelete = (params: AssignAfterEntryDeleteParams) =>
     const { context, onEntryAfterDelete } = params;
 
     onEntryAfterDelete.subscribe(async params => {
-        const { entry, model } = params;
+        const { entry, model, permanent } = params;
 
+        // If the entry is being moved to the trash, we keep the model fields locked because the entry can be restored.
+        if (!permanent) {
+            return;
+        }
         const { items } = await context.cms.storageOperations.entries.list(model, {
             where: {
                 entryId_not: entry.entryId,

diff --git a/...es/api-headless-cms/src/crud/contentEntry/useCases/DeleteEntry/TransformEntryMoveToBin.ts b/...es/api-headless-cms/src/crud/contentEntry/useCases/DeleteEntry/TransformEntryMoveToBin.ts
@@ -2,7 +2,6 @@ import { SecurityIdentity } from "@webiny/api-security/types";
 import { entryFromStorageTransform, entryToStorageTransform } from "~/utils/entryStorage";
 import { getDate } from "~/utils/date";
 import { getIdentity } from "~/utils/identity";
-import { validateModelEntryDataOrThrow } from "~/crud/contentEntry/entryDataValidation";
 import { CmsContext, CmsEntry, CmsEntryStorageOperationsMoveToBinParams, CmsModel } from "~/types";
 import { ROOT_FOLDER } from "~/constants";
 
@@ -29,14 +28,6 @@ export class TransformEntryMoveToBin {
     }
 
     private async createDeleteEntryData(model: CmsModel, originalEntry: CmsEntry) {
-        await validateModelEntryDataOrThrow({
-            context: this.context,
-            model,
-            data: originalEntry.values,
-            entry: originalEntry,
-            skipValidators: ["required"]
-        });
-
         const currentDateTime = new Date().toISOString();
         const currentIdentity = this.getIdentity();
 

diff --git a/...ss-cms/src/crud/contentEntry/useCases/RestoreEntryFromBin/TransformEntryRestoreFromBin.ts b/...ss-cms/src/crud/contentEntry/useCases/RestoreEntryFromBin/TransformEntryRestoreFromBin.ts
@@ -2,7 +2,6 @@ import { SecurityIdentity } from "@webiny/api-security/types";
 import { entryFromStorageTransform, entryToStorageTransform } from "~/utils/entryStorage";
 import { getDate } from "~/utils/date";
 import { getIdentity } from "~/utils/identity";
-import { validateModelEntryDataOrThrow } from "~/crud/contentEntry/entryDataValidation";
 import { CmsContext, CmsEntry, CmsEntryStorageOperationsMoveToBinParams, CmsModel } from "~/types";
 
 export class TransformEntryRestoreFromBin {
@@ -28,14 +27,6 @@ export class TransformEntryRestoreFromBin {
     }
 
     private async createRestoreFromBinEntryData(model: CmsModel, originalEntry: CmsEntry) {
-        await validateModelEntryDataOrThrow({
-            context: this.context,
-            model,
-            data: originalEntry.values,
-            entry: originalEntry,
-            skipValidators: ["required"]
-        });
-
         const currentDateTime = new Date().toISOString();
         const currentIdentity = this.getIdentity();