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

fix(next): version view breaking for deeply nested tabs, rows and collapsibles (#11808)

Browse Source 
Fixes #11458 

Some complex, nested fields were receiving incorrect field paths and
schema paths, leading to a `"Error: No client field found"` error.

This PR ensures field paths are calculated correctly, by matching it to
how they're calculated in payload hooks.
This commit is contained in:
Alessio Gravili
2025-03-24 14:57:36 -06:00
committed by GitHub
parent fb01b4046d
commit 3c4b3ee527
7 changed files with 194 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
test/versions/collections/Diff.ts
View File

@@ -39,6 +39,64 @@ export const Diff: CollectionConfig = {
},
],
},
{
slug: 'CollapsibleBlock',
fields: [
{
type: 'collapsible',
label: 'Collapsible',
fields: [
{
type: 'collapsible',
label: 'Nested Collapsible',
fields: [
{
name: 'textInCollapsibleInCollapsibleBlock',
type: 'text',
},
],
},
{
type: 'row',
fields: [
{
name: 'textInRowInCollapsibleBlock',
type: 'text',
},
],
},
],
},
],
},
{
slug: 'TabsBlock',
fields: [
{
type: 'tabs',
tabs: [
{
name: 'namedTab1InBlock',
fields: [
{
name: 'textInNamedTab1InBlock',
type: 'text',
},
],
},
{
label: 'Unnamed Tab 2 In Block',
fields: [
{
name: 'textInUnnamedTab2InBlock',
type: 'text',
},
],
},
],
},
],
},
],
},
{

56
test/versions/e2e.spec.ts
View File

@@ -1213,6 +1213,62 @@ describe('Versions', () => {
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(3)).toHaveText('textInBlock2')
})
test('correctly renders diff for collapsibles within block fields', async () => {
await navigateToVersionFieldsDiff()
const textInBlock = page.locator(
'[data-field-path="blocks.1.textInCollapsibleInCollapsibleBlock"]',
)
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(1)).toHaveText(
'textInCollapsibleInCollapsibleBlock',
)
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(3)).toHaveText(
'textInCollapsibleInCollapsibleBlock2',
)
})
test('correctly renders diff for rows within block fields', async () => {
await navigateToVersionFieldsDiff()
const textInBlock = page.locator('[data-field-path="blocks.1.textInRowInCollapsibleBlock"]')
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(1)).toHaveText(
'textInRowInCollapsibleBlock',
)
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(3)).toHaveText(
'textInRowInCollapsibleBlock2',
)
})
test('correctly renders diff for named tabs within block fields', async () => {
await navigateToVersionFieldsDiff()
const textInBlock = page.locator(
'[data-field-path="blocks.2.namedTab1InBlock.textInNamedTab1InBlock"]',
)
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(1)).toHaveText(
'textInNamedTab1InBlock',
)
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(3)).toHaveText(
'textInNamedTab1InBlock2',
)
})
test('correctly renders diff for unnamed tabs within block fields', async () => {
await navigateToVersionFieldsDiff()
const textInBlock = page.locator('[data-field-path="blocks.2.textInUnnamedTab2InBlock"]')
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(1)).toHaveText(
'textInUnnamedTab2InBlock',
)
await expect(textInBlock.locator('tr').nth(1).locator('td').nth(3)).toHaveText(
'textInUnnamedTab2InBlock2',
)
})
test('correctly renders diff for checkbox fields', async () => {
await navigateToVersionFieldsDiff()

51
test/versions/payload-types.ts
View File

@@ -54,6 +54,7 @@ export type SupportedTimezones =
| 'Asia/Singapore'
| 'Asia/Tokyo'
| 'Asia/Seoul'
| 'Australia/Brisbane'
| 'Australia/Sydney'
| 'Pacific/Guam'
| 'Pacific/Noumea'
@@ -312,12 +313,30 @@ export interface Diff {
}[]
| null;
blocks?:
| {
textInBlock?: string | null;
id?: string | null;
blockName?: string | null;
blockType: 'TextBlock';
}[]
| (
| {
textInBlock?: string | null;
id?: string | null;
blockName?: string | null;
blockType: 'TextBlock';
}
| {
textInCollapsibleInCollapsibleBlock?: string | null;
textInRowInCollapsibleBlock?: string | null;
id?: string | null;
blockName?: string | null;
blockType: 'CollapsibleBlock';
}
| {
namedTab1InBlock?: {
textInNamedTab1InBlock?: string | null;
};
textInUnnamedTab2InBlock?: string | null;
id?: string | null;
blockName?: string | null;
blockType: 'TabsBlock';
}
)[]
| null;
checkbox?: boolean | null;
code?: string | null;
@@ -772,6 +791,26 @@ export interface DiffSelect<T extends boolean = true> {
id?: T;
blockName?: T;
};
CollapsibleBlock?:
| T
| {
textInCollapsibleInCollapsibleBlock?: T;
textInRowInCollapsibleBlock?: T;
id?: T;
blockName?: T;
};
TabsBlock?:
| T
| {
namedTab1InBlock?:
| T
| {
textInNamedTab1InBlock?: T;
};
textInUnnamedTab2InBlock?: T;
id?: T;
blockName?: T;
};
};
checkbox?: T;
code?: T;

24
test/versions/seed.ts
View File

@@ -138,6 +138,18 @@ export async function seed(_payload: Payload, parallel: boolean = false) {
blockType: 'TextBlock',
textInBlock: 'textInBlock',
},
{
blockType: 'CollapsibleBlock',
textInCollapsibleInCollapsibleBlock: 'textInCollapsibleInCollapsibleBlock',
textInRowInCollapsibleBlock: 'textInRowInCollapsibleBlock',
},
{
blockType: 'TabsBlock',
namedTab1InBlock: {
textInNamedTab1InBlock: 'textInNamedTab1InBlock',
},
textInUnnamedTab2InBlock: 'textInUnnamedTab2InBlock',
},
],
checkbox: true,
code: 'code',
@@ -186,6 +198,18 @@ export async function seed(_payload: Payload, parallel: boolean = false) {
blockType: 'TextBlock',
textInBlock: 'textInBlock2',
},
{
blockType: 'CollapsibleBlock',
textInCollapsibleInCollapsibleBlock: 'textInCollapsibleInCollapsibleBlock2',
textInRowInCollapsibleBlock: 'textInRowInCollapsibleBlock2',
},
{
blockType: 'TabsBlock',
namedTab1InBlock: {
textInNamedTab1InBlock: 'textInNamedTab1InBlock2',
},
textInUnnamedTab2InBlock: 'textInUnnamedTab2InBlock2',
},
],
checkbox: false,
code: 'code2',