fix(db-mongodb): strip deleted from the config blocks from the result

packages/db-mongodb/src/utilities/transform.ts

@@ -277,7 +277,9 @@ const stripFields = ({
               continue
             }
 
-            for (const data of localeData) {
+            let hasNull = false
+            for (let i = 0; i < localeData.length; i++) {
+              const data = localeData[i]
               let fields: FlattenedField[] | null = null
 
               if (field.type === 'array') {
@@ -300,6 +302,9 @@ const stripFields = ({
 
                 if (maybeBlock) {
                   fields = maybeBlock.flattenedFields
+                } else {
+                  localeData[i] = null
+                  hasNull = true
                 }
               }
 
@@ -310,6 +315,10 @@ const stripFields = ({
               stripFields({ config, data, fields, reservedKeys })
             }
 
+            if (hasNull) {
+              fieldData[localeKey] = localeData.filter(Boolean)
+            }
+
             continue
           } else {
             stripFields({ config, data: localeData, fields: field.flattenedFields, reservedKeys })
@@ -323,7 +332,10 @@ const stripFields = ({
           continue
         }
 
-        for (const data of fieldData) {
+        let hasNull = false
+
+        for (let i = 0; i < fieldData.length; i++) {
+          const data = fieldData[i]
           let fields: FlattenedField[] | null = null
 
           if (field.type === 'array') {
@@ -347,6 +359,9 @@ const stripFields = ({
 
             if (maybeBlock) {
               fields = maybeBlock.flattenedFields
+            } else {
+              fieldData[i] = null
+              hasNull = true
             }
           }
 
@@ -357,6 +372,10 @@ const stripFields = ({
           stripFields({ config, data, fields, reservedKeys })
         }
 
+        if (hasNull) {
+          data[field.name] = fieldData.filter(Boolean)
+        }
+
         continue
       } else {
         stripFields({ config, data: fieldData, fields: field.flattenedFields, reservedKeys })

test/database/int.spec.ts

@@ -2738,4 +2738,51 @@ describe('database', () => {
     expect(res.blocks[0]?.nested).toHaveLength(1)
     expect(res.blocks[0]?.nested[0]?.nested).toHaveLength(0)
   })
+
+  it('should ignore blocks that exist in the db but not in the config', async () => {
+    // not possible w/ SQL anyway
+    // eslint-disable-next-line jest/no-conditional-in-test
+    if (payload.db.name !== 'mongoose') {
+      return
+    }
+
+    const res = await payload.db.collections['blocks-docs']?.collection.insertOne({
+      testBlocks: [
+        {
+          id: '1',
+          blockType: 'cta',
+          text: 'valid block',
+        },
+        {
+          id: '2',
+          blockType: 'cta_2',
+          text: 'non-valid block',
+        },
+      ],
+      testBlocksLocalized: {
+        en: [
+          {
+            id: '1',
+            blockType: 'cta',
+            text: 'valid block',
+          },
+          {
+            id: '2',
+            blockType: 'cta_2',
+            text: 'non-valid block',
+          },
+        ],
+      },
+    })
+
+    const doc = await payload.findByID({
+      collection: 'blocks-docs',
+      id: res?.insertedId?.toHexString() as string,
+      locale: 'en',
+    })
+    expect(doc.testBlocks).toHaveLength(1)
+    expect(doc.testBlocks[0].id).toBe('1')
+    expect(doc.testBlocksLocalized).toHaveLength(1)
+    expect(doc.testBlocksLocalized[0].id).toBe('1')
+  })
 })