fix(ui): don't use tab label as prefix on tabs which have no name.

payloadcms · Dec 16, 2024 · 0823167 · 0823167
1 parent 00909ec
commit 0823167
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/ui/src/elements/WhereBuilder/reduceClientFields.tsx b/packages/ui/src/elements/WhereBuilder/reduceClientFields.tsx
@@ -40,9 +40,11 @@ export const reduceClientFields = ({
         if (typeof tab.label !== 'boolean') {
           const localizedTabLabel = getTranslation(tab.label, i18n)
 
-          const labelWithPrefix = labelPrefix
-            ? labelPrefix + ' > ' + localizedTabLabel
-            : localizedTabLabel
+          const labelWithPrefix = tabHasName(tab)
+            ? labelPrefix
+              ? labelPrefix + ' > ' + localizedTabLabel
+              : localizedTabLabel
+            : labelPrefix
 
           // Make sure we handle nested tabs
           const tabPathPrefix =

diff --git a/test/admin/e2e/2/e2e.spec.ts b/test/admin/e2e/2/e2e.spec.ts
@@ -464,7 +464,8 @@ describe('admin2', () => {
         await page.locator('.where-builder__add-first-filter').click()
         await page.locator('.condition__field .rs__control').click()
         const options = page.locator('.rs__option')
-        await options.locator('text=Tab 1 > Title').click()
+        await expect(options.first()).toHaveText('Title')
+        await options.first().click()
         await page.locator('.condition__operator .rs__control').click()
         await options.locator('text=equals').click()
         await page.locator('.condition__value input').fill('test')
@@ -780,7 +781,7 @@ describe('admin2', () => {
         await page.locator('.condition__field .rs__control').click()
         const options = page.locator('.rs__option')
 
-        await expect(options.locator('text=Tab 1 > Title')).toHaveText('Tab 1 > Title')
+        await expect(options.first()).toHaveText('Title')
 
         // list columns
         await expect(page.locator('#heading-title .sort-column__label')).toHaveText('Title')