fix(plugin-multi-tenant): cannot clear selected tenant from dashboard view (#15141)

This PR allows clearing the currently selected tenant from the admin
panel dashboard.

Author: AlessioGr

packages/plugin-multi-tenant/src/components/TenantSelector/index.client.tsx

@@ -73,7 +73,7 @@ export const TenantSelectorClient = ({
   return (
     <div className="tenant-selector">
       <SelectInput
-        isClearable={viewType === 'list'}
+        isClearable={['dashboard', 'list'].includes(viewType ?? '')}
         label={
           label ? getTranslation(label, i18n) : t('plugin-multi-tenant:nav-tenantSelector-label')
         }

test/helpers/e2e/selectInput.ts

@@ -1,4 +1,4 @@
-import type { Locator } from '@playwright/test'
+import { expect, type Locator } from '@playwright/test'
 
 import { exactText } from '../../helpers.js'
 
@@ -124,7 +124,7 @@ type GetSelectInputValueFunction = <TMultiSelect = true>(args: {
   selectLocator: Locator
   selectType?: 'relationship' | 'select'
   valueLabelClass?: string
-}) => Promise<TMultiSelect extends true ? string[] : string | undefined>
+}) => Promise<TMultiSelect extends true ? string[] : false | string | undefined>
 
 export const getSelectInputValue: GetSelectInputValueFunction = async ({
   selectLocator,
@@ -139,8 +139,15 @@ export const getSelectInputValue: GetSelectInputValueFunction = async ({
     return selectedOptions || []
   }
 
+  await expect(selectLocator).toBeVisible()
+
   // For single-select, get the selected value
-  const singleValue = await selectLocator.locator(selectors.hasOne[selectType]).textContent()
+  const valueLocator = selectLocator.locator(selectors.hasOne[selectType])
+  const count = await valueLocator.count()
+  if (count === 0) {
+    return false
+  }
+  const singleValue = await valueLocator.textContent()
   return (singleValue ?? undefined) as any
 }
 

test/plugin-multi-tenant/e2e.spec.ts

@@ -802,6 +802,80 @@ test.describe('Multi Tenant', () => {
         })
         .toEqual(['Blue Dog', 'Steel Cat', 'Anchor Bar', 'Public Tenant', 'House Rules'].sort())
     })
+
+    test('should allow clearing tenant filter from dashboard view', async () => {
+      await loginClientSide({
+        data: credentials.admin,
+        page,
+        serverURL,
+      })
+
+      // First set a tenant filter
+      await setTenantFilter({
+        page,
+        tenant: 'Blue Dog',
+        urlUtil: tenantsURL,
+      })
+
+      // Navigate to dashboard view
+      await page.goto(`${serverURL}/admin`)
+
+      // Clear the tenant filter from the dashboard
+      await clearTenantFilter({ page })
+
+      // Verify the tenant selector is cleared
+      await openNav(page)
+      await expect
+        .poll(async () => {
+          return await getSelectInputValue<false>({
+            multiSelect: false,
+            selectLocator: page.locator('.tenant-selector'),
+          })
+        })
+        .toBeFalsy()
+    })
+
+    test('should allow clearing tenant filter from list view', async () => {
+      await loginClientSide({
+        data: credentials.admin,
+        page,
+        serverURL,
+      })
+
+      // First set a tenant filter
+      await setTenantFilter({
+        page,
+        tenant: 'Steel Cat',
+        urlUtil: menuItemsURL,
+      })
+
+      // Verify tenant is set
+      await openNav(page)
+
+      await expect
+        .poll(async () => {
+          return await getSelectInputValue<false>({
+            multiSelect: false,
+            selectLocator: page.locator('.tenant-selector'),
+          })
+        })
+        .toBe('Steel Cat')
+
+      // Clear the tenant filter from the list view
+      await clearTenantFilter({ page })
+
+      // Verify the tenant selector is cleared
+      await openNav(page)
+
+      await expect
+        .poll(async () => {
+          return await getSelectInputValue<false>({
+            multiSelect: false,
+            selectLocator: page.locator('.tenant-selector'),
+          })
+        })
+        .toBeFalsy()
+    })
   })
 })