Skip to content

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

TypeScript

feat(control-ui): refine connector secret key editing

M56441172e9f1
diff --git a/control-ui/app/globals.css b/control-ui/app/globals.css
index 89ff7397c..d8bfae06c 100644
--- a/control-ui/app/globals.css
+++ b/control-ui/app/globals.css
@@ -351,6 +351,154 @@ body.cu-body {
gap: var(--cu-space-3);
}
+.cu-connector-credentials-status {
+ display: grid;
+ gap: var(--cu-space-3);
+ width: 100%;
+}
+
+.cu-connector-credentials-status:empty {
+ display: none;
+}
+
+.cu-existing-secret-control {
+ --cu-existing-secret-control-height: 2.85rem;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: flex-end;
+ gap: var(--cu-space-2);
+}
+
+.cu-existing-secret-control > .cu-field {
+ flex: 1 1 40%;
+ min-width: 0;
+ margin-bottom: 0;
+}
+
+.cu-existing-secret-control > .cu-btn {
+ flex: 0 0 auto;
+ min-height: var(--cu-existing-secret-control-height);
+}
+
+.cu-existing-secret-control > .cu-btn--icon {
+ width: var(--cu-existing-secret-control-height);
+}
+
+.cu-existing-secret-control .cu-selection-dropdown__button {
+ min-height: var(--cu-existing-secret-control-height);
+}
+
+.cu-secret-assignment-form {
+ width: 100%;
+ max-width: none;
+ min-width: 0;
+}
+
+.cu-assigned-secret-row {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: end;
+ gap: var(--cu-space-4);
+ width: 100%;
+}
+
+.cu-assigned-secret-field {
+ display: grid;
+ gap: var(--cu-space-2);
+ min-width: 0;
+ flex: 1 1 50%;
+}
+
+.cu-assigned-secret-field__label {
+ color: var(--cu-text-soft);
+ font-size: var(--cu-font-size-xs);
+ font-weight: var(--cu-font-weight-semibold);
+ text-transform: uppercase;
+}
+
+.cu-assigned-secret-field__value {
+ display: flex;
+ align-items: center;
+ min-height: calc(var(--cu-space-7) + var(--cu-space-3));
+ padding: var(--cu-space-2) var(--cu-space-3);
+ border: 1px solid var(--cu-border-subtle);
+ border-radius: var(--cu-radius-sm);
+ background: var(--cu-bg-elevated);
+ color: var(--cu-text);
+ font-size: var(--cu-font-size-lg);
+ overflow-wrap: anywhere;
+}
+
+.cu-assigned-secret-row > .cu-btn {
+ margin-left: auto;
+}
+
+.cu-secret-keys {
+ min-width: 0;
+ display: grid;
+ gap: var(--cu-space-3);
+ padding: var(--cu-space-4);
+ border: 1px solid var(--cu-border);
+ border-radius: var(--cu-radius-sm);
+ background: var(--cu-bg-elevated);
+ grid-template-columns: minmax(0, 1fr);
+}
+
+.cu-secret-keys .cu-table-panel__head {
+ padding: 0;
+ background: transparent;
+ border: 0;
+}
+
+.cu-secret-keys > .cu-table-wrap {
+ min-width: 0;
+ box-sizing: border-box;
+}
+
+.cu-credential-key-table {
+ table-layout: fixed;
+ min-width: 0;
+}
+
+.cu-body .cu-credential-key-table thead th {
+ white-space: normal;
+ overflow-wrap: anywhere;
+}
+
+.cu-credential-key-table .cu-table__cell-actions {
+ width: calc(var(--cu-space-7) * 3);
+ min-width: 0;
+ max-width: none;
+ text-align: right;
+}
+
+.cu-credential-key-table td:not(:last-child) {
+ overflow-wrap: anywhere;
+}
+
+.cu-credential-key-table td code + code {
+ margin-left: var(--cu-space-2);
+}
+
+.cu-secret-keys__note {
+ margin: 0;
+ color: var(--cu-text-soft);
+ font-size: var(--cu-font-size-sm);
+}
+
+.cu-connector-edit-form .cu-form-section {
+ min-width: 0;
+ align-content: start;
+ justify-items: start;
+}
+
+.cu-connector-edit-form .cu-form-section > .cu-form-section__header,
+.cu-connector-edit-form .cu-form-section > .cu-table-wrap {
+ width: 100%;
+ box-sizing: border-box;
+ min-width: 0;
+}
+
.cu-form-grid {
display: grid;
gap: var(--cu-space-3);
diff --git a/control-ui/app/mcp-servers/[name]/edit/page.tsx b/control-ui/app/mcp-servers/[name]/edit/page.tsx
index 5457b184f..9bd292df2 100644
--- a/control-ui/app/mcp-servers/[name]/edit/page.tsx
+++ b/control-ui/app/mcp-servers/[name]/edit/page.tsx
@@ -408,7 +408,7 @@ export default function EditMcpServerPage() {
)
) : server ? (
activeTab === 'credentials' ? (
- <div className="cu-connector-edit-form">
+ <div className="cu-connector-edit-form cu-connector-edit-content">
{changeSource ? (
<ChangeConnectorSecret
serverName={name}
@@ -477,18 +477,31 @@ export default function EditMcpServerPage() {
{!credentialReferenceChangeUnavailable(server) ? (
<FormSection
title="Assigned Secret"
- description="Reuse stored credentials by choosing another Secret or changing its key mappings. Rotate credentials below to update values in the current shared Secret."
+ description="Choose a Secret and its key mappings. Rotate individual values below."
>
- <p>
- Current Secret: <code>{envSecret.name}</code>
- </p>
- <Button
- id={CHANGE_SECRET_TRIGGER_ID}
- disabled={attachBusy || saving || egressDirty}
- onClick={() => setChangeSource(server)}
- >
- Change assigned Secret
- </Button>
+ <div className="cu-assigned-secret-row">
+ <div
+ className="cu-assigned-secret-field"
+ role="group"
+ aria-labelledby="connector-current-secret-label"
+ >
+ <span
+ className="cu-assigned-secret-field__label"
+ id="connector-current-secret-label"
+ >
+ Current Secret
+ </span>
+ <div className="cu-assigned-secret-field__value">{envSecret.name}</div>
+ </div>
+ <Button
+ id={CHANGE_SECRET_TRIGGER_ID}
+ variant="primary"
+ disabled={attachBusy || saving || egressDirty}
+ onClick={() => setChangeSource(server)}
+ >
+ Change assigned Secret
+ </Button>
+ </div>
{egressDirty ? (
<p role="status">
Save or discard your egress changes before changing the assigned Secret.
@@ -497,6 +510,7 @@ export default function EditMcpServerPage() {
</FormSection>
) : null}
<UpdateConnectorCredentials
+ perKeyEditing
onBusyChange={setAttachBusy}
serverName={name}
envSecret={envSecret}
diff --git a/control-ui/app/secrets/connector/[name]/edit/page.tsx b/control-ui/app/secrets/connector/[name]/edit/page.tsx
index 856308617..13297d7ce 100644
--- a/control-ui/app/secrets/connector/[name]/edit/page.tsx
+++ b/control-ui/app/secrets/connector/[name]/edit/page.tsx
@@ -2,28 +2,23 @@
import React, { Suspense, useEffect, useMemo, useState } from 'react'
import { useParams, useRouter, useSearchParams } from 'next/navigation'
-import { DataTable, TableViewport } from '@clerum/frontend-components'
import { AuthGate } from '@components/AuthGate'
import { BodyLoadingSkeleton } from '@components/BodyLoadingSkeleton'
+import { ConnectorSecretKeys } from '@components/ConnectorSecretKeys'
import { CreateFlowPanel } from '@components/CreateFlowPanel'
import { CreatePageHeader } from '@components/CreatePageHeader'
import { DashboardLayout } from '@components/DashboardLayout'
import { IconKey } from '@components/Sidebar/icons'
import { TabBar } from '@components/TabBar'
-import { useToast } from '@components/Toast'
import { UpdateConnectorCredentials } from '@components/UpdateConnectorCredentials'
import {
nonCanonicalEnvSecretName,
resolveEnvSecret,
resolveRegistryCredentialSource,
} from '@components/UpdateConnectorCredentials/mcpServerCredentialResolvers'
-import {
- isRecipeOwned,
- resolveCredentialSurface,
-} from '@components/UpdateConnectorCredentials/resolveCredentialSurface'
-import { Button, Field, FormSection, TextInput } from '@components/ui'
+import { isRecipeOwned } from '@components/UpdateConnectorCredentials/resolveCredentialSurface'
import { CONTROL_ROUTES } from '@constants/routes'
-import { getMcpServers, listMcpSecrets, updateMcpSecret } from '@lib/api'
+import { getMcpServers, listMcpSecrets } from '@lib/api'
import type { McpServerResource } from '@lib/api'
function serverRefersToSecret(server: McpServerResource, secretName: string): boolean {
@@ -61,12 +56,7 @@ function EditConnectorSecretContent() {
const [secretSummary, setSecretSummary] = useState<
{ name: string; keys: string[] } | null | undefined
>(undefined)
- const [keyValues, setKeyValues] = useState<Record<string, string>>({})
- const [extraKeys, setExtraKeys] = useState<Array<{ id: number; key: string; value: string }>>([])
- const extraKeyId = React.useRef(0)
- const [saving, setSaving] = useState(false)
- const [saveError, setSaveError] = useState('')
- const { showToast } = useToast()
+ const [secretLoadError, setSecretLoadError] = useState('')
useEffect(() => {
if (!secretName) {
@@ -95,8 +85,9 @@ function EditConnectorSecretContent() {
const match = (result.items ?? []).find(item => item.name === secretName)
setSecretSummary(match ? { name: match.name, keys: match.keys } : null)
})
- .catch(() => {
- if (!cancelled) setSecretSummary(null)
+ .catch(error => {
+ if (!cancelled)
+ setSecretLoadError(error instanceof Error ? error.message : 'Failed to load Secret keys')
})
return () => {
cancelled = true
@@ -163,64 +154,6 @@ function EditConnectorSecretContent() {
router.push(CONTROL_ROUTES.secrets.connector)
}
- function addExtraKey() {
- extraKeyId.current += 1
- setExtraKeys(current => [...current, { id: extraKeyId.current, key: '', value: '' }])
- }
-
- function updateExtraKey(id: number, field: 'key' | 'value', value: string) {
- setExtraKeys(current => current.map(row => (row.id === id ? { ...row, [field]: value } : row)))
- }
-
- function removeExtraKey(id: number) {
- setExtraKeys(current => current.filter(row => row.id !== id))
- }
-
- const SECRET_KEY_NAME_PATTERN = /^[A-Za-z0-9._-]+$/
-
- function collectRotationData(): Record<string, string> | string {
- const data = Object.fromEntries(
- Object.entries(keyValues).filter(([key, value]) => key.length > 0 && value.trim().length > 0)
- )
- const existingKeys = new Set(secretSummary?.keys ?? [])
- for (const row of extraKeys) {
- const name = row.key.trim()
- const hasName = name.length > 0
- const hasValue = row.value.trim().length > 0
- if (!hasName && !hasValue) continue
- if (!hasName) return 'Name the new key before saving.'
- if (!hasValue) return `Fill in a value for the new key ${name}.`
- if (!SECRET_KEY_NAME_PATTERN.test(name))
- return `Key ${name} is invalid: use letters, numbers, dots, underscores, or hyphens.`
- if (existingKeys.has(name) || name in data)
- return `Key ${name} already exists on this Secret.`
- data[name] = row.value
- }
- if (Object.keys(data).length === 0) {
- return 'Fill in at least one key to rotate its value.'
- }
- return data
- }
-
- async function saveDirectRotation() {
- const data = collectRotationData()
- if (typeof data === 'string') {
- setSaveError(data)
- return
- }
- setSaving(true)
- setSaveError('')
- try {
- await updateMcpSecret(secretName, data)
- showToast(`Secret ${secretName} updated.`, { tone: 'success' })
- backToList()
- } catch (e) {
- setSaveError(e instanceof Error ? e.message : 'Failed to update secret')
- } finally {
- setSaving(false)
- }
- }
-
return (
<AuthGate>
<DashboardLayout isDetailPage>
@@ -229,13 +162,13 @@ function EditConnectorSecretContent() {
<CreatePageHeader
icon={<IconKey />}
title={`Edit connector secret${secretName ? `: ${secretName}` : ''}`}
- subtitle="Rotate the values stored in this Secret. Values are write-only; only the keys you fill in are replaced."
+ subtitle="Manage stored keys and rotate individual values."
backLabel="Back to secrets"
onBack={backToList}
/>
}
>
- <div className="cu-connector-edit-form">
+ <div className="cu-connector-edit-form cu-connector-edit-content">
{loadError ? (
<div className="cu-banner cu-banner--error" role="alert">
{loadError}
@@ -257,180 +190,83 @@ function EditConnectorSecretContent() {
</div>
) : null}
- {servers === null ? (
- <p className="cu-muted" role="status">
- Loading attached connectors…
- </p>
- ) : attachedServers.length === 0 &&
- !loadError &&
- !identityError &&
- !serverQueryError &&
- !unknownServerError ? (
- secretSummary === undefined ? (
+ {secretLoadError ? (
+ <div className="cu-banner cu-banner--error" role="alert">
+ {secretLoadError}
+ </div>
+ ) : null}
+ {!loadError &&
+ !secretLoadError &&
+ !identityError &&
+ !serverQueryError &&
+ !unknownServerError ? (
+ servers === null || secretSummary === undefined ? (
<p className="cu-muted" role="status">
Loading connector secret…
</p>
- ) : secretSummary === null ? (
- <div className="cu-banner cu-banner--error">
- No connector secret named <code>{secretName || '(unnamed)'}</code> exists. It may
- have been deleted.
- </div>
) : (
- <FormSection
- title="Rotate stored values"
- description={
- <>
- No connector references this Secret yet, so changes take effect for the next
- connector that attaches it. Values are write-only — only the keys you fill in
- are replaced or added; every other key already on the Secret is kept.
- </>
- }
- >
- <TableViewport className="cu-table-wrap">
- <DataTable className="eft-table cu-table">
- <thead>
- <tr>
- <th>Secret key</th>
- </tr>
- </thead>
- <tbody>
- {secretSummary.keys.length === 0 ? (
- <tr>
- <td>
- <span className="cu-muted">No keys yet.</span>
- </td>
- </tr>
- ) : (
- secretSummary.keys.map(key => (
- <tr key={key}>
- <td>
- <code>{key}</code>
- </td>
- </tr>
- ))
- )}
- </tbody>
- </DataTable>
- </TableViewport>
-
- <form
- className="cu-connector-credentials-form cu-form-stack"
- onSubmit={event => {
- event.preventDefault()
- void saveDirectRotation()
- }}
- noValidate
- >
- {secretSummary.keys.map(key => (
- <Field key={key} label={key} htmlFor={`secret-key-${key}`}>
- <TextInput
- id={`secret-key-${key}`}
- type="password"
- name={key}
- autoComplete="new-password"
- placeholder="Leave blank to keep current value"
- value={keyValues[key] ?? ''}
- onChange={e =>
- setKeyValues(current => ({ ...current, [key]: e.target.value }))
- }
- disabled={saving}
- />
- </Field>
- ))}
-
- {extraKeys.map(row => (
- <div className="cu-form-inline" key={row.id}>
- <TextInput
- monospace
- aria-label={`New key name ${row.id}`}
- value={row.key}
- onChange={e => updateExtraKey(row.id, 'key', e.target.value)}
- placeholder="NEW_API_KEY"
- disabled={saving}
- />
- <TextInput
- monospace
- aria-label={`New key value ${row.id}`}
- value={row.value}
- onChange={e => updateExtraKey(row.id, 'value', e.target.value)}
- placeholder="secret value"
- type="password"
- autoComplete="new-password"
- disabled={saving}
- />
- <Button
- type="button"
- onClick={() => removeExtraKey(row.id)}
- disabled={saving}
- >
- Remove
- </Button>
- </div>
- ))}
-
- <div>
- <Button type="button" onClick={addExtraKey} disabled={saving}>
- Add key
- </Button>
- </div>
-
- {saveError ? (
- <div className="cu-banner cu-banner--error" role="alert">
- {saveError}
- </div>
- ) : null}
-
- <div className="cu-create-actions">
- <Button type="button" onClick={backToList} disabled={saving}>
- Cancel
- </Button>
- <Button type="submit" variant="primary" disabled={saving}>
- {saving ? 'Saving…' : 'Save'}
- </Button>
+ <>
+ {attachedServers.length > 1 ? (
+ <TabBar
+ activeValue={selectedName}
+ ariaLabel="Connectors referencing this secret"
+ className="cu-tabs--flush"
+ options={attachedServers.map(server => {
+ const name = String(server.metadata?.name ?? '')
+ return {
+ value: name,
+ label: name,
+ href: CONTROL_ROUTES.secrets.editConnector(secretName, { server: name }),
+ }
+ })}
+ />
+ ) : null}
+ {secretSummary ? (
+ <ConnectorSecretKeys
+ key={`${secretName}:${selectedName}`}
+ secretName={secretName}
+ keys={secretSummary.keys}
+ serverName={selectedName || undefined}
+ envSecret={selectedEnvSecret}
+ server={selected}
+ referencingConnectors={attachedServers.map(server =>
+ String(server.metadata?.name ?? '')
+ )}
+ onKeysChange={keys => setSecretSummary({ name: secretName, keys })}
+ onMissing={() => setSecretSummary(null)}
+ onServerChange={updated =>
+ setServers(
+ current =>
+ current?.map(server =>
+ server.metadata?.name === updated.metadata?.name ? updated : server
+ ) ?? []
+ )
+ }
+ />
+ ) : selected && secretMatches ? (
+ <UpdateConnectorCredentials
+ key={selectedName}
+ serverName={selectedName}
+ envSecret={selectedEnvSecret}
+ surface={
+ isRecipeOwned(selected.spec as { managed?: boolean } | undefined)
+ ? 'recipe-owned'
+ : 'set'
+ }
+ recipeOwned={isRecipeOwned(
+ selected.spec as { managed?: boolean } | undefined
+ )}
+ registryCredentialSource={resolveRegistryCredentialSource(selected.metadata)}
+ />
+ ) : (
+ <div className="cu-banner cu-banner--error" role="alert">
+ No connector secret named <code>{secretName || '(unnamed)'}</code> exists. It
+ may have been deleted.
</div>
- </form>
- </FormSection>
+ )}
+ </>
)
- ) : (
- <>
- {attachedServers.length > 1 ? (
- <TabBar
- activeValue={selectedName}
- ariaLabel="Connectors referencing this secret"
- className="cu-tabs--flush"
- options={attachedServers.map(server => {
- const name = String(server.metadata?.name ?? '')
- return {
- value: name,
- label: name,
- href: CONTROL_ROUTES.secrets.editConnector(secretName, { server: name }),
- }
- })}
- />
- ) : null}
-
- {selected && !secretMatches ? (
- <div className="cu-banner cu-banner--error" role="alert">
- This connector does not reference Secret <code>{secretName}</code>. Choose a
- connector that does.
- </div>
- ) : null}
-
- {selected && secretMatches ? (
- <UpdateConnectorCredentials
- key={selectedName}
- serverName={selectedName}
- envSecret={selectedEnvSecret}
- surface={resolveCredentialSurface(
- selected.status?.conditions,
- selected.spec as { managed?: boolean } | undefined
- )}
- recipeOwned={isRecipeOwned(selected.spec as { managed?: boolean } | undefined)}
- registryCredentialSource={resolveRegistryCredentialSource(selected.metadata)}
- />
- ) : null}
- </>
- )}
+ ) : null}
</div>
</CreateFlowPanel>
</DashboardLayout>
diff --git a/control-ui/components/ChangeConnectorSecret/index.tsx b/control-ui/components/ChangeConnectorSecret/index.tsx
index cb486af9e..0e49d94a6 100644
--- a/control-ui/components/ChangeConnectorSecret/index.tsx
+++ b/control-ui/components/ChangeConnectorSecret/index.tsx
@@ -130,7 +130,7 @@ export function ChangeConnectorSecret({
description="Choose reusable credentials and map stored keys. This changes only this connector’s assignment."
>
{confirmDialog}
- <form className="cu-connector-credentials-form cu-form-stack--wide" onSubmit={submit}>
+ <form className="cu-connector-credentials-form cu-secret-assignment-form" onSubmit={submit}>
<p>
Currently assigned: <code>{reference.name}</code>
</p>
diff --git a/control-ui/components/ConnectorSecretKeys/index.tsx b/control-ui/components/ConnectorSecretKeys/index.tsx
new file mode 100644
index 000000000..a21d0de6d
--- /dev/null
+++ b/control-ui/components/ConnectorSecretKeys/index.tsx
@@ -0,0 +1,425 @@
+'use client'
+
+import React, { useRef, useState } from 'react'
+import {
+ DataTable,
+ SimpleEditDialog,
+ SingleValueEditDialog,
+ TableViewport,
+} from '@clerum/frontend-components'
+import { TablePanelHeader } from '@components/TablePanelHeader'
+import { useToast } from '@components/Toast'
+import { resolveEnvSecret } from '@components/UpdateConnectorCredentials/mcpServerCredentialResolvers'
+import { useRolloutWait } from '@components/UpdateConnectorCredentials/useRolloutWait'
+import { Button, Field, TextInput } from '@components/ui'
+import { CLOCK_SKEW_TOLERANCE_MS } from '@constants/connectorCredentials'
+import { getMcpServer, listMcpSecrets, updateMcpSecret } from '@lib/api'
+import {
+ changeConnectorSecretReference,
+ credentialReferenceChangeUnavailable,
+ invalidSecretKeyNameReason,
+ suggestedCredentialEnvVar,
+ validateCredentialAttach,
+} from '@lib/connectorCredentials'
+import type { ConnectorSecretKeysProps } from './types'
+
+/** Stored Secret keys belong to the Secrets page; connector mappings only
+ * supply context. Never use a connector's mapping as the stored-key inventory. */
+export function ConnectorSecretKeys({
+ secretName,
+ keys,
+ serverName,
+ envSecret,
+ server,
+ referencingConnectors,
+ onKeysChange,
+ onMissing,
+ onServerChange,
+}: ConnectorSecretKeysProps) {
+ const { showToast } = useToast()
+ const [rotateKey, setRotateKey] = useState<string | null>(null)
+ const [adding, setAdding] = useState(false)
+ const [keyDraft, setKeyDraft] = useState('')
+ const [valueDraft, setValueDraft] = useState('')
+ const [envDraft, setEnvDraft] = useState('')
+ const [envEdited, setEnvEdited] = useState(false)
+ const [storedKey, setStoredKey] = useState<string | null>(null)
+ const [partialSaveNotice, setPartialSaveNotice] = useState('')
+ const [error, setError] = useState('')
+ const [pending, setPending] = useState(false)
+ const writeLock = useRef(false)
+ const [cutoff, setCutoff] = useState<string | null>(null)
+ const [rolloutIdentity, setRolloutIdentity] = useState<{ uid?: string; generation?: number }>({})
+ const [otherAffected, setOtherAffected] = useState<string[]>([])
+ const { phase, phaseMessage, setPhase, setPhaseMessage } = useRolloutWait({
+ serverName: serverName ?? '',
+ cutoff,
+ expectedUid: rolloutIdentity.uid,
+ expectedGeneration: rolloutIdentity.generation,
+ })
+ const busy = pending || phase === 'rotating'
+ const keyProblem = keyDraft ? invalidSecretKeyNameReason(keyDraft) : undefined
+ const duplicate = keys.includes(keyDraft.trim())
+ const mappingUnavailable = server ? credentialReferenceChangeUnavailable(server) : undefined
+ const mapsToConnector = Boolean(server && serverName && !mappingUnavailable)
+ const mappingRows = [
+ ...(envSecret?.keys ?? []).map((mapping, index) => ({
+ ...mapping,
+ id: `existing-${index}`,
+ value: '',
+ })),
+ { id: 'new', secretKey: keyDraft.trim(), envVar: envDraft.trim(), value: valueDraft },
+ ]
+ const envProblem =
+ mapsToConnector && envDraft
+ ? validateCredentialAttach('use-existing', secretName, mappingRows, server!, {
+ name: secretName,
+ keys,
+ })
+ : undefined
+ const restartNote = referencingConnectors.length
+ ? `Connectors sharing this Secret may restart: ${referencingConnectors.join(', ')}.`
+ : 'No connector currently uses this Secret.'
+
+ function closeEditor() {
+ if (writeLock.current) return
+ setRotateKey(null)
+ setAdding(false)
+ setKeyDraft('')
+ setValueDraft('')
+ setEnvDraft('')
+ setEnvEdited(false)
+ setStoredKey(null)
+ setError('')
+ }
+
+ async function save(key: string, value: string, add: boolean) {
+ if (writeLock.current || phase === 'rotating' || (!value.trim() && storedKey !== key)) return
+ if (add && (invalidSecretKeyNameReason(key) || (keys.includes(key) && storedKey !== key)))
+ return
+ writeLock.current = true
+ setPending(true)
+ setError('')
+ let keyPersisted = add && storedKey === key
+ try {
+ let selectedSecret
+ if (add) {
+ // Recheck the stored inventory, including unmapped keys, before an add.
+ // The merge endpoint would otherwise replace an existing key's value.
+ const latest = (await listMcpSecrets()).items.find(item => item.name === secretName)
+ if (!latest) {
+ onMissing()
+ return
+ }
+ onKeysChange(latest.keys)
+ selectedSecret = latest
+ if (latest.keys.includes(key) && !keyPersisted) {
+ setError(`Key "${key}" already exists. Rotate its value instead.`)
+ return
+ }
+ }
+ let currentServer
+ let rows = mappingRows
+ if (add && mapsToConnector) {
+ currentServer = await getMcpServer(serverName!)
+ const currentReference = resolveEnvSecret(currentServer.spec)
+ if (
+ !server?.metadata?.uid ||
+ currentServer.metadata?.uid !== server.metadata.uid ||
+ currentReference?.name !== secretName
+ ) {
+ throw new Error('The connector changed. Refresh before adding its environment variable.')
+ }
+ const unavailable = credentialReferenceChangeUnavailable(currentServer)
+ if (unavailable) throw new Error(unavailable)
+ rows = [
+ ...currentReference.keys.map((mapping, index) => ({
+ ...mapping,
+ id: `existing-${index}`,
+ value: '',
+ })),
+ { id: 'new', secretKey: key, envVar: envDraft.trim(), value },
+ ]
+ const problem = validateCredentialAttach(
+ 'use-existing',
+ secretName,
+ rows,
+ currentServer,
+ selectedSecret
+ )
+ if (problem) throw new Error(problem.message)
+ }
+ const startedAt = new Date(Date.now() - CLOCK_SKEW_TOLERANCE_MS).toISOString()
+ // Object.fromEntries preserves Kubernetes-valid names such as __proto__.
+ if (!keyPersisted) {
+ const result = await updateMcpSecret(secretName, Object.fromEntries([[key, value]]))
+ onKeysChange(result.keys)
+ setOtherAffected(result.affectedConnectors.filter(name => name !== serverName))
+ if (add) {
+ keyPersisted = true
+ setStoredKey(key)
+ setValueDraft('')
+ selectedSecret = { ...selectedSecret, name: secretName, keys: result.keys }
+ }
+ }
+ if (add && currentServer) {
+ const assigned = await changeConnectorSecretReference({
+ serverName: serverName!,
+ server: currentServer,
+ selection: {
+ secret: selectedSecret,
+ rows: rows.map(row => ({ ...row, value: '' })),
+ ready: true,
+ },
+ })
+ onServerChange(assigned.server)
+ setRolloutIdentity({
+ uid: assigned.server.metadata?.uid,
+ generation: assigned.server.metadata?.generation,
+ })
+ setCutoff(assigned.cutoff)
+ setPhase('rotating')
+ }
+ setRotateKey(null)
+ setAdding(false)
+ setKeyDraft('')
+ setValueDraft('')
+ setEnvDraft('')
+ setEnvEdited(false)
+ setStoredKey(null)
+ setPartialSaveNotice('')
+ setPhaseMessage('')
+ const mappedToSelected = envSecret?.keys.some(mapping => mapping.secretKey === key)
+ if (!add && serverName && mappedToSelected) {
+ setCutoff(startedAt)
+ setRolloutIdentity({})
+ setPhase('rotating')
+ } else if (!add || !currentServer) {
+ setPhase('idle')
+ setCutoff(null)
+ }
+ showToast(add ? `Key "${key}" added.` : `Value for "${key}" saved.`, { tone: 'success' })
+ } catch (cause) {
+ if (keyPersisted) {
+ const message = `Key "${key}" is stored, but its environment mapping could not be confirmed. ${cause instanceof Error ? cause.message : 'Retry the mapping or refresh to review the connector.'}`
+ setError(message)
+ setPartialSaveNotice(message)
+ } else if ((cause as { status?: number })?.status === 404) {
+ onMissing()
+ } else {
+ setError(cause instanceof Error ? cause.message : 'Could not save the Secret value.')
+ }
+ } finally {
+ writeLock.current = false
+ setPending(false)
+ }
+ }
+
+ return (
+ <section className="cu-secret-keys" aria-label="Secret keys">
+ <TablePanelHeader
+ title="Secret keys"
+ subtitle="Rotate a key to replace its stored value. Existing values are never displayed."
+ primaryAction={
+ <Button
+ variant="primary"
+ disabled={busy}
+ onClick={() => {
+ setError('')
+ setAdding(true)
+ }}
+ >
+ Add key
+ </Button>
+ }
+ />
+ <TableViewport className="cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-credential-key-table">
+ <thead>
+ <tr>
+ <th>Secret key</th>
+ <th>Environment variable{serverName ? ` · ${serverName}` : ''}</th>
+ <th className="cu-table__cell-actions">Actions</th>
+ </tr>
+ </thead>
+ <tbody>
+ {keys.length === 0 ? (
+ <tr>
+ <td colSpan={3} className="cu-empty">
+ No keys yet. Add a key to store a credential.
+ </td>
+ </tr>
+ ) : (
+ [...keys]
+ .sort((a, b) => a.localeCompare(b))
+ .map(key => {
+ const mappings =
+ envSecret?.keys.filter(mapping => mapping.secretKey === key) ?? []
+ return (
+ <tr key={key}>
+ <td>
+ <code>{key}</code>
+ </td>
+ <td>
+ {mappings.length ? (
+ mappings.map(mapping => (
+ <code key={mapping.envVar}>{mapping.envVar}</code>
+ ))
+ ) : (
+ <span className="cu-muted">Not mapped</span>
+ )}
+ </td>
+ <td className="cu-table__cell-actions">
+ <Button
+ size="sm"
+ disabled={busy}
+ aria-label={`Rotate ${key}`}
+ onClick={() => {
+ setError('')
+ setRotateKey(key)
+ }}
+ >
+ Rotate
+ </Button>
+ </td>
+ </tr>
+ )
+ })
+ )}
+ </tbody>
+ </DataTable>
+ </TableViewport>
+ <p className="cu-secret-keys__note">{restartNote}</p>
+ {partialSaveNotice && !adding ? (
+ <div className="cu-banner cu-banner--warning" role="alert">
+ {partialSaveNotice}
+ </div>
+ ) : null}
+ {phase === 'rotating' ? (
+ <div className="cu-banner cu-banner--info" role="status">
+ Value saved. Waiting for {serverName} to restart with the new credential.
+ {phaseMessage ? ` ${phaseMessage}` : ''}
+ </div>
+ ) : null}
+ {phase === 'success' ? (
+ <div className="cu-banner cu-banner--ok" role="status">
+ {serverName} restarted and is serving the new credential.
+ {otherAffected.length
+ ? ` Other connectors roll out separately: ${otherAffected.join(', ')}.`
+ : ''}
+ </div>
+ ) : null}
+ {phase === 'failed' || phase === 'timeout' ? (
+ <div className="cu-banner cu-banner--warning" role="alert">
+ Value saved, but the connector restart could not be verified. {phaseMessage}
+ </div>
+ ) : null}
+
+ <SingleValueEditDialog
+ open={rotateKey !== null}
+ title={`Rotate ${rotateKey ?? 'key'}`}
+ description={`Replace only this key's value. ${restartNote}`}
+ initialValue=""
+ pending={pending}
+ error={error}
+ discardLabel="Cancel"
+ saveLabel="Rotate"
+ onDismiss={closeEditor}
+ onSave={value => {
+ if (rotateKey !== null) void save(rotateKey, value, false)
+ }}
+ renderEditor={({ value, onChange, disabled }) => (
+ <Field label="New value" htmlFor="connector-secret-rotate-value" required>
+ <TextInput
+ id="connector-secret-rotate-value"
+ type="password"
+ autoComplete="new-password"
+ placeholder="Enter new value"
+ value={value}
+ onChange={event => onChange(event.target.value)}
+ disabled={disabled}
+ required
+ pattern=".*\S.*"
+ />
+ </Field>
+ )}
+ />
+ <SimpleEditDialog
+ open={adding}
+ title="Add key"
+ description={
+ mapsToConnector
+ ? `Store a new key and map its environment variable on ${serverName}. ${restartNote}`
+ : 'Store a new key and value in this Secret. Environment variables are assigned when a connector uses it.'
+ }
+ pending={pending}
+ error={error}
+ isDirty={Boolean(keyDraft || valueDraft)}
+ isValid={
+ Boolean(keyDraft.trim() && (valueDraft.trim() || storedKey)) &&
+ !keyProblem &&
+ (!duplicate || storedKey === keyDraft.trim()) &&
+ (!mapsToConnector || (Boolean(envDraft.trim()) && !envProblem))
+ }
+ saveLabel={storedKey ? 'Retry mapping' : 'Add key'}
+ onCancel={closeEditor}
+ onSave={() => void save(keyDraft.trim(), valueDraft, true)}
+ >
+ <Field
+ label="Key name"
+ htmlFor="connector-secret-add-key"
+ required
+ error={keyProblem ?? (duplicate && !storedKey ? 'This key already exists.' : undefined)}
+ >
+ <TextInput
+ id="connector-secret-add-key"
+ monospace
+ placeholder="API_KEY"
+ value={keyDraft}
+ onChange={event => {
+ setKeyDraft(event.target.value)
+ if (!envEdited) setEnvDraft(suggestedCredentialEnvVar(event.target.value))
+ }}
+ disabled={pending || storedKey !== null}
+ required
+ />
+ </Field>
+ {mapsToConnector ? (
+ <Field
+ label="Environment variable"
+ htmlFor="connector-secret-add-env"
+ required
+ error={envProblem?.field === 'new-env' ? envProblem.message : undefined}
+ >
+ <TextInput
+ id="connector-secret-add-env"
+ monospace
+ placeholder="API_KEY"
+ value={envDraft}
+ onChange={event => {
+ setEnvDraft(event.target.value)
+ setEnvEdited(true)
+ }}
+ disabled={pending}
+ required
+ />
+ </Field>
+ ) : mappingUnavailable ? (
+ <p className="cu-muted">{mappingUnavailable}</p>
+ ) : null}
+ <Field label="Value" htmlFor="connector-secret-add-value" required>
+ <TextInput
+ id="connector-secret-add-value"
+ type="password"
+ autoComplete="new-password"
+ placeholder="Enter value"
+ value={valueDraft}
+ onChange={event => setValueDraft(event.target.value)}
+ disabled={pending || storedKey !== null}
+ required={storedKey === null}
+ />
+ </Field>
+ </SimpleEditDialog>
+ </section>
+ )
+}
diff --git a/control-ui/components/ConnectorSecretKeys/types.ts b/control-ui/components/ConnectorSecretKeys/types.ts
new file mode 100644
index 000000000..10ddc0244
--- /dev/null
+++ b/control-ui/components/ConnectorSecretKeys/types.ts
@@ -0,0 +1,13 @@
+import type { EnvSecret, McpServerResource } from '@lib/api'
+
+export type ConnectorSecretKeysProps = {
+ secretName: string
+ keys: string[]
+ serverName?: string
+ envSecret?: EnvSecret
+ server?: McpServerResource
+ referencingConnectors: string[]
+ onKeysChange: (keys: string[]) => void
+ onMissing: () => void
+ onServerChange: (server: McpServerResource) => void
+}
diff --git a/control-ui/components/ExistingConnectorSecretFields/index.tsx b/control-ui/components/ExistingConnectorSecretFields/index.tsx
index 6bdfec509..ca1adbf9e 100644
--- a/control-ui/components/ExistingConnectorSecretFields/index.tsx
+++ b/control-ui/components/ExistingConnectorSecretFields/index.tsx
@@ -3,6 +3,7 @@
import { useEffect, useId, useRef, useState } from 'react'
import { useRouter } from 'next/navigation'
import { SelectionDropdown } from '@components/SelectionDropdown'
+import { IconRefresh } from '@components/icons'
import { Button, Field, SelectInput, TextInput } from '@components/ui'
import { CONTROL_ROUTES } from '@constants/routes'
import { listMcpSecrets } from '@lib/api'
@@ -91,21 +92,39 @@ export function ExistingConnectorSecretFields({
<p className="cu-muted">
Reuse a Secret from Secrets → Connectors. Stored values stay unchanged and are never shown.
</p>
- <Field label="Existing Secret" htmlFor={`${prefix}-secret`} required>
- <SelectionDropdown
- id={`${prefix}-secret`}
- ariaLabel="Existing Secret"
- placeholder="Choose a Secret"
- multiple={false}
- searchable={false}
- showSelectedChips={false}
- disabled={state !== 'ready'}
- invalid={invalid?.field === 'secret'}
- options={secrets.map(secret => ({ label: secret.name, value: secret.name }))}
- value={name ? [name] : []}
- onChange={values => selectSecret(values[0] ?? '')}
- />
- </Field>
+ <div className="cu-existing-secret-control">
+ <Field label="Existing Secret" htmlFor={`${prefix}-secret`} required>
+ <SelectionDropdown
+ id={`${prefix}-secret`}
+ ariaLabel="Existing Secret"
+ placeholder="Choose a Secret"
+ multiple={false}
+ searchable={false}
+ showSelectedChips={false}
+ disabled={state !== 'ready'}
+ invalid={invalid?.field === 'secret'}
+ options={secrets.map(secret => ({ label: secret.name, value: secret.name }))}
+ value={name ? [name] : []}
+ onChange={values => selectSecret(values[0] ?? '')}
+ />
+ </Field>
+ <Button
+ icon
+ aria-label="Refresh secrets"
+ title="Refresh secrets"
+ onClick={() => setRefresh(value => value + 1)}
+ disabled={disabled || state === 'loading'}
+ >
+ <IconRefresh width={16} height={16} />
+ </Button>
+ <Button
+ variant="ghost"
+ disabled={disabled}
+ onClick={() => router.push(CONTROL_ROUTES.secrets.connector)}
+ >
+ Manage connector Secrets
+ </Button>
+ </div>
{state === 'loading' ? <p role="status">Loading Secrets…</p> : null}
{state === 'error' ? (
<div role="alert">
@@ -119,18 +138,6 @@ export function ExistingConnectorSecretFields({
list.
</p>
) : null}
- <div className="cu-create-actions">
- <Button onClick={() => setRefresh(value => value + 1)} disabled={state === 'loading'}>
- Refresh Secrets
- </Button>
- <Button
- variant="ghost"
- disabled={disabled}
- onClick={() => router.push(CONTROL_ROUTES.secrets.connector)}
- >
- Manage connector Secrets
- </Button>
- </div>
{selected && !selected.keys.length ? (
<p role="alert">
This Secret has no stored keys. Add keys in Secrets → Connectors, then refresh.
diff --git a/control-ui/components/UpdateConnectorCredentials/index.tsx b/control-ui/components/UpdateConnectorCredentials/index.tsx
index 563752626..b9eade79b 100644
--- a/control-ui/components/UpdateConnectorCredentials/index.tsx
+++ b/control-ui/components/UpdateConnectorCredentials/index.tsx
@@ -1,7 +1,7 @@
'use client'
import React, { useEffect, useRef, useState } from 'react'
-import { DataTable, TableViewport } from '@clerum/frontend-components'
+import { DataTable, SimpleEditDialog, TableViewport } from '@clerum/frontend-components'
import { useConfirmDialog } from '@components/ConfirmDialog'
import { useToast } from '@components/Toast'
import { Button, Field, FormSection, TextInput } from '@components/ui'
@@ -77,6 +77,7 @@ export function UpdateConnectorCredentials({
surface = 'rotate',
recipeOwned = false,
registryCredentialSource,
+ perKeyEditing = false,
onBusyChange,
}: UpdateConnectorCredentialsProps) {
const { showToast } = useToast()
@@ -86,6 +87,8 @@ export function UpdateConnectorCredentials({
busyCallback.current = onBusyChange
const [confirming, setConfirming] = useState(false)
const confirmLock = useRef(false)
+ const writeLock = useRef(false)
+ const [editingKey, setEditingKey] = useState<string | null>(null)
const [draft, setDraft] = useState<CredentialMap>(emptyCredentialMap)
const [validationError, setValidationError] = useState('')
// The secretKeys the last submit rejected. Drives per-input `aria-invalid` /
@@ -172,9 +175,11 @@ export function UpdateConnectorCredentials({
}, [registryCredentialSource])
useEffect(() => {
- busyCallback.current?.(confirming || phase === 'saving' || phase === 'rotating')
+ busyCallback.current?.(
+ editingKey !== null || confirming || phase === 'saving' || phase === 'rotating'
+ )
return () => busyCallback.current?.(false)
- }, [confirming, phase])
+ }, [editingKey, confirming, phase])
// "The Secret is missing and this screen would have to create it." Two
// sources feed it, and `secretCreated` gates BOTH — not just the `surface`
@@ -233,12 +238,14 @@ export function UpdateConnectorCredentials({
if (target instanceof HTMLElement) target.focus()
}
- async function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
- event.preventDefault()
- if (confirmLock.current || phase === 'saving' || phase === 'rotating') return
+ async function handleSubmit(event?: React.FormEvent<HTMLFormElement>) {
+ event?.preventDefault()
+ if (writeLock.current || confirmLock.current || phase === 'saving' || phase === 'rotating')
+ return
const data = emptyCredentialMap()
for (const key of envSecret!.keys) {
+ if (editingKey !== null && key.secretKey !== editingKey) continue
const value = ownCredentialValue(draft, key.secretKey)
if (typeof value === 'string' && value.trim() !== '') data[key.secretKey] = value
}
@@ -264,23 +271,26 @@ export function UpdateConnectorCredentials({
confirmLock.current = true
setConfirming(true)
- const confirmed = await confirm(
- mode === 'set'
- ? {
- title: 'Set credentials',
- message: `This creates Secret "${envSecret!.name}" and starts ${serverName}.`,
- confirmLabel: 'Set & start',
- }
- : {
- title: 'Rotate credentials',
- message: buildConfirmMessage(envSecret!.name, previewAffected),
- confirmLabel: 'Rotate & restart',
- tone: 'danger',
- }
- )
+ const confirmed =
+ editingKey !== null ||
+ (await confirm(
+ mode === 'set'
+ ? {
+ title: 'Set credentials',
+ message: `This creates Secret "${envSecret!.name}" and starts ${serverName}.`,
+ confirmLabel: 'Set & start',
+ }
+ : {
+ title: 'Rotate credentials',
+ message: buildConfirmMessage(envSecret!.name, previewAffected),
+ confirmLabel: 'Rotate & restart',
+ tone: 'danger',
+ }
+ ))
confirmLock.current = false
setConfirming(false)
if (!confirmed) return
+ writeLock.current = true
// Captured BEFORE the PUT fires — the correlation anchor the poll below
// uses to tell "this rotation's" DeploymentReady from a stale prior one.
@@ -324,6 +334,7 @@ export function UpdateConnectorCredentials({
setRecreateRequired(true)
setSecretCreated(false)
setPhase('idle')
+ setEditingKey(null)
setValidationError('This Secret no longer exists. Enter every key to recreate it.')
return
}
@@ -331,6 +342,7 @@ export function UpdateConnectorCredentials({
}
}
setDraft(emptyCredentialMap())
+ setEditingKey(null)
setRotationCutoff(cutoff)
setPhase('rotating')
} catch (e) {
@@ -339,6 +351,8 @@ export function UpdateConnectorCredentials({
showToast(mode === 'set' ? 'Failed to set credentials.' : 'Failed to rotate credentials.', {
tone: 'error',
})
+ } finally {
+ writeLock.current = false
}
}
@@ -374,6 +388,11 @@ export function UpdateConnectorCredentials({
This connector needs credentials before it can start. Values are write-only — this
screen never shows a stored credential, only key names.
</>
+ ) : perKeyEditing ? (
+ <>
+ Rotate a key to replace its value in Secret <code>{envSecret.name}</code>. Existing
+ values are never displayed.
+ </>
) : (
<>
Rotate values stored in Secret <code>{envSecret.name}</code>. Values are write-only —
@@ -384,12 +403,49 @@ export function UpdateConnectorCredentials({
>
{confirmDialog}
+ <SimpleEditDialog
+ open={editingKey !== null && mode === 'rotate'}
+ title={`Rotate ${editingKey === null ? 'credential' : (ownCredentialValue(credentialLabels, editingKey) ?? editingKey)}`}
+ description={buildConfirmMessage(envSecret.name, previewAffected)}
+ pending={phase === 'saving'}
+ error={validationError || (phase === 'failed' ? phaseMessage : undefined)}
+ isDirty={editingKey !== null && Boolean(ownCredentialValue(draft, editingKey))}
+ isValid={editingKey !== null && Boolean(ownCredentialValue(draft, editingKey)?.trim())}
+ saveLabel="Rotate"
+ onCancel={() => {
+ if (writeLock.current) return
+ setEditingKey(null)
+ setDraft(emptyCredentialMap())
+ setValidationError('')
+ resetToIdle()
+ }}
+ onSave={() => void handleSubmit()}
+ >
+ {editingKey !== null ? (
+ <Field label="New value" htmlFor={inputId(editingKey)} required>
+ <TextInput
+ id={inputId(editingKey)}
+ type="password"
+ autoComplete="new-password"
+ placeholder="Enter new value"
+ value={ownCredentialValue(draft, editingKey) ?? ''}
+ onChange={event => updateField(editingKey, event.target.value)}
+ disabled={phase === 'saving'}
+ required
+ />
+ </Field>
+ ) : null}
+ </SimpleEditDialog>
+
<TableViewport className="cu-table-wrap">
- <DataTable className="eft-table cu-table">
+ <DataTable className="eft-table cu-table cu-credential-key-table">
<thead>
<tr>
<th>Secret key</th>
<th>Env var</th>
+ {perKeyEditing && mode === 'rotate' ? (
+ <th className="cu-table__cell-actions">Actions</th>
+ ) : null}
</tr>
</thead>
<tbody>
@@ -401,6 +457,24 @@ export function UpdateConnectorCredentials({
<td>
<code>{k.envVar}</code>
</td>
+ {perKeyEditing && mode === 'rotate' ? (
+ <td className="cu-table__cell-actions">
+ <Button
+ size="sm"
+ aria-label={`Rotate ${ownCredentialValue(credentialLabels, k.secretKey) ?? k.secretKey}`}
+ disabled={busy}
+ onClick={() => {
+ resetToIdle()
+ setValidationError('')
+ setInvalidKeys([])
+ setDraft(emptyCredentialMap())
+ setEditingKey(k.secretKey)
+ }}
+ >
+ Rotate
+ </Button>
+ </td>
+ ) : null}
</tr>
))}
</tbody>
@@ -412,38 +486,43 @@ export function UpdateConnectorCredentials({
NAMES the missing keys. The `required` attributes below are kept for
their programmatic semantics. */}
<form
- className="cu-connector-credentials-form cu-form-stack"
+ className={
+ perKeyEditing && mode === 'rotate'
+ ? 'cu-connector-credentials-status'
+ : 'cu-connector-credentials-form cu-form-stack'
+ }
onSubmit={handleSubmit}
noValidate
>
- {envSecret.keys.map(k => {
- const isInvalid = invalidKeys.includes(k.secretKey)
- return (
- <Field
- key={k.secretKey}
- htmlFor={inputId(k.secretKey)}
- label={ownCredentialValue(credentialLabels, k.secretKey) ?? k.secretKey}
- required={mode === 'set'}
- >
- <TextInput
- id={inputId(k.secretKey)}
- type="password"
- autoComplete="new-password"
- placeholder={mode === 'set' ? 'Required' : 'Leave blank to keep current value'}
- value={ownCredentialValue(draft, k.secretKey) ?? ''}
- onChange={e => updateField(k.secretKey, e.target.value)}
- disabled={busy}
+ {(!perKeyEditing || mode === 'set') &&
+ envSecret.keys.map(k => {
+ const isInvalid = invalidKeys.includes(k.secretKey)
+ return (
+ <Field
+ key={k.secretKey}
+ htmlFor={inputId(k.secretKey)}
+ label={ownCredentialValue(credentialLabels, k.secretKey) ?? k.secretKey}
required={mode === 'set'}
- aria-required={mode === 'set' || undefined}
- invalid={isInvalid}
- aria-invalid={isInvalid || undefined}
- aria-describedby={isInvalid ? VALIDATION_ERROR_ID : undefined}
- />
- </Field>
- )
- })}
-
- {validationError ? (
+ >
+ <TextInput
+ id={inputId(k.secretKey)}
+ type="password"
+ autoComplete="new-password"
+ placeholder={mode === 'set' ? 'Required' : 'Leave blank to keep current value'}
+ value={ownCredentialValue(draft, k.secretKey) ?? ''}
+ onChange={e => updateField(k.secretKey, e.target.value)}
+ disabled={busy}
+ required={mode === 'set'}
+ aria-required={mode === 'set' || undefined}
+ invalid={isInvalid}
+ aria-invalid={isInvalid || undefined}
+ aria-describedby={isInvalid ? VALIDATION_ERROR_ID : undefined}
+ />
+ </Field>
+ )
+ })}
+
+ {validationError && editingKey === null ? (
<div className="cu-banner cu-banner--error" role="alert" id={VALIDATION_ERROR_ID}>
{validationError}
</div>
@@ -467,7 +546,7 @@ export function UpdateConnectorCredentials({
</div>
) : null}
- {phase === 'failed' ? (
+ {phase === 'failed' && editingKey === null ? (
<div className="cu-banner cu-banner--error" role="alert">
{submittedMode === 'set'
? `Could not set credentials: ${phaseMessage}`
@@ -484,29 +563,31 @@ export function UpdateConnectorCredentials({
</div>
) : null}
- <div className="cu-create-actions">
- {phase === 'success' || phase === 'failed' || phase === 'timeout' ? (
- <Button type="button" onClick={resetToIdle}>
- {phase === 'success'
- ? 'Done'
- : submittedMode === 'set'
- ? 'Try again'
- : 'Rotate again'}
- </Button>
- ) : (
- <Button type="submit" variant="primary" disabled={busy}>
- {phase === 'saving'
- ? 'Saving…'
- : phase === 'rotating'
- ? submittedMode === 'set'
- ? 'Starting…'
- : 'Rotating…'
- : mode === 'set'
- ? 'Set credentials'
- : 'Rotate credentials'}
- </Button>
- )}
- </div>
+ {!perKeyEditing || mode === 'set' ? (
+ <div className="cu-create-actions">
+ {phase === 'success' || phase === 'failed' || phase === 'timeout' ? (
+ <Button type="button" onClick={resetToIdle}>
+ {phase === 'success'
+ ? 'Done'
+ : submittedMode === 'set'
+ ? 'Try again'
+ : 'Rotate again'}
+ </Button>
+ ) : (
+ <Button type="submit" variant="primary" disabled={busy}>
+ {phase === 'saving'
+ ? 'Saving…'
+ : phase === 'rotating'
+ ? submittedMode === 'set'
+ ? 'Starting…'
+ : 'Rotating…'
+ : mode === 'set'
+ ? 'Set credentials'
+ : 'Rotate credentials'}
+ </Button>
+ )}
+ </div>
+ ) : null}
</form>
</FormSection>
)
diff --git a/control-ui/components/UpdateConnectorCredentials/types.ts b/control-ui/components/UpdateConnectorCredentials/types.ts
index 002fa2eb9..05d7fe8a8 100644
--- a/control-ui/components/UpdateConnectorCredentials/types.ts
+++ b/control-ui/components/UpdateConnectorCredentials/types.ts
@@ -45,6 +45,8 @@ export type UpdateConnectorCredentialsProps = {
recipeOwned?: boolean
/** Marketplace source used to resolve operator-friendly credential labels. */
registryCredentialSource?: RegistryCredentialSource
+ /** Installed connector view: open a value editor from each mapped key's Rotate action. */
+ perKeyEditing?: boolean
onBusyChange?: (busy: boolean) => void
}
diff --git a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx
index 8a8bbf635..0f46f4a1a 100644
--- a/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx
+++ b/control-ui/components/__tests__/EditConnectorSecretPage.test.tsx
@@ -12,14 +12,13 @@ import {
getRegistryCredentialSchema,
listMcpSecrets,
updateMcpSecret,
+ updateMcpServer,
} from '../../lib/api'
import { buildMcpServerReference } from '../../test/fixtures/mcpServer'
-// 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.
+// Exercise the Secrets page against names-only Secret metadata. Stored keys
+// and connector mappings have separate ownership; rotation verifies rollout
+// only for a mapped key on the selected connector.
const navigation = vi.hoisted(() => ({
params: { name: 'linear-credentials' },
@@ -48,6 +47,7 @@ vi.mock('../../lib/api', () => ({
getRegistryCredentialSchema: vi.fn(),
listMcpSecrets: vi.fn(),
updateMcpSecret: vi.fn(),
+ updateMcpServer: vi.fn(),
}))
const mockCreateMcpSecret = vi.mocked(createMcpSecret)
@@ -56,6 +56,7 @@ const mockGetMcpServers = vi.mocked(getMcpServers)
const mockGetRegistryCredentialSchema = vi.mocked(getRegistryCredentialSchema)
const mockListMcpSecrets = vi.mocked(listMcpSecrets)
const mockUpdateMcpSecret = vi.mocked(updateMcpSecret)
+const mockUpdateMcpServer = vi.mocked(updateMcpServer)
function server(options: {
name: string
@@ -63,7 +64,7 @@ function server(options: {
secretKey?: string
envVar?: string
}) {
- return buildMcpServerReference({
+ const resource = buildMcpServerReference({
...options,
secretName: options.secretName ?? 'linear-credentials',
annotations: {
@@ -71,6 +72,15 @@ function server(options: {
'clerum.io/catalog-version': '1.4.0',
},
})
+ return {
+ ...resource,
+ metadata: {
+ ...resource.metadata,
+ uid: `uid-${options.name}`,
+ resourceVersion: '10',
+ generation: 1,
+ },
+ }
}
/** Drains chained microtasks without real timers — same contract as the
@@ -95,11 +105,13 @@ async function renderPage() {
await flush(6)
}
-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' }))
+async function submitRotation(key: string, value: string) {
+ fireEvent.click(screen.getByRole('button', { name: `Rotate ${key}` }))
+ const dialog = screen.getByRole('dialog', { name: `Rotate ${key}` })
+ fireEvent.change(within(dialog).getByLabelText('New value', { exact: false }), {
+ target: { value },
+ })
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Rotate', exact: true }))
await flush()
}
@@ -115,29 +127,44 @@ beforeEach(() => {
authType: 'api-key',
keys: [{ name: 'api-key', label: 'API token', kind: 'api-key' }],
})
- mockGetMcpServer.mockResolvedValue({
- metadata: { name: 'linear-conn' },
+ let currentServer = {
+ ...server({ name: 'linear-conn' }),
status: {
conditions: [
{
type: 'DeploymentReady',
- status: 'True',
+ status: 'True' as const,
reason: 'RolloutComplete',
message: 'ready',
lastTransitionTime: '2026-01-01T00:00:05.000Z',
+ observedGeneration: 1,
},
],
},
+ }
+ let storedKeys = ['api-key', 'refresh-token']
+ mockGetMcpServer.mockImplementation(async () => currentServer)
+ mockUpdateMcpServer.mockImplementation(async (_name, payload) => {
+ currentServer = {
+ ...currentServer,
+ spec: payload.spec,
+ metadata: { ...currentServer.metadata, resourceVersion: '11', generation: 2 },
+ status: { conditions: [{ ...currentServer.status.conditions[0], observedGeneration: 2 }] },
+ }
+ return currentServer
})
- mockUpdateMcpSecret.mockResolvedValue({
- name: 'linear-credentials',
- namespace: 'mcp-server',
- keys: ['api-key'],
- affectedConnectors: ['linear-conn'],
- })
- mockListMcpSecrets.mockResolvedValue({
- items: [{ name: 'linear-credentials', keys: ['api-key', 'refresh-token'] }],
+ mockUpdateMcpSecret.mockImplementation(async (_name, data) => {
+ storedKeys = [...new Set([...storedKeys, ...Object.keys(data)])]
+ return {
+ name: 'linear-credentials',
+ namespace: 'mcp-server',
+ keys: storedKeys,
+ affectedConnectors: ['linear-conn'],
+ }
})
+ mockListMcpSecrets.mockImplementation(async () => ({
+ items: [{ name: 'linear-credentials', keys: storedKeys }],
+ }))
})
afterEach(() => {
@@ -147,38 +174,36 @@ afterEach(() => {
})
describe('EditConnectorSecretPage', () => {
- it('renders the shared rotation form for the single connector referencing the secret', async () => {
+ it('lists every stored key in separate key and environment columns without idle inputs', 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.getByRole('columnheader', { name: 'Secret key' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: /Environment variable/ })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate refresh-token' })).toBeInTheDocument()
expect(screen.getByText('LINEAR_API_KEY')).toBeInTheDocument()
- // Single connector: no chooser.
+ expect(screen.getByText('Not mapped')).toBeInTheDocument()
+ expect(document.querySelector('input')).toBeNull()
+ expect(screen.queryByRole('button', { name: 'Rotate credentials' })).toBeNull()
expect(screen.queryByRole('tablist', { name: 'Connectors referencing this secret' })).toBeNull()
})
- it('rotates through the shared flow and waits for the connector rollout before declaring success', async () => {
+ it('rotates only the chosen key and verifies the mapped connector rollout', async () => {
await renderPage()
-
- await submitRotation('API token', 'rotated')
+ await submitRotation('api-key', ' rotated ')
expect(mockUpdateMcpSecret).toHaveBeenCalledWith('linear-credentials', {
- 'api-key': 'rotated',
+ 'api-key': ' rotated ',
})
- // 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()
+ expect(screen.queryByRole('dialog')).toBeNull()
+ expect(screen.getByText(/Value saved. Waiting for linear-conn/)).toBeInTheDocument()
+ expect(screen.queryByText(/restarted and is serving/)).not.toBeInTheDocument()
await act(async () => {
await vi.advanceTimersByTimeAsync(POLL_INTERVAL_MS)
})
expect(
- screen.getByText(
- /Credentials rotated\. linear-conn restarted and is serving the new credential\./i
- )
+ screen.getByText(/linear-conn restarted and is serving the new credential/)
).toBeInTheDocument()
})
@@ -218,14 +243,17 @@ describe('EditConnectorSecretPage', () => {
)
await renderPage()
- await submitRotation('API token', 'rotated')
+ await submitRotation('api-key', 'rotated')
- expect(screen.getByText(/This Secret no longer exists\./)).toBeInTheDocument()
+ // The missing Secret returns to the existing recovery flow without creating it.
expect(screen.getByRole('button', { name: 'Set credentials' })).toBeInTheDocument()
expect(mockCreateMcpSecret).not.toHaveBeenCalled()
})
it('offers a connector chooser when several connectors reference the secret', async () => {
+ mockListMcpSecrets.mockResolvedValue({
+ items: [{ name: 'linear-credentials', keys: ['api-key', 'refresh-token', 'alpha-key'] }],
+ })
mockGetMcpServers.mockResolvedValue({
items: [
server({ name: 'linear-conn' }),
@@ -255,7 +283,7 @@ describe('EditConnectorSecretPage', () => {
cleanup()
await renderPage()
expect(screen.getByText('LINEAR_API_KEY')).toBeInTheDocument()
- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
})
it.each([
@@ -291,70 +319,122 @@ describe('EditConnectorSecretPage', () => {
expect(mockCreateMcpSecret).not.toHaveBeenCalled()
})
- it('rotates values directly when no connector references the secret yet', async () => {
- mockGetMcpServers.mockResolvedValue({ items: [] })
+ it('rotates an unmapped key without waiting for an unrelated connector restart', async () => {
await renderPage()
-
- expect(screen.getByText('Rotate stored values')).toBeInTheDocument()
- expect(screen.getByText(/No connector references this Secret yet/i)).toBeInTheDocument()
- expect(screen.getByLabelText('api-key')).toBeInTheDocument()
- expect(screen.getByLabelText('refresh-token')).toBeInTheDocument()
-
- fireEvent.change(screen.getByLabelText('api-key'), { target: { value: 'new-token' } })
- fireEvent.click(screen.getByRole('button', { name: 'Save' }))
- await flush()
-
+ await submitRotation('refresh-token', 'next-token')
expect(mockUpdateMcpSecret).toHaveBeenCalledWith('linear-credentials', {
- 'api-key': 'new-token',
+ 'refresh-token': 'next-token',
})
- expect(navigation.push).toHaveBeenCalledWith('/secrets/connector')
+ expect(screen.queryByText(/Waiting for/)).toBeNull()
+ expect(mockGetMcpServer).not.toHaveBeenCalled()
+ expect(navigation.push).not.toHaveBeenCalled()
})
- it('adds new keys to the secret through the direct rotation merge', async () => {
+ it('rotates stored keys when no connector references the Secret', async () => {
mockGetMcpServers.mockResolvedValue({ items: [] })
await renderPage()
+ await submitRotation('api-key', 'next-value')
+ expect(mockUpdateMcpSecret).toHaveBeenCalledWith('linear-credentials', {
+ 'api-key': 'next-value',
+ })
+ expect(screen.getByText('No connector currently uses this Secret.')).toBeInTheDocument()
+ expect(mockGetMcpServer).not.toHaveBeenCalled()
+ })
+ it('adds a key, retains it in the list and reloads it from stored metadata', async () => {
+ await renderPage()
fireEvent.click(screen.getByRole('button', { name: 'Add key' }))
- fireEvent.change(screen.getByLabelText('New key name 1'), {
+ const dialog = screen.getByRole('dialog', { name: 'Add key' })
+ fireEvent.change(within(dialog).getByLabelText('Key name', { exact: false }), {
target: { value: 'webhook-secret' },
})
- fireEvent.change(screen.getByLabelText('New key value 1'), { target: { value: 'whv-1' } })
- fireEvent.change(screen.getByLabelText('api-key'), { target: { value: 'new-token' } })
- fireEvent.click(screen.getByRole('button', { name: 'Save' }))
+ expect(within(dialog).getByLabelText('Environment variable', { exact: false })).toHaveValue(
+ 'WEBHOOK_SECRET'
+ )
+ fireEvent.change(within(dialog).getByLabelText('Value', { exact: false }), {
+ target: { value: 'whv-1' },
+ })
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Add key' }))
await flush()
-
expect(mockUpdateMcpSecret).toHaveBeenCalledWith('linear-credentials', {
- 'api-key': 'new-token',
'webhook-secret': 'whv-1',
})
- expect(navigation.push).toHaveBeenCalledWith('/secrets/connector')
- })
+ expect(screen.queryByRole('dialog')).toBeNull()
+ expect(screen.getByRole('button', { name: 'Rotate webhook-secret' })).toBeInTheDocument()
+ expect(screen.getByText(/Waiting for linear-conn/)).toBeInTheDocument()
+ expect(mockUpdateMcpServer).toHaveBeenCalledWith('linear-conn', {
+ metadata: { uid: 'uid-linear-conn', resourceVersion: '10' },
+ spec: {
+ ...server({ name: 'linear-conn' }).spec,
+ envSecret: {
+ name: 'linear-credentials',
+ keys: [
+ { secretKey: 'api-key', envVar: 'LINEAR_API_KEY' },
+ { secretKey: 'webhook-secret', envVar: 'WEBHOOK_SECRET' },
+ ],
+ },
+ },
+ })
+ expect(screen.getByText('WEBHOOK_SECRET')).toBeInTheDocument()
- it('rejects a new key that duplicates an existing key instead of merging it', async () => {
- mockGetMcpServers.mockResolvedValue({ items: [] })
+ mockListMcpSecrets.mockResolvedValue({
+ items: [{ name: 'linear-credentials', keys: ['api-key', 'refresh-token', 'webhook-secret'] }],
+ })
+ cleanup()
await renderPage()
+ expect(screen.getByRole('button', { name: 'Rotate webhook-secret' })).toBeInTheDocument()
+ })
+ it('rejects an existing unmapped key and disables empty add submissions', async () => {
+ await renderPage()
fireEvent.click(screen.getByRole('button', { name: 'Add key' }))
- fireEvent.change(screen.getByLabelText('New key name 1'), { target: { value: 'api-key' } })
- fireEvent.change(screen.getByLabelText('New key value 1'), { target: { value: 'dup' } })
- fireEvent.click(screen.getByRole('button', { name: 'Save' }))
- await flush()
-
- expect(screen.getByRole('alert')).toHaveTextContent('Key api-key already exists')
+ const dialog = screen.getByRole('dialog', { name: 'Add key' })
+ const save = within(dialog).getByRole('button', { name: 'Add key' })
+ expect(save).toBeDisabled()
+ fireEvent.change(within(dialog).getByLabelText('Key name', { exact: false }), {
+ target: { value: 'refresh-token' },
+ })
+ fireEvent.change(within(dialog).getByLabelText('Value', { exact: false }), {
+ target: { value: 'dup' },
+ })
+ expect(screen.getByText('This key already exists.')).toBeInTheDocument()
+ expect(save).toBeDisabled()
expect(mockUpdateMcpSecret).not.toHaveBeenCalled()
})
- it('keeps unfilled keys out of the direct rotation and refuses empty saves', async () => {
- mockGetMcpServers.mockResolvedValue({ items: [] })
+ it('rechecks newly added keys before writing instead of replacing an unseen value', async () => {
await renderPage()
-
- fireEvent.click(screen.getByRole('button', { name: 'Save' }))
+ mockListMcpSecrets.mockResolvedValue({
+ items: [{ name: 'linear-credentials', keys: ['api-key', 'refresh-token', 'new-key'] }],
+ })
+ fireEvent.click(screen.getByRole('button', { name: 'Add key' }))
+ const dialog = screen.getByRole('dialog', { name: 'Add key' })
+ fireEvent.change(within(dialog).getByLabelText('Key name', { exact: false }), {
+ target: { value: 'new-key' },
+ })
+ fireEvent.change(within(dialog).getByLabelText('Value', { exact: false }), {
+ target: { value: 'dup' },
+ })
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Add key' }))
await flush()
-
- expect(screen.getByRole('alert')).toHaveTextContent('Fill in at least one key')
+ expect(screen.getByRole('alert')).toHaveTextContent('already exists')
expect(mockUpdateMcpSecret).not.toHaveBeenCalled()
})
+ it('preserves a failed rotation draft and cancels without writing', async () => {
+ mockUpdateMcpSecret.mockRejectedValueOnce(new Error('Save unavailable'))
+ await renderPage()
+ await submitRotation('api-key', 'retry-value')
+ const dialog = screen.getByRole('dialog', { name: 'Rotate api-key' })
+ expect(within(dialog).getByLabelText('New value', { exact: false })).toHaveValue('retry-value')
+ expect(screen.getByRole('alert')).toHaveTextContent('Save unavailable')
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Cancel' }))
+ fireEvent.click(screen.getByRole('button', { name: 'Rotate api-key' }))
+ expect(screen.getByLabelText('New value', { exact: false })).toHaveValue('')
+ fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
+ expect(mockUpdateMcpSecret).toHaveBeenCalledTimes(1)
+ })
+
it('explains when the secret itself no longer exists', async () => {
mockGetMcpServers.mockResolvedValue({ items: [] })
mockListMcpSecrets.mockResolvedValue({ items: [] })
@@ -372,4 +452,54 @@ describe('EditConnectorSecretPage', () => {
expect(screen.queryByText(/No connector currently references Secret/i)).not.toBeInTheDocument()
expect(screen.queryByRole('button', { name: 'Rotate credentials' })).not.toBeInTheDocument()
})
+ it('retries only mapping after the key was stored and the mapping was rejected', async () => {
+ mockUpdateMcpServer.mockRejectedValueOnce(Object.assign(new Error('Conflict'), { status: 409 }))
+ await renderPage()
+ fireEvent.click(screen.getByRole('button', { name: 'Add key' }))
+ const dialog = screen.getByRole('dialog', { name: 'Add key' })
+ fireEvent.change(within(dialog).getByLabelText('Key name', { exact: false }), {
+ target: { value: 'extra-key' },
+ })
+ fireEvent.change(within(dialog).getByLabelText('Environment variable', { exact: false }), {
+ target: { value: 'CUSTOM_TOKEN' },
+ })
+ fireEvent.change(within(dialog).getByLabelText('Value', { exact: false }), {
+ target: { value: 'value-once' },
+ })
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Add key' }))
+ await flush(12)
+ expect(screen.getByRole('alert')).toHaveTextContent(
+ 'is stored, but its environment mapping could not be confirmed'
+ )
+ expect(mockUpdateMcpSecret).toHaveBeenCalledTimes(1)
+ expect(within(dialog).getByLabelText('Value', { exact: false })).toHaveValue('')
+ expect(within(dialog).getByLabelText('Value', { exact: false })).toBeDisabled()
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Retry mapping' }))
+ await flush(12)
+ expect(screen.queryByRole('dialog')).toBeNull()
+ expect(mockUpdateMcpSecret).toHaveBeenCalledTimes(1)
+ expect(mockUpdateMcpServer).toHaveBeenCalledTimes(2)
+ expect(screen.getByText('CUSTOM_TOKEN')).toBeInTheDocument()
+ })
+
+ it('rejects a colliding environment variable before writing the key', async () => {
+ await renderPage()
+ fireEvent.click(screen.getByRole('button', { name: 'Add key' }))
+ const dialog = screen.getByRole('dialog', { name: 'Add key' })
+ fireEvent.change(within(dialog).getByLabelText('Key name', { exact: false }), {
+ target: { value: 'fresh-key' },
+ })
+ fireEvent.change(within(dialog).getByLabelText('Environment variable', { exact: false }), {
+ target: { value: 'LINEAR_API_KEY' },
+ })
+ fireEvent.change(within(dialog).getByLabelText('Value', { exact: false }), {
+ target: { value: 'never-save' },
+ })
+ expect(within(dialog).getByRole('button', { name: 'Add key' })).toBeDisabled()
+ expect(
+ screen.getByText(/Environment variable "LINEAR_API_KEY" is already mapped/)
+ ).toBeInTheDocument()
+ expect(mockUpdateMcpSecret).not.toHaveBeenCalled()
+ expect(mockUpdateMcpServer).not.toHaveBeenCalled()
+ })
})
diff --git a/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx b/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx
index 1a6cb3118..a0ba05e85 100644
--- a/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx
+++ b/control-ui/components/__tests__/EditMcpServerPageCredentials.test.tsx
@@ -150,10 +150,12 @@ async function submitPartialRotateAndGet404() {
status: 404,
})
)
- fireEvent.change(screen.getByLabelText('api-key'), { target: { value: 'partial-value' } })
- fireEvent.click(screen.getByRole('button', { name: 'Rotate credentials' }))
- const dialog = await screen.findByRole('alertdialog')
- fireEvent.click(within(dialog).getByRole('button', { name: 'Rotate & restart' }))
+ fireEvent.click(screen.getByRole('button', { name: 'Rotate api-key' }))
+ const dialog = screen.getByRole('dialog', { name: 'Rotate api-key' })
+ fireEvent.change(within(dialog).getByLabelText('New value', { exact: false }), {
+ target: { value: 'partial-value' },
+ })
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Rotate', exact: true }))
}
/** Invariant O2 at the page level: explanation only. */
@@ -293,7 +295,7 @@ describe('EditMcpServerPage — ownership survives a late 404 for every status s
// It starts as an ordinary rotate form: nothing observable says the
// Secret is missing, so the resolver can only answer 'rotate'.
- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
await submitPartialRotateAndGet404()
@@ -309,7 +311,7 @@ describe('EditMcpServerPage — ownership survives a late 404 for every status s
it(`still recovers a managed:true connector into the create form — ${shape.name}`, async () => {
await renderPage(mcpServer({ managed: true, status: shape.status }))
- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
await submitPartialRotateAndGet404()
@@ -364,9 +366,9 @@ describe('EditMcpServerPage — credential surface wiring', () => {
})
)
- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
expect(screen.queryByRole('button', { name: 'Set credentials' })).not.toBeInTheDocument()
- expect(screen.getByText(/Rotate values stored in Secret/i)).toBeInTheDocument()
+ expect(screen.getByText(/Rotate a key to replace its value in Secret/i)).toBeInTheDocument()
})
it('renders the recipe explanation, and no form, for an unmanaged connector with a missing Secret', async () => {
@@ -407,7 +409,7 @@ describe('EditMcpServerPage — credential surface wiring', () => {
)
// The stale SecretNotFound and the DeploymentReady noise must both lose.
- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
expect(screen.queryByRole('button', { name: 'Set credentials' })).not.toBeInTheDocument()
})
@@ -495,7 +497,7 @@ describe('EditMcpServerPage — credential surface wiring', () => {
})
)
- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
expect(screen.queryByRole('button', { name: 'Set credentials' })).not.toBeInTheDocument()
})
})
@@ -577,13 +579,13 @@ describe('EditMcpServerPage — Change assigned Secret', () => {
await renderPage(eligibleServer())
expect(screen.getByRole('button', { name: 'Change assigned Secret' })).toBeInTheDocument()
// Value rotation keeps its separate surface on the same tab.
- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
})
it('hides reassignment when the WorkflowRecipe owns the credentials', async () => {
await renderPage(mcpServer({ managed: false, status: { conditions: [] } }))
expect(screen.queryByRole('button', { name: 'Change assigned Secret' })).not.toBeInTheDocument()
- expect(screen.getByRole('button', { name: 'Rotate credentials' })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
})
it('returns focus to the trigger after the change flow is cancelled', async () => {
@@ -637,10 +639,60 @@ describe('EditMcpServerPage — Change assigned Secret', () => {
// Leaving releases the panel and reloads the connector's new reference.
mockGetMcpServer.mockResolvedValue(reassignedServer())
fireEvent.click(screen.getByRole('button', { name: 'Check credentials later' }))
- const currentAssignment = await screen.findByText(/Current Secret:/)
+ const currentAssignment = await screen.findByRole('group', { name: 'Current Secret' })
expect(currentAssignment.textContent).toContain(OTHER_SECRET.name)
await waitFor(() =>
expect(screen.getByRole('button', { name: 'Change assigned Secret' })).toHaveFocus()
)
})
})
+
+describe('Installed connector credential row editing', () => {
+ it('shows a Rotate action per credential with no idle inputs or aggregate rotate button', async () => {
+ await renderPage(mcpServer({ status: { conditions: [] } }))
+ const panel = credentialPanel()
+ expect(within(panel).getByRole('button', { name: 'Rotate api-key' })).toBeInTheDocument()
+ expect(within(panel).getByRole('button', { name: 'Rotate workspace-id' })).toBeInTheDocument()
+ expect(panel.querySelector('input')).toBeNull()
+ expect(screen.queryByRole('button', { name: 'Rotate credentials' })).toBeNull()
+ expect(screen.queryByRole('button', { name: 'Add key' })).toBeNull()
+ expect(within(panel).getByRole('columnheader', { name: 'Secret key' })).toBeInTheDocument()
+ expect(within(panel).getByRole('columnheader', { name: 'Env var' })).toBeInTheDocument()
+ })
+
+ it('opens a blank masked editor and discards the draft on cancel', async () => {
+ await renderPage(mcpServer({ status: { conditions: [] } }))
+ fireEvent.click(screen.getByRole('button', { name: 'Rotate workspace-id' }))
+ const dialog = screen.getByRole('dialog', { name: 'Rotate workspace-id' })
+ const input = within(dialog).getByLabelText('New value', { exact: false })
+ expect(input).toHaveAttribute('type', 'password')
+ expect(input).toHaveValue('')
+ expect(within(dialog).getByRole('button', { name: 'Rotate', exact: true })).toBeDisabled()
+ fireEvent.change(input, { target: { value: 'unsaved' } })
+ expect(screen.getByRole('button', { name: 'Change assigned Secret' })).toBeDisabled()
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Cancel' }))
+ expect(screen.queryByRole('dialog')).toBeNull()
+ expect(mockUpdateMcpSecret).not.toHaveBeenCalled()
+ fireEvent.click(screen.getByRole('button', { name: 'Rotate workspace-id' }))
+ expect(screen.getByLabelText('New value', { exact: false })).toHaveValue('')
+ })
+
+ it('saves only the selected value and keeps the dialog draft after failure', async () => {
+ mockUpdateMcpSecret.mockRejectedValueOnce(new Error('Update unavailable'))
+ await renderPage(mcpServer({ status: { conditions: [] } }))
+ fireEvent.click(screen.getByRole('button', { name: 'Rotate workspace-id' }))
+ const dialog = screen.getByRole('dialog', { name: 'Rotate workspace-id' })
+ fireEvent.change(within(dialog).getByLabelText('New value', { exact: false }), {
+ target: { value: ' next-value ' },
+ })
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Rotate', exact: true }))
+ await waitFor(() => expect(screen.getByRole('alert')).toHaveTextContent('Update unavailable'))
+ expect(mockUpdateMcpSecret).toHaveBeenCalledWith(SECRET_NAME, {
+ 'workspace-id': ' next-value ',
+ })
+ expect(within(dialog).getByLabelText('New value', { exact: false })).toHaveValue(
+ ' next-value '
+ )
+ expect(screen.queryByRole('alertdialog')).toBeNull()
+ })
+})
diff --git a/control-ui/components/__tests__/ExistingConnectorSecretFields.test.tsx b/control-ui/components/__tests__/ExistingConnectorSecretFields.test.tsx
index 3afc28c7e..b394ed828 100644
--- a/control-ui/components/__tests__/ExistingConnectorSecretFields.test.tsx
+++ b/control-ui/components/__tests__/ExistingConnectorSecretFields.test.tsx
@@ -107,7 +107,7 @@ describe('ExistingConnectorSecretFields — metadata loading', () => {
it('reloads metadata on demand through the explicit refresh control', async () => {
renderFields()
await waitFor(() => expect(screen.getByLabelText(/^Existing Secret/)).toBeEnabled())
- fireEvent.click(screen.getByRole('button', { name: 'Refresh Secrets' }))
+ fireEvent.click(screen.getByRole('button', { name: 'Refresh secrets' }))
await waitFor(() => expect(mockListMcpSecrets).toHaveBeenCalledTimes(2))
})
})
@@ -171,7 +171,7 @@ describe('ExistingConnectorSecretFields — reference-only key mapping', () => {
mockListMcpSecrets.mockResolvedValue({
items: [{ ...SECRET_A, keys: ['replacement-key'] }],
})
- fireEvent.click(screen.getByRole('button', { name: 'Refresh Secrets' }))
+ fireEvent.click(screen.getByRole('button', { name: 'Refresh secrets' }))
await waitFor(() =>
expect(screen.getByRole('alert')).toHaveTextContent('not stored in the selected Secret')
)
diff --git a/control-ui/lib/connectorCredentials.ts b/control-ui/lib/connectorCredentials.ts
index 60c8688ae..d14045cfe 100644
--- a/control-ui/lib/connectorCredentials.ts
+++ b/control-ui/lib/connectorCredentials.ts
@@ -163,6 +163,23 @@ export function suggestedCredentialEnvVar(key: string): string {
return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name) ? name : ''
}
+/** Mirrors the rotate route's key rule (control-api `invalidSecretDataKeyReason`):
+ * Kubernetes Secret key names, up to 253 chars, never `.` or a `..` prefix.
+ * Shared by attach validation and the add-key editor so the two cannot drift. */
+export function invalidSecretKeyNameReason(key: string): string | undefined {
+ const trimmed = key.trim()
+ if (!trimmed) return 'Enter a Secret key name.'
+ if (
+ !/^[-._a-zA-Z0-9]+$/.test(trimmed) ||
+ trimmed.length > 253 ||
+ trimmed === '.' ||
+ trimmed.startsWith('..')
+ ) {
+ return 'Enter a valid Secret key (letters, numbers, -, _, or .; not . or a .. prefix; up to 253 characters).'
+ }
+ return undefined
+}
+
export function validateCredentialAttach(
mode: AttachMode,
secretName: string,
@@ -213,12 +230,9 @@ export function validateCredentialAttach(
}
}
}
- if (!/^[-._a-zA-Z0-9]+$/.test(key) || key.length > 253 || key === '.' || key.startsWith('..')) {
- return {
- message:
- 'Enter a valid Secret key (letters, numbers, -, _, or .; not . or a .. prefix; up to 253 characters).',
- field: `${row.id}-key`,
- }
+ const keyProblem = invalidSecretKeyNameReason(key)
+ if (keyProblem) {
+ return { message: keyProblem, field: `${row.id}-key` }
}
if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(env) || CREDENTIAL_FORBIDDEN_ENV.has(env.toUpperCase())) {
return {
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index e641cf936..1a9b6c5fb 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.749",
+ "version": "0.1.750",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.749",
+ "version": "0.1.750",
"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 b828bef57..1865984d1 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.749",
+ "version": "0.1.750",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",