Skip to content

Commit 188baec

Browse files
authored
fix(ui): proper permissions within version diff view (#9346)
Fixes #9337. The version view was not able to render its diff because of an invalid permissions lookup. This was a result of a change to how access results are returned from the API, which are now sanitized: #7335
1 parent d9c6288 commit 188baec

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

packages/next/src/views/Version/RenderFieldsToDiff/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const RenderFieldsToDiff: React.FC<Props> = ({
2525
// typing it as `as typeof _diffComponents` here ensures the TField generics of DiffComponentProps are respected.
2626
// Without it, you could pass a UI field to the Tabs component, without it erroring
2727
const diffComponents: typeof _diffComponents = __diffComponents as typeof _diffComponents
28+
2829
return (
2930
<div className={baseClass}>
3031
{fields?.map((field, i) => {
@@ -51,7 +52,9 @@ const RenderFieldsToDiff: React.FC<Props> = ({
5152
: comparison?.[fieldName]
5253

5354
const hasPermission =
54-
fieldPermissions?.[fieldName] === true || fieldPermissions?.[fieldName]?.read
55+
fieldPermissions === true ||
56+
fieldPermissions?.[fieldName] === true ||
57+
fieldPermissions?.[fieldName]?.read
5558

5659
const subFieldPermissions =
5760
fieldPermissions?.[fieldName] === true || fieldPermissions?.[fieldName]?.fields

test/versions/e2e.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ describe('versions', () => {
317317
const versionID = await row2.locator('.cell-id').textContent()
318318
await page.goto(`${savedDocURL}/versions/${versionID}`)
319319
await page.waitForURL(`${savedDocURL}/versions/${versionID}`)
320+
await expect(page.locator('.render-field-diffs')).toBeVisible()
320321
await page.locator('.restore-version__button').click()
321322
await page.locator('button:has-text("Confirm")').click()
322323
await page.waitForURL(savedDocURL)

0 commit comments

Comments
 (0)