goes back to using TabAsField

payloadcms · Jan 21, 2025 · ee9f8b4 · ee9f8b4
1 parent a51a5c1
commit ee9f8b4
Show file tree

Hide file tree

Showing 12 changed files with 422 additions and 300 deletions.
diff --git a/packages/payload/src/fields/hooks/afterChange/promise.ts b/packages/payload/src/fields/hooks/afterChange/promise.ts
@@ -3,7 +3,7 @@ import type { SanitizedCollectionConfig } from '../../../collections/config/type
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
 import type { RequestContext } from '../../../index.js'
 import type { JsonObject, PayloadRequest } from '../../../types/index.js'
-import type { Field } from '../../config/types.js'
+import type { Field, TabAsField } from '../../config/types.js'
 
 import { MissingEditorProp } from '../../../errors/index.js'
 import { fieldAffectsData, tabHasName } from '../../config/types.js'
@@ -15,7 +15,8 @@ type Args = {
   context: RequestContext
   data: JsonObject
   doc: JsonObject
-  field: Field
+  field: Field | TabAsField
+  fieldIndex: number
   global: null | SanitizedGlobalConfig
   indexPath: string
   operation: 'create' | 'update'
@@ -40,9 +41,11 @@ export const promise = async ({
   data,
   doc,
   field,
+  fieldIndex,
   global,
   indexPath,
   operation,
+  parentIndexPath,
   parentPath,
   parentSchemaPath,
   path,
@@ -250,52 +253,64 @@ export const promise = async ({
       break
     }
 
-    case 'tabs': {
-      field.tabs.forEach(async (tab, tabIndex) => {
-        let tabSiblingData = siblingData
-        let tabSiblingDoc = siblingDoc
-        let tabPreviousSiblingDoc = siblingDoc
-
-        const isNamedTab = tabHasName(tab)
+    case 'tab': {
+      const isNamedTab = tabHasName(field)
+
+      const {
+        indexPath: tabIndexPath,
+        path: tabPath,
+        schemaPath: tabSchemaPath,
+      } = getFieldPaths({
+        field: {
+          ...field,
+          type: 'tab',
+        },
+        index: fieldIndex,
+        parentIndexPath: indexPath,
+        parentPath,
+        parentSchemaPath,
+      })
 
-        if (isNamedTab) {
-          tabSiblingData = (siblingData[tab.name] as JsonObject) ?? {}
-          tabSiblingDoc = (siblingDoc[tab.name] as JsonObject) ?? {}
-          tabPreviousSiblingDoc = (previousDoc[tab.name] as JsonObject) ?? {}
-        }
+      await traverseFields({
+        collection,
+        context,
+        data,
+        doc,
+        fields: field.fields,
+        global,
+        operation,
+        parentIndexPath: isNamedTab ? '' : tabIndexPath,
+        parentPath: isNamedTab ? tabPath : parentPath,
+        parentSchemaPath: isNamedTab ? tabSchemaPath : parentSchemaPath,
+        previousDoc,
+        previousSiblingDoc: isNamedTab
+          ? ((previousDoc[field.name] as JsonObject) ?? {})
+          : siblingDoc,
+        req,
+        siblingData: isNamedTab ? ((siblingData[field.name] as JsonObject) ?? {}) : siblingData,
+        siblingDoc: isNamedTab ? ((siblingDoc[field.name] as JsonObject) ?? {}) : siblingDoc,
+      })
 
-        const {
-          indexPath: tabIndexPath,
-          path: tabPath,
-          schemaPath: tabSchemaPath,
-        } = getFieldPaths({
-          field: {
-            ...tab,
-            type: 'tab',
-          },
-          index: tabIndex,
-          parentIndexPath: indexPath,
-          parentPath,
-          parentSchemaPath,
-        })
+      break
+    }
 
-        await traverseFields({
-          collection,
-          context,
-          data,
-          doc,
-          fields: tab.fields,
-          global,
-          operation,
-          parentIndexPath: isNamedTab ? '' : tabIndexPath,
-          parentPath: isNamedTab ? tabPath : parentPath,
-          parentSchemaPath: isNamedTab ? tabSchemaPath : parentSchemaPath,
-          previousDoc,
-          previousSiblingDoc: { ...tabPreviousSiblingDoc },
-          req,
-          siblingData: tabSiblingData || {},
-          siblingDoc: { ...tabSiblingDoc },
-        })
+    case 'tabs': {
+      await traverseFields({
+        collection,
+        context,
+        data,
+        doc,
+        fields: field.tabs.map((tab) => ({ ...tab, type: 'tab' })),
+        global,
+        operation,
+        parentIndexPath,
+        parentPath: path,
+        parentSchemaPath,
+        previousDoc,
+        previousSiblingDoc: { ...previousSiblingDoc },
+        req,
+        siblingData: siblingData || {},
+        siblingDoc: { ...siblingDoc },
       })
 
       break

diff --git a/packages/payload/src/fields/hooks/afterChange/traverseFields.ts b/packages/payload/src/fields/hooks/afterChange/traverseFields.ts
@@ -2,7 +2,7 @@ import type { SanitizedCollectionConfig } from '../../../collections/config/type
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
 import type { RequestContext } from '../../../index.js'
 import type { JsonObject, PayloadRequest } from '../../../types/index.js'
-import type { Field } from '../../config/types.js'
+import type { Field, TabAsField } from '../../config/types.js'
 
 import { getFieldPaths } from '../../getFieldPaths.js'
 import { promise } from './promise.js'
@@ -12,7 +12,7 @@ type Args = {
   context: RequestContext
   data: JsonObject
   doc: JsonObject
-  fields: Field[]
+  fields: (Field | TabAsField)[]
   global: null | SanitizedGlobalConfig
   operation: 'create' | 'update'
   parentIndexPath: string
@@ -60,6 +60,7 @@ export const traverseFields = async ({
         data,
         doc,
         field,
+        fieldIndex,
         global,
         indexPath,
         operation,

diff --git a/packages/payload/src/fields/hooks/afterRead/index.ts b/packages/payload/src/fields/hooks/afterRead/index.ts
@@ -3,7 +3,6 @@ import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
 import type { RequestContext } from '../../../index.js'
 import type { JsonObject, PayloadRequest, PopulateType, SelectType } from '../../../types/index.js'
 
-import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'
 import { getSelectMode } from '../../../utilities/getSelectMode.js'
 import { traverseFields } from './traverseFields.js'