Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: unique ids for nested rows on row duplicate to prevent errors with postgres #8814

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: unique ids for nested rows on row duplicate to prevent errors with postgres #8814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ed66aa
fix(ui): unique ids for nested rows on row duplicate to prevent error…
r1tsuu Oct 21, 2024
764187a
fix: rename ObjectId to ObjectID
r1tsuu Oct 21, 2024
a4fa3f1
chore: port e2e's: should duplicate block and should save when duplic…
r1tsuu Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/payload/src/admin/components/forms/Form/fieldReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,15 @@ export function fieldReducer(state: Fields, action: FieldAction): Fields {
const duplicateRowState = deepCopyObject(rows[rowIndex])
if (duplicateRowState.id) duplicateRowState.id = 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
Expand Down
33 changes: 33 additions & 0 deletions test/fields/e2e.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,39 @@ describe('fields', () => {
await expect(page.locator('.Toastify')).toContainText('Please correct invalid fields')
})

test('should duplicate block', async () => {
await page.goto(url.create)
const firstRow = page.locator('#field-blocks #blocks-row-0')
const rowActions = firstRow.locator('.collapsible__actions')
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)
})

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('.Toastify')).toContainText('successfully')
})

describe('row manipulation', () => {
describe('react hooks', () => {
test('should add 2 new block rows', async () => {
Expand Down
Loading