Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
refactor(control-ui): rotate connector secrets through the shared credential panel
Mbc04a9ddd5d2
diff --git a/control-ui/app/mcp-servers/[name]/edit/page.tsx b/control-ui/app/mcp-servers/[name]/edit/page.tsxindex e9d1ca7ae..797b10246 100644--- a/control-ui/app/mcp-servers/[name]/edit/page.tsx+++ b/control-ui/app/mcp-servers/[name]/edit/page.tsx@@ -12,6 +12,10 @@ import { IconCable } from '@components/Sidebar/icons'import { TabBar } from '@components/TabBar'import { useToast } from '@components/Toast'import { UpdateConnectorCredentials } from '@components/UpdateConnectorCredentials'+import {+ resolveEnvSecret,+ resolveRegistryCredentialSource,+} from '@components/UpdateConnectorCredentials/mcpServerCredentialResolvers'import {isRecipeOwned,resolveCredentialSurface,@@ -32,14 +36,7 @@ import {getMcpServer,updateMcpServer,} from '@lib/api'-import type {- ContextResource,- EgressBinding,- EnvSecret,- EnvSecretKeyMapping,- HostResource,- McpServerResource,-} from '@lib/api'+import type { ContextResource, EgressBinding, HostResource, McpServerResource } from '@lib/api'import {hostOwnedContextNamesForConnector,mergeAccessSummaries,@@ -47,28 +44,6 @@ import {} from '@lib/connectorAccess'import type { EgressEditorStatus } from '@lib/egressModel'-/**- * Narrows `server.spec.envSecret` (typed as `unknown` on the generic- * `AnyRecord` spec) into the shape UpdateConnectorCredentials needs. A- * malformed or partial envSecret (missing name, keys not an array, or no- * usable key mappings) is treated the same as "no envSecret" — there is- * nothing safely rotatable through this form either way.- */-function resolveEnvSecret(spec: Record<string, unknown> | undefined): EnvSecret | undefined {- const raw = spec?.envSecret- if (!raw || typeof raw !== 'object') return undefined- const candidate = raw as { name?: unknown; keys?: unknown }- if (typeof candidate.name !== 'string' || !Array.isArray(candidate.keys)) return undefined- const keys = candidate.keys.filter(- (k): k is EnvSecretKeyMapping =>- Boolean(k) &&- typeof (k as EnvSecretKeyMapping).secretKey === 'string' &&- typeof (k as EnvSecretKeyMapping).envVar === 'string'- )- if (keys.length === 0) return undefined- return { name: candidate.name, keys }-}-function parseConnectorEditTab(value: string | string[] | undefined): ConnectorEditTab {const candidate = Array.isArray(value) ? value[0] : valuereturn CONNECTOR_EDIT_TABS.find(tab => tab === candidate) ?? CONNECTOR_EDIT_DEFAULT_TAB@@ -80,20 +55,6 @@ type ContextAccess = {users: Array<{ id: string; label: string }>}-function resolveRegistryCredentialSource(- metadata: McpServerResource['metadata'] | undefined-): { name: string; version: string } | undefined {- const labels = (metadata?.labels ?? {}) as Record<string, unknown>- const annotations = (metadata?.annotations ?? {}) as Record<string, unknown>- const name = String(- annotations['clerum.io/catalog-id'] ?? labels['clerum.io/catalog-id'] ?? ''- ).trim()- const version = String(- annotations['clerum.io/catalog-version'] ?? labels['clerum.io/catalog-version'] ?? ''- ).trim()- return name && version ? { name, version } : undefined-}-const EMPTY_CONTEXT_ACCESS: ContextAccess = { agents: [], teams: [], users: [] }const CONTEXT_ACCESS_GROUPS: Array<{ key: keyof ContextAccess; title: string }> = [diff --git a/control-ui/app/secrets/connector/[name]/edit/page.tsx b/control-ui/app/secrets/connector/[name]/edit/page.tsxindex 8040d83a1..96403cef4 100644--- a/control-ui/app/secrets/connector/[name]/edit/page.tsx+++ b/control-ui/app/secrets/connector/[name]/edit/page.tsx@@ -1,36 +1,35 @@'use client'-import React, { Suspense, useEffect, useMemo, useRef, useState } from 'react'+import React, { Suspense, useEffect, useMemo, useState } from 'react'import { useParams, useRouter, useSearchParams } from 'next/navigation'import { AuthGate } from '@components/AuthGate'import { BodyLoadingSkeleton } from '@components/BodyLoadingSkeleton'-import { useConfirmDialog } from '@components/ConfirmDialog'import { CreatePageHeader } from '@components/CreatePageHeader'import { DashboardLayout } from '@components/DashboardLayout'import { IconKey } from '@components/Sidebar/icons'-import { useToast } from '@components/Toast'-import { IconX } from '@components/icons'-import { Button, Field, FormSection, TextInput } from '@components/ui'+import { TabBar } from '@components/TabBar'+import { UpdateConnectorCredentials } from '@components/UpdateConnectorCredentials'+import {+ resolveEnvSecret,+ resolveRegistryCredentialSource,+} from '@components/UpdateConnectorCredentials/mcpServerCredentialResolvers'+import {+ isRecipeOwned,+ resolveCredentialSurface,+} from '@components/UpdateConnectorCredentials/resolveCredentialSurface'import { CONTROL_ROUTES } from '@constants/routes'-import { type CredentialSchema, getRegistryCredentialSchema, updateMcpSecret } from '@lib/api'-import { reconcileCredentialRows } from '@lib/registryCredentialDraft'-import type { CredentialDraftRow } from '@lib/registryCredentialDraft.types'+import { getMcpServers } from '@lib/api'+import type { McpServerResource } from '@lib/api'-function createDraftRow(- id: string,- secretKey = '',- value = '',- label?: string-): CredentialDraftRow {- return { id, secretKey, value, label }+function serverRefersToSecret(server: McpServerResource, secretName: string): boolean {+ const envSecret = server.spec?.envSecret as { name?: unknown } | undefined+ return typeof envSecret?.name === 'string' && envSecret.name.trim() === secretName}function EditConnectorSecretContent() {const router = useRouter()const params = useParams<{ name: string }>()const searchParams = useSearchParams()- const { confirm, confirmDialog } = useConfirmDialog()- const { showToast } = useToast()const secretName = useMemo(() => {const raw = params?.name@@ -41,209 +40,110 @@ function EditConnectorSecretContent() {return value ?? ''}}, [params])- const registryEntry = (searchParams.get('registryEntry') ?? '').trim()- const registryVersion = (searchParams.get('registryVersion') ?? '').trim()+ const requestedServer = (searchParams.get('server') ?? '').trim()- const [rows, setRows] = useState<CredentialDraftRow[]>(() => [- createDraftRow('connector-secret-row-0'),- ])- const nextRowId = useRef(1)- const [credentialSchema, setCredentialSchema] = useState<CredentialSchema | null>(null)- const [credentialSchemaLoading, setCredentialSchemaLoading] = useState(false)- const [saving, setSaving] = useState(false)- const [error, setError] = useState('')+ const [servers, setServers] = useState<McpServerResource[] | null>(null)+ const [loadError, setLoadError] = useState('')useEffect(() => {- if (!registryEntry || !registryVersion) {- setCredentialSchema(null)- setCredentialSchemaLoading(false)+ if (!secretName) {+ setLoadError('Missing secret name in URL.')+ setServers([])return}-let cancelled = false- setCredentialSchemaLoading(true)- void getRegistryCredentialSchema(registryEntry, registryVersion)- .then(schema => {+ getMcpServers()+ .then(result => {if (cancelled) return- setCredentialSchema(schema)- if (schema.keys.length === 0) return- setRows(current => reconcileCredentialRows(current, schema.keys))+ const attached = (result.items ?? [])+ .filter(server => serverRefersToSecret(server, secretName))+ .sort((a, b) =>+ String(a.metadata?.name ?? '').localeCompare(String(b.metadata?.name ?? ''))+ )+ setServers(attached)})- .catch(() => {- if (!cancelled) setCredentialSchema(null)+ .catch(error => {+ if (!cancelled) {+ setLoadError(+ error instanceof Error ? error.message : 'Failed to load connector secret references'+ )+ setServers([])+ }})- .finally(() => {- if (!cancelled) setCredentialSchemaLoading(false)- })-return () => {cancelled = true}- }, [registryEntry, registryVersion])+ }, [secretName])- const canSubmit =- !saving && rows.some(row => row.secretKey.trim().length > 0 && row.value.trim().length > 0)+ const selected = useMemo(() => {+ if (!servers || servers.length === 0) return undefined+ return servers.find(s => String(s.metadata?.name ?? '') === requestedServer) ?? servers[0]+ }, [servers, requestedServer])+ const selectedName = selected ? String(selected.metadata?.name ?? '') : ''function backToList() {router.push(CONTROL_ROUTES.secrets.connector)}- function addDraftRow() {- const nextId = nextRowId.current- nextRowId.current += 1- setRows(current => [...current, createDraftRow(`connector-secret-row-${nextId}`)])- }-- function removeDraftRow(index: number) {- setRows(current => current.filter((_, itemIndex) => itemIndex !== index))- }-- function updateDraftRow(index: number, field: 'secretKey' | 'value', value: string) {- setRows(current =>- current.map((row, itemIndex) => (itemIndex === index ? { ...row, [field]: value } : row))- )- }-- async function save() {- if (!secretName) {- setError('Missing secret name in URL.')- return- }- const data = Object.fromEntries(- rows- .map(row => [row.secretKey.trim(), row.value.trim()])- .filter(([secretKey, value]) => secretKey.length > 0 && value.length > 0)- )- if (Object.keys(data).length === 0) {- setError('Enter at least one key and a new value to update this secret.')- return- }-- const ok = await confirm({- title: 'Update connector secret',- message: `Rotate the values you entered in Secret ${secretName}? Connectors that reference it will restart to pick them up.`,- confirmLabel: 'Update',- })- if (!ok) return-- setSaving(true)- setError('')- try {- const result = await updateMcpSecret(secretName, data)- const affected = Array.isArray(result.affectedConnectors) ? result.affectedConnectors : []- showToast(- affected.length > 0- ? `Secret ${secretName} updated. Restarting connectors: ${affected.join(', ')}.`- : `Secret ${secretName} updated.`,- { tone: 'success' }- )- backToList()- } catch (saveError) {- setError(saveError instanceof Error ? saveError.message : 'Failed to update secret')- } finally {- setSaving(false)- }- }-return (<AuthGate><DashboardLayout isDetailPage><CreatePageHeadericon={<IconKey />}title={`Edit connector secret${secretName ? `: ${secretName}` : ''}`}- subtitle="Stored values are never shown. Type a new value to rotate a key — keys you leave blank keep their current value."+ subtitle="Rotate the values stored in this Secret through a connector that references it. Values are write-only; keys you leave blank keep their current value."backLabel="Back to secrets"onBack={backToList}- backDisabled={saving}/><div className="cu-create-panel"><div className="cu-create-content">- {credentialSchemaLoading ? (- <p className="cu-muted">Loading connector credential fields…</p>- ) : credentialSchema?.keys.length ? (- <FormSection title="Secret values">- <div className="cu-form-stack">- {rows.map((row, index) => (- <Field- key={row.id}- htmlFor={`${row.id}-value`}- label={row.label || row.secretKey}- >- <TextInput- id={`${row.id}-value`}- value={row.value}- onChange={event => updateDraftRow(index, 'value', event.target.value)}- placeholder={row.label || 'New credential value'}- type="password"- autoComplete="off"- disabled={saving}- />- </Field>- ))}- </div>- </FormSection>+ {loadError ? <div className="cu-banner cu-banner--error">{loadError}</div> : null}++ {servers === null ? (+ <p className="cu-muted" role="status">+ Loading attached connectors…+ </p>+ ) : servers.length === 0 ? (+ <div className="cu-banner cu-banner--error">+ No connector currently references Secret <code>{secretName || '(unnamed)'}</code>.+ Attach it to a connector before rotating it from here.+ </div>) : (- <FormSection title="Secret values">- <div className="cu-form-grid">- {rows.map((row, index) => (- <div className="cu-form-inline" key={row.id}>- <TextInput- monospace- value={row.secretKey}- onChange={event => updateDraftRow(index, 'secretKey', event.target.value)}- placeholder="API_KEY"- disabled={saving}- />- <TextInput- monospace- value={row.value}- onChange={event => updateDraftRow(index, 'value', event.target.value)}- placeholder="secret value"- type="password"- autoComplete="off"- disabled={saving}- />- <button- type="button"- className="cu-btn cu-btn--icon cu-btn--danger-icon"- onClick={() => removeDraftRow(index)}- disabled={saving || rows.length === 1}- aria-label={`Remove key row ${index + 1}`}- title={`Remove key row ${index + 1}`}- >- <IconX width={16} height={16} />- </button>- </div>- ))}- </div>-- <Button type="button" size="sm" onClick={addDraftRow} disabled={saving}>- Add key- </Button>- </FormSection>+ <>+ {servers.length > 1 ? (+ <TabBar+ activeValue={selectedName}+ ariaLabel="Connectors referencing this secret"+ className="cu-tabs--flush"+ options={servers.map(server => {+ const name = String(server.metadata?.name ?? '')+ return {+ value: name,+ label: name,+ href: CONTROL_ROUTES.secrets.editConnector(secretName, { server: name }),+ }+ })}+ />+ ) : null}++ {selected ? (+ <UpdateConnectorCredentials+ key={selectedName}+ serverName={selectedName}+ envSecret={resolveEnvSecret(selected.spec as Record<string, unknown>)}+ surface={resolveCredentialSurface(+ selected.status?.conditions,+ selected.spec as { managed?: boolean } | undefined+ )}+ recipeOwned={isRecipeOwned(selected.spec as { managed?: boolean } | undefined)}+ registryCredentialSource={resolveRegistryCredentialSource(selected.metadata)}+ />+ ) : null}+ </>)}-- {error ? <div className="cu-banner cu-banner--error">{error}</div> : null}- </div>-- <div className="cu-create-actions">- <Button type="button" variant="ghost" size="sm" onClick={backToList} disabled={saving}>- Cancel- </Button>- <Button- type="button"- variant="primary"- size="sm"- onClick={() => void save()}- disabled={!canSubmit}- >- {saving ? 'Saving…' : 'Save changes'}- </Button></div></div>-- {confirmDialog}</DashboardLayout></AuthGate>)@@ -256,9 +156,9 @@ export default function EditConnectorSecretPage() {<BodyLoadingSkeletonbackLabel="Back to secrets"icon={<IconKey />}- primaryActionLabel="Save changes"+ primaryActionLabel="Rotate credentials"sections={2}- subtitle="Load the connector credential fields before editing stored values."+ subtitle="Load the connectors referencing this secret before rotating stored values."title="Edit connector secret"/>}diff --git a/control-ui/components/SecretsTable.tsx b/control-ui/components/SecretsTable.tsxindex 66b91b395..a80ee2c67 100644--- a/control-ui/components/SecretsTable.tsx+++ b/control-ui/components/SecretsTable.tsx@@ -49,7 +49,10 @@ type McpSecretRow = {}type RecipeSecretStatus = 'provisioned' | 'missing'type RecipeSecretRowOwnership =- { kind: 'shared' } | { kind: 'owner-recipe'; recipeName: string } | { kind: 'unlabeled' } | null // missing rows: not yet provisioned, ownership chosen at create time.+ | { kind: 'shared' }+ | { kind: 'owner-recipe'; recipeName: string }+ | { kind: 'unlabeled' }+ | null // missing rows: not yet provisioned, ownership chosen at create time.type RecipeSecretRow = {name: stringnamespace: string@@ -681,62 +684,58 @@ export function SecretsTable({: 'Created manually or source unknown.'}</td><td className="cu-table__cell-actions">- <div style={{ display: 'inline-flex', gap: '0.35rem' }}>- <RowActionsMenu- ariaLabel={`Actions for connector secret ${row.name}`}- horizontalTrigger- actions={[- {- key: 'add',- label: 'Add',- onClick: () => {- const source =- row.registrySources.length === 1- ? row.registrySources[0]- : undefined- router.push(- CONTROL_ROUTES.secrets.new({- scope: 'mcp',- name: row.name,- registryEntry: source?.name,- registryVersion: source?.version,- })- )- },+ <RowActionsMenu+ ariaLabel={`Actions for connector secret ${row.name}`}+ horizontalTrigger+ actions={[+ {+ key: 'add',+ label: 'Add',+ onClick: () => {+ const source =+ row.registrySources.length === 1+ ? row.registrySources[0]+ : undefined+ router.push(+ CONTROL_ROUTES.secrets.new({+ scope: 'mcp',+ name: row.name,+ registryEntry: source?.name,+ registryVersion: source?.version,+ })+ )},- {- key: 'update',- label: 'Update',- onClick: () => {- const source =- row.registrySources.length === 1- ? row.registrySources[0]+ },+ {+ key: 'update',+ label: 'Update',+ onClick: () => {+ router.push(+ CONTROL_ROUTES.secrets.editConnector(+ row.name,+ row.servers.length === 1+ ? { server: row.servers[0] }: undefined- router.push(- CONTROL_ROUTES.secrets.editConnector(row.name, {- registryEntry: source?.name,- registryVersion: source?.version,- }))- },- },- {- key: 'delete',- label: 'Delete',- danger: true,- // deleteMcpSecret requires the Secret's live- // uid/resourceVersion as its CAS precondition.- // Connector rows are derived from McpServer- // references and no list API returns that- // identity, so delete stays inert rather than- // issuing an unfenced delete.- disabled: true,- disabledReason: 'Delete is not available for this secret.',- onClick: () => {},+ )},- ]}- />- </div>+ },+ {+ key: 'delete',+ label: 'Delete',+ danger: true,+ // deleteMcpSecret requires the Secret's live+ // uid/resourceVersion as its CAS precondition.+ // Connector rows are derived from McpServer+ // references and no list API returns that+ // identity, so delete stays inert rather than+ // issuing an unfenced delete.+ disabled: true,+ disabledReason: 'Delete is not available for this secret.',+ onClick: () => {},+ },+ ]}+ /></td></tr>))diff --git a/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.ts b/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.tsnew file mode 100644index 000000000..bef01b133--- /dev/null+++ b/control-ui/components/UpdateConnectorCredentials/mcpServerCredentialResolvers.ts@@ -0,0 +1,42 @@+import type { EnvSecret, EnvSecretKeyMapping, McpServerResource } from '@lib/api'++/**+ * Narrows `server.spec.envSecret` (typed as `unknown` on the generic+ * `AnyRecord` spec) into the shape UpdateConnectorCredentials needs. A+ * malformed or partial envSecret (missing name, keys not an array, or no+ * usable key mappings) is treated the same as "no envSecret" — there is+ * nothing safely rotatable through this form either way.+ */+export function resolveEnvSecret(spec: Record<string, unknown> | undefined): EnvSecret | undefined {+ const raw = spec?.envSecret+ if (!raw || typeof raw !== 'object') return undefined+ const candidate = raw as { name?: unknown; keys?: unknown }+ if (typeof candidate.name !== 'string' || !Array.isArray(candidate.keys)) return undefined+ const keys = candidate.keys.filter(+ (k): k is EnvSecretKeyMapping =>+ Boolean(k) &&+ typeof (k as EnvSecretKeyMapping).secretKey === 'string' &&+ typeof (k as EnvSecretKeyMapping).envVar === 'string'+ )+ if (keys.length === 0) return undefined+ return { name: candidate.name, keys }+}++/**+ * The Marketplace source (catalog-id / catalog-version annotations, falling+ * back to legacy labels) used to resolve operator-friendly credential labels+ * for the connector's declared keys.+ */+export function resolveRegistryCredentialSource(+ metadata: McpServerResource['metadata'] | undefined+): { name: string; version: string } | undefined {+ const labels = (metadata?.labels ?? {}) as Record<string, unknown>+ const annotations = (metadata?.annotations ?? {}) as Record<string, unknown>+ const name = String(+ annotations['clerum.io/catalog-id'] ?? labels['clerum.io/catalog-id'] ?? ''+ ).trim()+ const version = String(+ annotations['clerum.io/catalog-version'] ?? labels['clerum.io/catalog-version'] ?? ''+ ).trim()+ return name && version ? { name, version } : undefined+}diff --git a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsxindex 5f63227b3..dfebb6fa1 100644--- a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx+++ b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx@@ -1,9 +1,24 @@import React from 'react'import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'-import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react'+import { act } from '@testing-library/react'+import { cleanup, fireEvent, render, screen, within } from '@testing-library/react'import { ToastProvider } from '@components/Toast'+import { POLL_INTERVAL_MS } from '@components/UpdateConnectorCredentials'import EditConnectorSecretPage from '../../app/secrets/connector/[name]/edit/page'-import { getRegistryCredentialSchema, updateMcpSecret } from '../../lib/api'+import {+ createMcpSecret,+ getMcpServer,+ getMcpServers,+ getRegistryCredentialSchema,+ updateMcpSecret,+} from '../../lib/api'+import type { McpServerResource } from '../../lib/api'++// These tests prove the PAGE wiring: the rotation form, its rollout+// verification, and the 404→recreate latch all belong to the shared+// UpdateConnectorCredentials component (covered by its own suite). Here we+// assert that the secrets-page route lands the operator on that exact+// component, bound to a connector that actually references the Secret.const navigation = vi.hoisted(() => ({params: { name: 'linear-credentials' },@@ -25,145 +40,201 @@ vi.mock('@components/DashboardLayout', () => ({DashboardLayout: ({ children }: { children: React.ReactNode }) => <>{children}</>,}))-vi.mock('../../lib/api', async () => {- const actual = await vi.importActual<typeof import('../../lib/api')>('../../lib/api')+vi.mock('../../lib/api', () => ({+ createMcpSecret: vi.fn(),+ getMcpServer: vi.fn(),+ getMcpServers: vi.fn(),+ getRegistryCredentialSchema: vi.fn(),+ updateMcpSecret: vi.fn(),+}))++const mockCreateMcpSecret = vi.mocked(createMcpSecret)+const mockGetMcpServer = vi.mocked(getMcpServer)+const mockGetMcpServers = vi.mocked(getMcpServers)+const mockGetRegistryCredentialSchema = vi.mocked(getRegistryCredentialSchema)+const mockUpdateMcpSecret = vi.mocked(updateMcpSecret)++function server(options: { name: string; secretKey?: string; envVar?: string }): McpServerResource {return {- ...actual,- getRegistryCredentialSchema: vi.fn(),- updateMcpSecret: vi.fn(),+ metadata: {+ name: options.name,+ annotations: {+ 'clerum.io/catalog-id': 'mcp-linear',+ 'clerum.io/catalog-version': '1.4.0',+ },+ },+ spec: {+ envSecret: {+ name: 'linear-credentials',+ keys: [+ {+ secretKey: options.secretKey ?? 'api-key',+ envVar: options.envVar ?? 'LINEAR_API_KEY',+ },+ ],+ },+ },+ status: { conditions: [] },}-})+}-const getRegistryCredentialSchemaMock = vi.mocked(getRegistryCredentialSchema)-const updateMcpSecretMock = vi.mocked(updateMcpSecret)+/** Drains chained microtasks without real timers — same contract as the+ * UpdateConnectorCredentials suite, safe under vi.useFakeTimers(). */+async function flush(ticks = 4) {+ for (let i = 0; i < ticks; i += 1) {+ // eslint-disable-next-line no-await-in-loop+ await act(async () => {+ await Promise.resolve()+ })+ }+}-function renderPage() {+async function renderPage() {render(<ToastProvider><EditConnectorSecretPage /></ToastProvider>)+ // Settle the page's own getMcpServers() load plus the component's mount+ // effects (affected-preview fetch + registry label fetch).+ await flush(6)}-async function confirmUpdate() {- const dialog = await screen.findByRole('alertdialog', { name: 'Update connector secret' })- fireEvent.click(within(dialog).getByRole('button', { name: 'Update' }))+async function submitRotation(label: string, value: string) {+ fireEvent.change(screen.getByLabelText(label), { target: { value } })+ fireEvent.click(screen.getByRole('button', { name: 'Rotate credentials' }))+ const dialog = screen.getByRole('alertdialog')+ fireEvent.click(within(dialog).getByRole('button', { name: 'Rotate & restart' }))+ await flush()}-describe('EditConnectorSecretPage', () => {- beforeEach(() => {- getRegistryCredentialSchemaMock.mockReset()- updateMcpSecretMock.mockReset()- navigation.params = { name: 'linear-credentials' }- navigation.searchParams = new URLSearchParams()- navigation.push.mockClear()+beforeEach(() => {+ vi.useFakeTimers()+ vi.setSystemTime(new Date('2026-01-01T00:00:00.000Z'))+ navigation.params = { name: 'linear-credentials' }+ navigation.searchParams = new URLSearchParams()+ navigation.push.mockClear()+ mockGetMcpServers.mockResolvedValue({ items: [server({ name: 'linear-conn' })] })+ mockGetRegistryCredentialSchema.mockResolvedValue({+ required: true,+ authType: 'api-key',+ keys: [{ name: 'api-key', label: 'API token', kind: 'api-key' }],})-- afterEach(() => {- cleanup()+ mockGetMcpServer.mockResolvedValue({+ metadata: { name: 'linear-conn' },+ status: {+ conditions: [+ {+ type: 'DeploymentReady',+ status: 'True',+ reason: 'RolloutComplete',+ message: 'ready',+ lastTransitionTime: '2026-01-01T00:00:05.000Z',+ },+ ],+ },})+ mockUpdateMcpSecret.mockResolvedValue({+ name: 'linear-credentials',+ namespace: 'mcp-server',+ keys: ['api-key'],+ affectedConnectors: ['linear-conn'],+ })+})- it('keeps Save disabled until a key and value are both filled', () => {- renderPage()+afterEach(() => {+ cleanup()+ vi.clearAllMocks()+ vi.useRealTimers()+})- const save = screen.getByRole('button', { name: 'Save changes' })- expect(save).toBeDisabled()+describe('EditConnectorSecretPage', () => {+ it('renders the shared rotation form for the single connector referencing the secret', async () => {+ await renderPage()++ expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()+ // registryCredentialSource is derived from the connector's catalog+ // annotations — the schema label proves it reached the shared component.+ expect(screen.getByLabelText('API token')).toBeInTheDocument()+ expect(screen.getByText('LINEAR_API_KEY')).toBeInTheDocument()+ // Single connector: no chooser.+ expect(screen.queryByRole('tablist', { name: 'Connectors referencing this secret' })).toBeNull()+ })- fireEvent.change(screen.getByPlaceholderText('API_KEY'), { target: { value: 'API_KEY' } })- expect(save).toBeDisabled()+ it('rotates through the shared flow and waits for the connector rollout before declaring success', async () => {+ await renderPage()- fireEvent.change(screen.getByPlaceholderText('secret value'), {- target: { value: 'rotated' },- })- expect(save).toBeEnabled()- })+ await submitRotation('API token', 'rotated')- it('rotates only the filled keys and reports affected connectors', async () => {- updateMcpSecretMock.mockResolvedValue({- name: 'linear-credentials',- namespace: 'mcp-server',- keys: ['API_KEY'],- affectedConnectors: ['linear-conn'],+ expect(mockUpdateMcpSecret).toHaveBeenCalledWith('linear-credentials', {+ 'api-key': 'rotated',})- renderPage()-- fireEvent.change(screen.getByPlaceholderText('API_KEY'), { target: { value: 'API_KEY' } })- fireEvent.change(screen.getByPlaceholderText('secret value'), { target: { value: 'rotated' } })- fireEvent.click(screen.getByRole('button', { name: 'Save changes' }))- await confirmUpdate()+ // Success is derived from the connector's own fresh DeploymentReady, not+ // the PUT's 200 — the banner only appears after the poll observes it.+ expect(screen.getByText(/Rotating credentials/i)).toBeInTheDocument()+ expect(screen.queryByText(/Credentials rotated/i)).not.toBeInTheDocument()- await waitFor(() => {- expect(updateMcpSecretMock).toHaveBeenCalledWith('linear-credentials', {- API_KEY: 'rotated',- })+ await act(async () => {+ await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS)})expect(- await screen.findByText(- 'Secret linear-credentials updated. Restarting connectors: linear-conn.'+ screen.getByText(+ /Credentials rotated\. linear-conn restarted and is serving the new credential\./i)).toBeInTheDocument()- await waitFor(() => {- expect(navigation.push).toHaveBeenCalledWith('/secrets/connector')- })})- it('writes nothing when the rotation confirmation is cancelled', async () => {- renderPage()-- fireEvent.change(screen.getByPlaceholderText('API_KEY'), { target: { value: 'API_KEY' } })- fireEvent.change(screen.getByPlaceholderText('secret value'), { target: { value: 'rotated' } })- fireEvent.click(screen.getByRole('button', { name: 'Save changes' }))+ it('latches to recreate mode when the rotation PUT answers 404', async () => {+ mockUpdateMcpSecret.mockRejectedValue(+ Object.assign(new Error('404 Not Found'), { status: 404 })+ )+ await renderPage()- const dialog = await screen.findByRole('alertdialog', { name: 'Update connector secret' })- fireEvent.click(within(dialog).getByRole('button', { name: 'Cancel' }))+ await submitRotation('API token', 'rotated')- await waitFor(() => {- expect(screen.queryByRole('alertdialog')).toBeNull()- })- expect(updateMcpSecretMock).not.toHaveBeenCalled()- expect(screen.getByRole('button', { name: 'Save changes' })).toBeInTheDocument()+ expect(screen.getByText(/This Secret no longer exists\./)).toBeInTheDocument()+ expect(screen.getByRole('button', { name: 'Set credentials' })).toBeInTheDocument()+ expect(mockCreateMcpSecret).not.toHaveBeenCalled()})- it('surfaces the API error inline instead of navigating away', async () => {- updateMcpSecretMock.mockRejectedValue(new Error('Secret not found'))- renderPage()-- fireEvent.change(screen.getByPlaceholderText('API_KEY'), { target: { value: 'API_KEY' } })- fireEvent.change(screen.getByPlaceholderText('secret value'), { target: { value: 'rotated' } })- fireEvent.click(screen.getByRole('button', { name: 'Save changes' }))- await confirmUpdate()-- expect(await screen.findByText('Secret not found')).toBeInTheDocument()- expect(navigation.push).not.toHaveBeenCalled()- })-- it('uses the registry credential schema when the source is known', async () => {- navigation.searchParams = new URLSearchParams('registryEntry=mcp-linear®istryVersion=1.4.0')- getRegistryCredentialSchemaMock.mockResolvedValue({- required: true,- authType: 'api-key',- keys: [- { name: 'api-token', label: 'API token', kind: 'api-key' },- { name: 'workspace-id', label: 'Workspace ID', kind: 'text' },+ it('offers a connector chooser when several connectors reference the secret', async () => {+ mockGetMcpServers.mockResolvedValue({+ items: [+ server({ name: 'linear-conn' }),+ server({ name: 'alpha-conn', secretKey: 'alpha-key', envVar: 'ALPHA_KEY' }),],})- updateMcpSecretMock.mockResolvedValue({- name: 'linear-credentials',- namespace: 'mcp-server',- keys: ['api-token', 'workspace-id'],- affectedConnectors: [],- })- renderPage()+ await renderPage()++ const chooser = screen.getByRole('tablist', { name: 'Connectors referencing this secret' })+ expect(within(chooser).getByRole('tab', { name: 'alpha-conn' })).toHaveAttribute(+ 'href',+ '/secrets/connector/linear-credentials/edit?server=alpha-conn'+ )+ expect(within(chooser).getByRole('tab', { name: 'linear-conn' })).toHaveAttribute(+ 'href',+ '/secrets/connector/linear-credentials/edit?server=linear-conn'+ )+ // Default selection is the first connector by name.+ expect(within(chooser).getByRole('tab', { name: 'alpha-conn' })).toHaveAttribute(+ 'aria-selected',+ 'true'+ )+ expect(screen.getByText('ALPHA_KEY')).toBeInTheDocument()++ // The ?server= filter selects the other connector's declaration.+ navigation.searchParams = new URLSearchParams('?server=linear-conn')+ cleanup()+ await renderPage()+ expect(screen.getByText('LINEAR_API_KEY')).toBeInTheDocument()+ expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()+ })- fireEvent.change(await screen.findByLabelText('API token'), { target: { value: 'rotated' } })- fireEvent.click(screen.getByRole('button', { name: 'Save changes' }))- await confirmUpdate()+ it('explains when no connector currently references the secret', async () => {+ mockGetMcpServers.mockResolvedValue({ items: [] })+ await renderPage()- await waitFor(() => {- expect(updateMcpSecretMock).toHaveBeenCalledWith('linear-credentials', {- 'api-token': 'rotated',- })- })- expect(await screen.findByText('Secret linear-credentials updated.')).toBeInTheDocument()+ expect(screen.getByText(/No connector currently references Secret/i)).toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()})})diff --git a/control-ui/components/__tests__/SecretsTable.test.tsx b/control-ui/components/__tests__/SecretsTable.test.tsxindex 7574ec338..ac5c0691c 100644--- a/control-ui/components/__tests__/SecretsTable.test.tsx+++ b/control-ui/components/__tests__/SecretsTable.test.tsx@@ -664,7 +664,7 @@ describe('SecretsTable — connector row actions', () => {expect(apiSendMock).not.toHaveBeenCalled()})- it('navigates Update to the connector secret edit page with its registry source', async () => {+ it('navigates Update to the connector secret edit page for its attached connector', async () => {mockConnectorRow()renderTable()await openRowMenu()@@ -672,10 +672,33 @@ describe('SecretsTable — connector row actions', () => {fireEvent.click(screen.getByRole('menuitem', { name: 'Update' }))expect(mockPush).toHaveBeenCalledWith(- '/secrets/connector/linear-credentials/edit?registryEntry=mcp-linear®istryVersion=1.4.0'+ '/secrets/connector/linear-credentials/edit?server=linear-conn')})+ it('navigates Update without a server filter when several connectors share the secret', async () => {+ getMcpServersMock.mockResolvedValue({+ items: [+ {+ metadata: { name: 'conn-a' },+ spec: { envSecret: { name: 'shared-credentials' } },+ },+ {+ metadata: { name: 'conn-b' },+ spec: { envSecret: { name: 'shared-credentials' } },+ },+ ],+ })+ renderTable()++ fireEvent.click(+ await screen.findByRole('button', { name: 'Actions for connector secret shared-credentials' })+ )+ fireEvent.click(screen.getByRole('menuitem', { name: 'Update' }))++ expect(mockPush).toHaveBeenCalledWith('/secrets/connector/shared-credentials/edit')+ })+it('still prefills the create flow from the row Add action', async () => {mockConnectorRow()renderTable()diff --git a/control-ui/e2e/registry-install.spec.ts b/control-ui/e2e/registry-install.spec.tsindex a4ea957c6..ca58523cc 100644--- a/control-ui/e2e/registry-install.spec.ts+++ b/control-ui/e2e/registry-install.spec.ts@@ -510,7 +510,8 @@ async function waitForWorkflowRecipeDeleted(token: string, name: string): Promisfunction externalEgressReady(server: Record<string, unknown>): boolean {const status = server.status as- { conditions?: Array<{ type?: string; status?: string }> } | undefined+ | { conditions?: Array<{ type?: string; status?: string }> }+ | undefinedreturn (status?.conditions?.some(condition => condition.type === 'ExternalEgressReady' && condition.status === 'True'@@ -571,7 +572,8 @@ async function submitRegistryInstallForm(return false}const body = response.request().postDataJSON() as- { serverName?: string; registryEntryName?: string } | undefined+ | { serverName?: string; registryEntryName?: string }+ | undefinedreturn body?.serverName === serverName && body?.registryEntryName === registryEntryName},{ timeout: 30_000 }@@ -1427,7 +1429,8 @@ test.describe('H. Control-UI Smoke Tests', () => {return false}const body = r.request().postDataJSON() as- { serverName?: string; registryEntryName?: string } | undefined+ | { serverName?: string; registryEntryName?: string }+ | undefinedreturn body?.serverName === serverName && body?.registryEntryName === 'mcp-filesystem'},{ timeout: 30_000 }diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex 6a11d5f01..a7466dcb2 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.654",+ "version": "0.1.655","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.654",+ "version": "0.1.655","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.jsonindex 956a113f2..349558be4 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.654",+ "version": "0.1.655","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",