fix(db-postgres): select hasMany nested to array + tab/group (#8739)

Author: r1tsuu

packages/db-postgres/src/transform/write/traverseFields.ts

@@ -207,6 +207,9 @@ export const traverseFields = ({
       if (typeof data[field.name] === 'object' && data[field.name] !== null) {
         if (field.localized) {
           Object.entries(data[field.name]).forEach(([localeKey, localeData]) => {
+            // preserve array ID if there is
+            localeData._uuid = data.id || data._uuid
+
             traverseFields({
               adapter,
               arrays,
@@ -232,14 +235,18 @@ export const traverseFields = ({
             })
           })
         } else {
+          // preserve array ID if there is
+          const groupData = data[field.name] as Record<string, unknown>
+          groupData._uuid = data.id || data._uuid
+
           traverseFields({
             adapter,
             arrays,
             baseTableName,
             blocks,
             blocksToDelete,
             columnPrefix: `${columnName}_`,
-            data: data[field.name] as Record<string, unknown>,
+            data: groupData,
             existingLocales,
             fieldPrefix: `${fieldName}_`,
             fields: field.fields,
@@ -266,6 +273,9 @@ export const traverseFields = ({
           if (typeof data[tab.name] === 'object' && data[tab.name] !== null) {
             if (tab.localized) {
               Object.entries(data[tab.name]).forEach(([localeKey, localeData]) => {
+                // preserve array ID if there is
+                localeData._uuid = data.id || data._uuid
+
                 traverseFields({
                   adapter,
                   arrays,
@@ -291,14 +301,18 @@ export const traverseFields = ({
                 })
               })
             } else {
+              const tabData = data[tab.name] as Record<string, unknown>
+              // preserve array ID if there is
+              tabData._uuid = data.id || data._uuid
+
               traverseFields({
                 adapter,
                 arrays,
                 baseTableName,
                 blocks,
                 blocksToDelete,
                 columnPrefix: `${columnPrefix || ''}${toSnakeCase(tab.name)}_`,
-                data: data[tab.name] as Record<string, unknown>,
+                data: tabData,
                 existingLocales,
                 fieldPrefix: `${fieldPrefix || ''}${tab.name}_`,
                 fields: tab.fields,

test/fields/collections/Select/index.ts

@@ -82,6 +82,88 @@ const SelectFields: CollectionConfig = {
         },
       ],
     },
+    {
+      name: 'array',
+      type: 'array',
+      fields: [
+        {
+          name: 'selectHasMany',
+          hasMany: true,
+          type: 'select',
+          admin: {
+            isClearable: true,
+            isSortable: true,
+          },
+          options: [
+            {
+              label: 'Value One',
+              value: 'one',
+            },
+            {
+              label: 'Value Two',
+              value: 'two',
+            },
+            {
+              label: 'Value Three',
+              value: 'three',
+            },
+            {
+              label: 'Value Four',
+              value: 'four',
+            },
+            {
+              label: 'Value Five',
+              value: 'five',
+            },
+            {
+              label: 'Value Six',
+              value: 'six',
+            },
+          ],
+        },
+        {
+          name: 'group',
+          type: 'group',
+          fields: [
+            {
+              name: 'selectHasMany',
+              hasMany: true,
+              type: 'select',
+              admin: {
+                isClearable: true,
+                isSortable: true,
+              },
+              options: [
+                {
+                  label: 'Value One',
+                  value: 'one',
+                },
+                {
+                  label: 'Value Two',
+                  value: 'two',
+                },
+                {
+                  label: 'Value Three',
+                  value: 'three',
+                },
+                {
+                  label: 'Value Four',
+                  value: 'four',
+                },
+                {
+                  label: 'Value Five',
+                  value: 'five',
+                },
+                {
+                  label: 'Value Six',
+                  value: 'six',
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
     {
       name: 'selectHasManyLocalized',
       type: 'select',

test/fields/int.spec.ts

@@ -573,6 +573,54 @@ describe('Fields', () => {
 
       expect(resInSecond.totalDocs).toBe(1)
     })
+
+    it('should CRUD within array hasMany', async () => {
+      const doc = await payload.create({
+        collection: 'select-fields',
+        data: { array: [{ selectHasMany: ['one', 'two'] }] },
+      })
+
+      expect(doc.array[0].selectHasMany).toStrictEqual(['one', 'two'])
+
+      const upd = await payload.update({
+        collection: 'select-fields',
+        id: doc.id,
+        data: {
+          array: [
+            {
+              id: doc.array[0].id,
+              selectHasMany: ['six'],
+            },
+          ],
+        },
+      })
+
+      expect(upd.array[0].selectHasMany).toStrictEqual(['six'])
+    })
+
+    it('should CRUD within array + group hasMany', async () => {
+      const doc = await payload.create({
+        collection: 'select-fields',
+        data: { array: [{ group: { selectHasMany: ['one', 'two'] } }] },
+      })
+
+      expect(doc.array[0].group.selectHasMany).toStrictEqual(['one', 'two'])
+
+      const upd = await payload.update({
+        collection: 'select-fields',
+        id: doc.id,
+        data: {
+          array: [
+            {
+              id: doc.array[0].id,
+              group: { selectHasMany: ['six'] },
+            },
+          ],
+        },
+      })
+
+      expect(upd.array[0].group.selectHasMany).toStrictEqual(['six'])
+    })
   })
 
   describe('number', () => {

test/fields/payload-types.ts

@@ -271,6 +271,17 @@ export interface ArrayField {
         id?: string | null
       }[]
     | null
+  nestedArrayLocalized?:
+    | {
+        array?:
+          | {
+              text?: string | null
+              id?: string | null
+            }[]
+          | null
+        id?: string | null
+      }[]
+    | null
   updatedAt: string
   createdAt: string
 }
@@ -841,6 +852,37 @@ export interface GroupField {
         | null
     }
   }
+  localizedGroupArr?: {
+    array?:
+      | {
+          text?: string | null
+          id?: string | null
+        }[]
+      | null
+  }
+  localizedGroupSelect?: {
+    select?: ('one' | 'two')[] | null
+  }
+  localizedGroupRel?: {
+    rel?: (string | null) | TextField
+  }
+  localizedGroupManyRel?: {
+    email?: (string | TextField)[] | null
+  }
+  localizedGroupPolyRel?: {
+    email?: {
+      relationTo: 'text-fields'
+      value: string | TextField
+    } | null
+  }
+  localizedGroupPolyHasManyRel?: {
+    email?:
+      | {
+          relationTo: 'text-fields'
+          value: string | TextField
+        }[]
+      | null
+  }
   updatedAt: string
   createdAt: string
 }
@@ -1116,6 +1158,15 @@ export interface SelectField {
   select?: ('one' | 'two' | 'three') | null
   selectReadOnly?: ('one' | 'two' | 'three') | null
   selectHasMany?: ('one' | 'two' | 'three' | 'four' | 'five' | 'six')[] | null
+  array?:
+    | {
+        selectHasMany?: ('one' | 'two' | 'three' | 'four' | 'five' | 'six')[] | null
+        group?: {
+          selectHasMany?: ('one' | 'two' | 'three' | 'four' | 'five' | 'six')[] | null
+        }
+        id?: string | null
+      }[]
+    | null
   selectHasManyLocalized?: ('one' | 'two')[] | null
   selectI18n?: ('one' | 'two' | 'three') | null
   simple?: ('One' | 'Two' | 'Three') | null