From ea2b5f756db997324ab2b25cc9197014ff97f099 Mon Sep 17 00:00:00 2001 From: Marco Beretta <81851188+berry-13@users.noreply.github.com> Date: Fri, 25 Sep 2026 01:17:59 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=87=20fix:=20Mute=20the=20Create=20Ass?= =?UTF-8?q?istant=20Empty=20State=20in=20the=20Assistant=20Picker=20(#1633?= =?UTF-8?q?8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: mute the Create Assistant empty state in the assistant picker AssistantSelect passed its "Create Assistant" label as the dropdown value, so it rendered in the primary value tone. Pass it as the placeholder with an empty value instead, which SelectDropDown already renders in text-text-secondary. SelectDropDown no longer checkmarks an option whose value is empty when nothing is selected, so the loading row stays unmarked. * test: reach the assistant builder through the mobile control panel --- .../SidePanel/Builder/AssistantSelect.tsx | 3 +- .../scenarios/assistant-select-empty.spec.ts | 99 +++++++++++++++++++ .../client/src/components/SelectDropDown.tsx | 2 +- .../__tests__/SelectDropDown.spec.tsx | 53 ++++++++++ 4 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 e2e/specs/mock/scenarios/assistant-select-empty.spec.ts create mode 100644 packages/client/src/components/__tests__/SelectDropDown.spec.tsx diff --git a/client/src/components/SidePanel/Builder/AssistantSelect.tsx b/client/src/components/SidePanel/Builder/AssistantSelect.tsx index e6c515f407..90023e6409 100644 --- a/client/src/components/SidePanel/Builder/AssistantSelect.tsx +++ b/client/src/components/SidePanel/Builder/AssistantSelect.tsx @@ -244,7 +244,8 @@ export default function AssistantSelect({ const createAssistant = localize('com_ui_create_assistant'); return ( { + await page.goto('/c/new?endpoint=assistants&model=gpt-4o-mini', { timeout: 10000 }); + await openSidebar(page); + /** The mobile drawer opens on chat history; its panels are items of the Control Panel menu. */ + const controlPanel = page.getByRole('button', { name: 'Control Panel' }); + if (await controlPanel.isVisible()) { + await controlPanel.click(); + await page.getByRole('menuitemcheckbox', { name: 'Assistant Builder' }).click(); + } else { + await page.getByRole('button', { name: 'Assistant Builder' }).first().click(); + } + const picker = page.getByTestId('select-dropdown-button').first(); + await expect(picker).toBeVisible(); + return picker; +} + +async function colorOf(locator: Locator): Promise { + return locator.evaluate((element) => getComputedStyle(element).color); +} + +async function createAssistant(page: Page): Promise { + await page.goto('/c/new', { timeout: 10000 }); + const token = await getAccessToken(page); + return requestJson(page, { + path: '/api/assistants/v2', + token, + method: 'POST', + body: { endpoint: 'assistants', model: 'gpt-4o-mini', name: ASSISTANT_NAME }, + }); +} + +async function deleteAssistant(page: Page, assistantId: string) { + const token = await getAccessToken(page); + await requestJson(page, { + path: `/api/assistants/v2/${encodeURIComponent(assistantId)}?endpoint=assistants&model=gpt-4o-mini`, + token, + method: 'DELETE', + body: { endpoint: 'assistants' }, + }); +} + +test.describe('assistant picker empty state', () => { + test('the Create Assistant label is muted until an assistant is chosen @scenario:assistant-select-empty-muted', async ({ + page, + }) => { + test.setTimeout(60000); + const assistant = await createAssistant(page); + + try { + const picker = await openBuilder(page); + const secondary = await probeStyle(page, 'text-text-secondary', 'color'); + const primary = await probeStyle(page, 'text-text-primary', 'color'); + expect(secondary).not.toBe(primary); + + const chosen = picker.getByText(ASSISTANT_NAME, { exact: true }); + await expect(chosen).toBeVisible(); + expect(await colorOf(chosen)).toBe(primary); + + await picker.click(); + const listbox = page.getByRole('listbox'); + await expect(listbox).toBeVisible(); + const option = listbox.getByRole('option', { name: ASSISTANT_NAME }); + await expect(option.locator('svg')).toHaveCount(1); + await listbox.getByRole('option', { name: 'Create Assistant' }).click(); + + const emptyLabel = picker.getByText('Create Assistant', { exact: true }); + await expect(emptyLabel).toBeVisible(); + await expect(picker.getByText(ASSISTANT_NAME, { exact: true })).toHaveCount(0); + expect(await colorOf(emptyLabel)).toBe(secondary); + + await picker.focus(); + await page.keyboard.press('Enter'); + await expect(listbox).toBeVisible(); + await expect(option.locator('svg')).toHaveCount(0); + await page.keyboard.press('Escape'); + await expect(listbox).toBeHidden(); + } finally { + await deleteAssistant(page, assistant.id); + } + }); +}); diff --git a/packages/client/src/components/SelectDropDown.tsx b/packages/client/src/components/SelectDropDown.tsx index cba84cb7ce..1bbee715aa 100644 --- a/packages/client/src/components/SelectDropDown.tsx +++ b/packages/client/src/components/SelectDropDown.tsx @@ -256,7 +256,7 @@ function SelectDropDown({ )} {currentLabel} - {currentValue === activeValue && ( + {value != null && currentValue === activeValue && ( { + it('renders the placeholder in the muted tone when no value is chosen', () => { + render( + , + ); + + expect(screen.getByText('Create Assistant')).toHaveClass('text-text-secondary'); + }); + + it('does not mark an empty-valued option as selected when no value is chosen', async () => { + render( + , + ); + await openList(); + + const empty = await screen.findByRole('option', { name: 'Loading...' }); + expect(empty.querySelector('svg')).toBeNull(); + }); + + it('marks the chosen option as selected', async () => { + render(); + await openList(); + + const chosen = await screen.findByRole('option', { name: 'Second' }); + expect(chosen.querySelector('svg')).not.toBeNull(); + expect(screen.getByRole('option', { name: 'Loading...' }).querySelector('svg')).toBeNull(); + }); +});