Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

feat(control-ui): custom Secret picker with four-row scroll and same-tab manage button

M46ba19fbbf2a
diff --git a/control-ui/components/ExistingConnectorSecretFields/index.tsx b/control-ui/components/ExistingConnectorSecretFields/index.tsx
index 80cf9ccb5..6bdfec509 100644
--- a/control-ui/components/ExistingConnectorSecretFields/index.tsx
+++ b/control-ui/components/ExistingConnectorSecretFields/index.tsx
@@ -1,7 +1,8 @@
'use client'
import { useEffect, useId, useRef, useState } from 'react'
-import Link from 'next/link'
+import { useRouter } from 'next/navigation'
+import { SelectionDropdown } from '@components/SelectionDropdown'
import { Button, Field, SelectInput, TextInput } from '@components/ui'
import { CONTROL_ROUTES } from '@constants/routes'
import { listMcpSecrets } from '@lib/api'
@@ -16,6 +17,7 @@ export function ExistingConnectorSecretFields({
disabled = false,
onChange,
}: ExistingConnectorSecretFieldsProps) {
+ const router = useRouter()
const prefix = useId()
const counter = useRef(0)
const [secrets, setSecrets] = useState<McpSecretSummary[]>([])
@@ -90,19 +92,19 @@ export function ExistingConnectorSecretFields({
Reuse a Secret from Secrets → Connectors. Stored values stay unchanged and are never shown.
</p>
<Field label="Existing Secret" htmlFor={`${prefix}-secret`} required>
- <SelectInput
+ <SelectionDropdown
id={`${prefix}-secret`}
- value={name}
+ ariaLabel="Existing Secret"
+ placeholder="Choose a Secret"
+ multiple={false}
+ searchable={false}
+ showSelectedChips={false}
disabled={state !== 'ready'}
- onChange={event => selectSecret(event.target.value)}
- >
- <option value="">Choose a Secret</option>
- {secrets.map(secret => (
- <option key={secret.name} value={secret.name}>
- {secret.name}
- </option>
- ))}
- </SelectInput>
+ invalid={invalid?.field === 'secret'}
+ options={secrets.map(secret => ({ label: secret.name, value: secret.name }))}
+ value={name ? [name] : []}
+ onChange={values => selectSecret(values[0] ?? '')}
+ />
</Field>
{state === 'loading' ? <p role="status">Loading Secrets…</p> : null}
{state === 'error' ? (
@@ -121,9 +123,13 @@ export function ExistingConnectorSecretFields({
<Button onClick={() => setRefresh(value => value + 1)} disabled={state === 'loading'}>
Refresh Secrets
</Button>
- <Link href={CONTROL_ROUTES.secrets.connector} target="_blank" rel="noopener noreferrer">
- Manage connector Secrets (opens in a new tab)
- </Link>
+ <Button
+ variant="ghost"
+ disabled={disabled}
+ onClick={() => router.push(CONTROL_ROUTES.secrets.connector)}
+ >
+ Manage connector Secrets
+ </Button>
</div>
{selected && !selected.keys.length ? (
<p role="alert">
diff --git a/control-ui/components/__tests__/ChangeConnectorSecret.test.tsx b/control-ui/components/__tests__/ChangeConnectorSecret.test.tsx
index 2ab2c85d1..51e7585e2 100644
--- a/control-ui/components/__tests__/ChangeConnectorSecret.test.tsx
+++ b/control-ui/components/__tests__/ChangeConnectorSecret.test.tsx
@@ -22,6 +22,10 @@ vi.mock('@lib/api', () => ({
updateMcpServer: vi.fn(),
}))
+vi.mock('next/navigation', () => ({
+ useRouter: () => ({ push: vi.fn() }),
+}))
+
const mockGetMcpServer = vi.mocked(getMcpServer)
const mockListMcpSecrets = vi.mocked(listMcpSecrets)
const mockUpdateMcpServer = vi.mocked(updateMcpServer)
@@ -127,9 +131,8 @@ async function renderPanel(
/** Chooses the replacement Secret and drains the state updates that follow. */
async function chooseReplacement(secretName = NEW_SECRET.name) {
- fireEvent.change(screen.getByLabelText(/^Existing Secret/), {
- target: { value: secretName },
- })
+ fireEvent.click(screen.getByLabelText(/^Existing Secret/))
+ fireEvent.click(screen.getByRole('option', { name: secretName }))
await flush(2)
}
diff --git a/control-ui/components/__tests__/CreateMcpServerForm.test.tsx b/control-ui/components/__tests__/CreateMcpServerForm.test.tsx
index b9b96eba1..a960fe61c 100644
--- a/control-ui/components/__tests__/CreateMcpServerForm.test.tsx
+++ b/control-ui/components/__tests__/CreateMcpServerForm.test.tsx
@@ -11,6 +11,9 @@ import { CreateMcpServerForm } from '../CreateMcpServerForm'
import { ToastProvider } from '../Toast'
// vi.mock is hoisted before imports; factory runs lazily so references to `api` are safe.
+vi.mock('next/navigation', () => ({
+ useRouter: () => ({ push: vi.fn() }),
+}))
vi.mock('../../lib/api', async importOriginal => {
const actual = await importOriginal<typeof import('../../lib/api')>()
const { buildContextResource } = await import('../../test/fixtures/contextResource')
@@ -973,9 +976,8 @@ describe('CreateMcpServerForm — reusable Secrets', () => {
continueToSecrets()
fireEvent.click(screen.getByRole('radio', { name: /Use an existing Secret/ }))
await waitFor(() => expect(screen.getByLabelText(/^Existing Secret/)).toBeEnabled())
- fireEvent.change(screen.getByLabelText(/^Existing Secret/), {
- target: { value: 'shared-credentials' },
- })
+ fireEvent.click(screen.getByLabelText(/^Existing Secret/))
+ fireEvent.click(await screen.findByRole('option', { name: 'shared-credentials' }))
}
it('creates a connector referencing stored keys without requesting or writing values', async () => {
await prepareExisting()
diff --git a/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx b/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx
index 1804dc08c..1a6cb3118 100644
--- a/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx
+++ b/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx
@@ -505,6 +505,15 @@ describe('EditMcpServerPage — credential surface wiring', () => {
// The component suites cover the form in isolation; these tests pin the wiring
// the page owns: eligibility gating, the busy navigation interlock, the
// spec-only write, and keyboard focus surviving the panel swap.
+
+/** The picker is a SelectionDropdown button: open it, then click the option. */
+async function chooseExistingSecret(name: string) {
+ const trigger = await screen.findByLabelText(/^Existing Secret/)
+ await waitFor(() => expect(trigger).toBeEnabled())
+ fireEvent.click(trigger)
+ fireEvent.click(await screen.findByRole('option', { name }))
+}
+
describe('EditMcpServerPage — Change assigned Secret', () => {
const OTHER_SECRET = {
name: 'other-credentials',
@@ -580,10 +589,7 @@ describe('EditMcpServerPage — Change assigned Secret', () => {
it('returns focus to the trigger after the change flow is cancelled', async () => {
await renderPage(eligibleServer())
fireEvent.click(screen.getByRole('button', { name: 'Change assigned Secret' }))
- await screen.findByLabelText(/^Existing Secret/)
- fireEvent.change(screen.getByLabelText(/^Existing Secret/), {
- target: { value: OTHER_SECRET.name },
- })
+ await chooseExistingSecret(OTHER_SECRET.name)
fireEvent.click(screen.getByRole('button', { name: 'Cancel assignment change' }))
const trigger = await screen.findByRole('button', { name: 'Change assigned Secret' })
@@ -595,9 +601,7 @@ describe('EditMcpServerPage — Change assigned Secret', () => {
it('locks navigation during the assignment, writes only envSecret, and reloads', async () => {
await renderPage(eligibleServer())
fireEvent.click(screen.getByRole('button', { name: 'Change assigned Secret' }))
- fireEvent.change(await screen.findByLabelText(/^Existing Secret/), {
- target: { value: OTHER_SECRET.name },
- })
+ await chooseExistingSecret(OTHER_SECRET.name)
fireEvent.click(screen.getByRole('button', { name: 'Assign and restart' }))
const dialog = await screen.findByRole('alertdialog')
diff --git a/control-ui/components/__tests__/ExistingConnectorSecretFields.test.tsx b/control-ui/components/__tests__/ExistingConnectorSecretFields.test.tsx
index e1653c2a5..3afc28c7e 100644
--- a/control-ui/components/__tests__/ExistingConnectorSecretFields.test.tsx
+++ b/control-ui/components/__tests__/ExistingConnectorSecretFields.test.tsx
@@ -9,6 +9,10 @@ vi.mock('@lib/api', () => ({
listMcpSecrets: vi.fn(),
}))
+vi.mock('next/navigation', () => ({
+ useRouter: () => ({ push: vi.fn() }),
+}))
+
const mockListMcpSecrets = vi.mocked(listMcpSecrets)
const SERVER: McpServerResource = {
@@ -41,6 +45,14 @@ function lastSelection(onChange: ReturnType<typeof vi.fn>): ExistingCredentialSe
return onChange.mock.calls.at(-1)?.[0] as ExistingCredentialSelection
}
+/** The picker is a SelectionDropdown button: open it, then click the option. */
+async function chooseSecret(name: string) {
+ const trigger = await screen.findByLabelText(/^Existing Secret/)
+ await waitFor(() => expect(trigger).toBeEnabled())
+ fireEvent.click(trigger)
+ fireEvent.click(await screen.findByRole('option', { name }))
+}
+
beforeEach(() => {
mockListMcpSecrets.mockResolvedValue({ items: [SECRET_B, SECRET_A] })
})
@@ -103,9 +115,7 @@ describe('ExistingConnectorSecretFields — metadata loading', () => {
describe('ExistingConnectorSecretFields — reference-only key mapping', () => {
it('auto-maps stored keys to environment variables and never renders a value input', async () => {
const { onChange } = renderFields()
- fireEvent.change(await screen.findByLabelText(/^Existing Secret/), {
- target: { value: SECRET_A.name },
- })
+ await chooseSecret(SECRET_A.name)
expect(screen.getByLabelText(/^Environment variable 1/)).toHaveValue('API_KEY')
// Write-only contract: no credential value is ever requested or rendered.
@@ -120,9 +130,7 @@ describe('ExistingConnectorSecretFields — reference-only key mapping', () => {
it('preserves each destination and demands an explicit key when the new Secret lacks it', async () => {
const { onChange } = renderFields({ initialReference: INITIAL_REFERENCE })
- fireEvent.change(await screen.findByLabelText(/^Existing Secret/), {
- target: { value: SECRET_B.name },
- })
+ await chooseSecret(SECRET_B.name)
// Destination names are the connector's contract: both survive the switch,
// and the missing source key is an explicit choice, never a value prompt.
@@ -144,9 +152,7 @@ describe('ExistingConnectorSecretFields — reference-only key mapping', () => {
it('clears the key error once an explicit stored key is chosen and keeps the destination', async () => {
const singleKeyReference = { name: 'old-secret', keys: [INITIAL_REFERENCE.keys[0]] }
renderFields({ initialReference: singleKeyReference })
- fireEvent.change(await screen.findByLabelText(/^Existing Secret/), {
- target: { value: SECRET_B.name },
- })
+ await chooseSecret(SECRET_B.name)
expect(screen.getByRole('alert')).toHaveTextContent('Choose a stored key')
fireEvent.change(screen.getByLabelText(/^Secret key 1/), {
@@ -158,9 +164,7 @@ describe('ExistingConnectorSecretFields — reference-only key mapping', () => {
it('flags a key that vanished from the selected Secret as a key problem after a refresh', async () => {
const { onChange } = renderFields()
- fireEvent.change(await screen.findByLabelText(/^Existing Secret/), {
- target: { value: SECRET_A.name },
- })
+ await chooseSecret(SECRET_A.name)
expect(lastSelection(onChange).rows[0]?.secretKey).toBe('api-key')
// Out-of-band: the stored key disappeared, then the operator refreshes.
@@ -184,9 +188,7 @@ describe('ExistingConnectorSecretFields — reference-only key mapping', () => {
items: [{ name: 'hollow-credentials', uid: 'uid-hollow', keys: [] }],
})
renderFields()
- fireEvent.change(await screen.findByLabelText(/^Existing Secret/), {
- target: { value: 'hollow-credentials' },
- })
+ await chooseSecret('hollow-credentials')
expect(
screen
diff --git a/control-ui/e2e/connector-secret-reuse.spec.ts b/control-ui/e2e/connector-secret-reuse.spec.ts
index 408b7bcc7..f164530f0 100644
--- a/control-ui/e2e/connector-secret-reuse.spec.ts
+++ b/control-ui/e2e/connector-secret-reuse.spec.ts
@@ -250,6 +250,13 @@ function appAlert(page: Page) {
/** Drives the three-step create flow to a connector referencing the shared
* Secret, with no credential value ever typed. */
+
+/** The picker is a custom single-select dropdown: open, then click the option. */
+async function chooseExistingSecret(page: Page, name: string) {
+ await page.getByLabel(/^Existing Secret/).click()
+ await page.getByRole('option', { name }).click()
+}
+
async function createConnectorUsingSharedSecret(page: Page, name: string) {
await page.goto('/connectors/new')
await page.getByPlaceholder('my-mcp-server').fill(name)
@@ -260,12 +267,11 @@ async function createConnectorUsingSharedSecret(page: Page, name: string) {
await page.getByRole('button', { name: 'Continue' }).click()
await page.getByRole('radio', { name: 'Use an existing Secret' }).click()
- const selector = page.getByLabel(/^Existing Secret/)
- await expect(selector).toBeEnabled()
+ await expect(page.getByLabel(/^Existing Secret/)).toBeEnabled()
// Write-only contract at the browser level: no value input ever renders.
await expect(page.locator('input[type="password"]')).toHaveCount(0)
- await selector.selectOption(SHARED_SECRET.name)
+ await chooseExistingSecret(page, SHARED_SECRET.name)
await expect(page.getByLabel(/^Environment variable 1/)).toHaveValue('API_KEY')
await page.getByRole('button', { name: 'Create connector' }).click()
@@ -354,7 +360,7 @@ test.describe('Connector Secret reuse — creation', () => {
await page.getByRole('button', { name: 'Retry loading Secrets' }).click()
await expect(page.getByLabel(/^Existing Secret/)).toBeEnabled()
- await page.getByLabel(/^Existing Secret/).selectOption(SHARED_SECRET.name)
+ await chooseExistingSecret(page, SHARED_SECRET.name)
await expect(page.getByLabel(/^Environment variable 1/)).toHaveValue('API_KEY')
})
@@ -415,7 +421,7 @@ test.describe('Connector Secret reuse — change assigned Secret', () => {
])
await openChangeFlow(page)
- await page.getByLabel(/^Existing Secret/).selectOption(SHARED_SECRET.name)
+ await chooseExistingSecret(page, SHARED_SECRET.name)
// Destinations are the connector's contract and survive the reassignment.
await expect(page.getByLabel(/^Environment variable 1/)).toHaveValue('LINEAR_API_KEY')
await expect(page.getByLabel(/^Environment variable 2/)).toHaveValue('LINEAR_WORKSPACE')
@@ -472,7 +478,7 @@ test.describe('Connector Secret reuse — change assigned Secret', () => {
const state = await prepare(page, [stale, stale, stale, savedNotReady])
await openChangeFlow(page)
- await page.getByLabel(/^Existing Secret/).selectOption(SHARED_SECRET.name)
+ await chooseExistingSecret(page, SHARED_SECRET.name)
await page.getByRole('button', { name: 'Assign and restart' }).click()
await page.getByRole('alertdialog').getByRole('button', { name: 'Assign and restart' }).click()
@@ -498,7 +504,7 @@ test.describe('Connector Secret reuse — change assigned Secret', () => {
const state = await prepare(page, [current, current, concurrentlyEdited])
await openChangeFlow(page)
- await page.getByLabel(/^Existing Secret/).selectOption(SHARED_SECRET.name)
+ await chooseExistingSecret(page, SHARED_SECRET.name)
await page.getByRole('button', { name: 'Assign and restart' }).click()
await page.getByRole('alertdialog').getByRole('button', { name: 'Assign and restart' }).click()
@@ -518,12 +524,12 @@ test.describe('Connector Secret reuse — change assigned Secret', () => {
await openChangeFlow(page)
// No-op: re-choosing the currently assigned Secret disables assignment.
- await page.getByLabel(/^Existing Secret/).selectOption(LEGACY_SECRET.name)
+ await chooseExistingSecret(page, LEGACY_SECRET.name)
await expect(page.getByRole('button', { name: 'Assign and restart' })).toBeDisabled()
// A Secret missing one stored key demands an explicit replacement key and
// never a credential value.
- await page.getByLabel(/^Existing Secret/).selectOption(PARTIAL_SECRET.name)
+ await chooseExistingSecret(page, PARTIAL_SECRET.name)
await expect(page.getByLabel(/^Secret key 2/)).toHaveValue('')
await expect(page.getByLabel(/^Environment variable 2/)).toHaveValue('LINEAR_WORKSPACE')
await expect(appAlert(page)).toContainText('Choose a stored key')
@@ -596,7 +602,7 @@ test.describe('Connector Secret reuse — change assigned Secret', () => {
await page.getByRole('button', { name: 'Retry loading Secrets' }).click()
await expect(page.getByLabel(/^Existing Secret/)).toBeEnabled()
- await page.getByLabel(/^Existing Secret/).selectOption(SHARED_SECRET.name)
+ await chooseExistingSecret(page, SHARED_SECRET.name)
await expect(page.getByRole('button', { name: 'Assign and restart' })).toBeEnabled()
})
})
@@ -615,7 +621,7 @@ test.describe('Connector Secret reuse — narrow viewport', () => {
await page.goto('/connectors/linear/edit/credentials')
await page.getByRole('button', { name: 'Change assigned Secret' }).click()
await expect(page.getByLabel(/^Existing Secret/)).toBeEnabled()
- await page.getByLabel(/^Existing Secret/).selectOption(SHARED_SECRET.name)
+ await chooseExistingSecret(page, SHARED_SECRET.name)
await expect(page.getByLabel(/^Environment variable 1/)).toHaveValue('LINEAR_API_KEY')
expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBeLessThanOrEqual(
await page.evaluate(() => window.innerWidth)
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index d03913f1a..e641cf936 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.748",
+ "version": "0.1.749",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.748",
+ "version": "0.1.749",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/control-ui/package.json b/control-ui/package.json
index 16c9af4f6..b828bef57 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.748",
+ "version": "0.1.749",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",
diff --git a/docs/design/connector-secret-reuse.md b/docs/design/connector-secret-reuse.md
index 218f4740d..b96a8b099 100644
--- a/docs/design/connector-secret-reuse.md
+++ b/docs/design/connector-secret-reuse.md
@@ -213,6 +213,19 @@ milestones:
reusable Secrets are assigned during connector creation or from the
connector's Credentials tab via Change assigned Secret; other scopes keep
the generic subtitle.
+6. **Custom Secret picker.** After operator feedback on the inherited
+ native `<select>` (unstyled popup and visible flicker on click in the
+ credentials tab), the Existing Secret picker now reuses the repository's
+ `SelectionDropdown` primitive in single-select mode: the popup renders
+ roughly four rows with its own scroll (the shared list cap of
+ `min(12rem, 30vh)`), keyboard and Escape still work, and the component
+ carries `aria-expanded`/`aria-haspopup`/`role="option"` semantics with
+ the same accessible name ("Existing Secret") as before. The "Manage
+ connector Secrets" entry point changed from a new-tab link to a plain
+ ghost button that navigates in the same tab and disables while the
+ flow is locked, so a pending assignment cannot be lost to a stray
+ click. The per-row Secret key selects remain native selects: their
+ option lists are small and they did not flicker.
Validation evidence (Node 24 via
`PATH=/home/pal/.nvm/versions/node/v24.22.1/bin:$PATH`, `UV_USE_IO_URING=0`