Skip to content

Commit d42c850

Browse files
committed
fix(platform): give embedded choice menus their bare label
ChoiceMenu appends the selection to its label, so the embedded Search filters and the Search MCP app picker announced it twice ("Filter by source: All sources: All sources"). Pass the bare label as the zone does, and drive the Search and member-role checks through the menu button and radio items that replaced the comboboxes.
1 parent 3d05b96 commit d42c850

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎apps/sim/platform/embedded/app/(shell)/_components/search/search-results.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ function SearchFilterControls({ sourceTypes }: { sourceTypes: readonly string[]
2424
<div className={styles.filters} role='group' aria-label='Search filters'>
2525
<div className={styles.filter}>
2626
<ChoiceMenu
27-
label={source.label}
27+
label='Filter by source'
2828
value={source.value}
2929
options={source.options}
3030
onValueChange={source.onChange}
3131
/>
3232
</div>
3333
<div className={styles.filter}>
3434
<ChoiceMenu
35-
label={updated.label}
35+
label='Filter by date'
3636
value={updated.value}
3737
options={updated.options}
3838
onValueChange={updated.onChange}

‎apps/sim/platform/embedded/app/(shell)/settings/_components/sections/search-mcp/search-mcp-section.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default function SearchMcpSection({ organization }: SettingsSectionProps)
9999
<>
100100
<SettingsRow label='App'>
101101
<ChoiceMenu
102-
label={`MCP app: ${client.label}`}
102+
label='MCP app'
103103
value={client.value}
104104
options={CLIENTS}
105105
onValueChange={(value) => {

‎apps/sim/scripts/org-redesign-e2e/checks/search.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ export async function searchChecks() {
114114
const links = page.locator('a[data-source-link]')
115115
await expect(links.first()).toHaveAttribute('target', '_blank')
116116
const filters = page.getByRole('group', { name: 'Search filters' })
117-
await filters.getByRole('combobox', { name: /Filter by date/ }).click()
118-
await page.getByRole('option', { name: 'Past week' }).click()
117+
await filters.getByRole('button', { name: /Filter by date/ }).click()
118+
await page.getByRole('menuitemradio', { name: 'Past week' }).click()
119119
await expect(page).toHaveURL((address) => address.searchParams.get('updated') === '7d')
120-
await filters.getByRole('combobox', { name: /Filter by source/ }).click()
120+
await filters.getByRole('button', { name: /Filter by source/ }).click()
121121
await page.keyboard.press('Escape')
122122
await links.first().focus()
123123
await page.keyboard.press('ArrowDown')

‎apps/sim/scripts/org-redesign-e2e/checks/settings.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,15 +626,15 @@ export async function settingsChecks() {
626626
() =>
627627
withSession(ADMIN, async ({ page }) => {
628628
await page.goto(orgUrl('/settings/members'))
629-
const role = page.getByRole('combobox', { name: 'Role for Mia Member', exact: true })
629+
const role = page.getByRole('button', { name: /^Role for Mia Member: / })
630630
const set = async (name: string) => {
631631
const write = page.waitForResponse(
632632
(response) =>
633633
/\/api\/organizations\/[^/]+\/members\/[^/]+$/.test(pathOf(response.url())) &&
634634
response.request().method() !== 'GET'
635635
)
636636
await role.click()
637-
await page.getByRole('option', { name, exact: true }).click()
637+
await page.getByRole('menuitemradio', { name, exact: true }).click()
638638
assert.ok((await write).ok(), `Setting ${name} failed`)
639639
await expect(role).toContainText(name)
640640
}

‎apps/sim/scripts/test-organization-search-e2e.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,9 +932,9 @@ try {
932932
)
933933
await expect(wikiResult).toBeVisible()
934934
await capture('search-populated-desktop')
935-
await page.getByRole('combobox', { name: 'Filter by source: All sources' }).click()
935+
await page.getByRole('button', { name: 'Filter by source: All sources' }).click()
936936
await capture('search-source-filter')
937-
await page.getByRole('option', { name: 'Google Drive', exact: true }).click()
937+
await page.getByRole('menuitemradio', { name: 'Google Drive', exact: true }).click()
938938
await expect(page).toHaveURL((url) => url.searchParams.get('source') === 'google_drive')
939939
await expect(wikiResult).toHaveCount(0)
940940
await capture('search-filtered')

0 commit comments

Comments
 (0)