tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix(ui): unique ids for nested rows on row duplicate to prevent errors with postgres (#8790)

Browse Source 
Fixes https://github.com/payloadcms/payload/issues/8784

This works for any deep level, both arrays and blocks.
This commit is contained in:
Sasha
2024-10-21 15:51:26 +03:00
committed by GitHub
parent ef8a5b1f3e
commit fe25b54fff
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/ui/src/forms/Form/fieldReducer.ts
View File

@@ -263,6 +263,15 @@ export function fieldReducer(state: FormState, action: FieldAction): FormState {
duplicateRowState.id.initialValue = new ObjectId().toHexString()
}
for (const key of Object.keys(duplicateRowState).filter((key) => key.endsWith('.id'))) {
const idState = duplicateRowState[key]
if (idState && typeof idState.value === 'string' && ObjectId.isValid(idState.value)) {
duplicateRowState[key].value = new ObjectId().toHexString()
duplicateRowState[key].initialValue = new ObjectId().toHexString()
}
}
// If there are subfields
if (Object.keys(duplicateRowState).length > 0) {
// Add new object containing subfield names to unflattenedRows array

18
test/fields/collections/Blocks/e2e.spec.ts
View File

@@ -130,6 +130,24 @@ describe('Block fields', () => {
expect(await blocks.count()).toEqual(4)
})
test('should save when duplicating subblocks', async () => {
await page.goto(url.create)
const subblocksRow = page.locator('#field-blocks #blocks-row-2')
const rowActions = subblocksRow.locator('.collapsible__actions').first()
await expect(rowActions).toBeVisible()
await rowActions.locator('.array-actions__button').click()
const duplicateButton = rowActions.locator('.array-actions__action.array-actions__duplicate')
await expect(duplicateButton).toBeVisible()
await duplicateButton.click()
const blocks = page.locator('#field-blocks > .blocks-field__rows > div')
expect(await blocks.count()).toEqual(4)
await page.click('#action-save')
await expect(page.locator('.payload-toast-container')).toContainText('successfully')
})
test('should use i18n block labels', async () => {
await page.goto(url.create)
await expect(page.locator('#field-i18nBlocks .blocks-field__header')).toContainText('Block en')