diff --git a/src/renderer/src/components/settings/cloud-secrets/CloudSecretList.tsx b/src/renderer/src/components/settings/cloud-secrets/CloudSecretList.tsx index 1e6558397b9..ff9ec2de66d 100644 --- a/src/renderer/src/components/settings/cloud-secrets/CloudSecretList.tsx +++ b/src/renderer/src/components/settings/cloud-secrets/CloudSecretList.tsx @@ -8,16 +8,14 @@ import type { CloudSecretView, CloudSecretsErrorCode } from '../../../../../shared/cloud-secrets/cloud-secrets-wire' -import { Badge } from '../../ui/badge' import { InlineError } from '../../ui/inline-error' import { Skeleton } from '../../ui/skeleton' import { Button } from '../../ui/button' -import { cloudSecretKindLabel, cloudSecretsErrorCopy } from './cloud-secrets-copy' +import { cloudSecretsErrorCopy } from './cloud-secrets-copy' import { CloudSecretEditor, type CloudSecretEditorTarget } from './CloudSecretEditor' import { CloudApiEmptyState } from '../cloud-api/cloud-api-parts' import { CloudSecretsPasteEnv } from './CloudSecretsPasteEnv' -import { cloudSecretStoredOnVm } from '../../../../../shared/cloud-secrets/cloud-secret-rules' -import { CloudSecretVmBadge } from './CloudSecretVmBadge' +import { CloudSecretChips } from './CloudSecretVmBadge' import type { CloudSecretListModel } from './use-cloud-secrets' export type CloudSecretPeople = { @@ -79,17 +77,12 @@ function SecretRow({ }} >
+ {/* The name never truncates: chips sit on their own line under it. */}
+
+
{secret.name}
- {secret.kind === 'agent_key' && !cloudSecretStoredOnVm(secret.name) ? (
-
-
- {cloudSecretKindLabel(secret.name, t)}
-
- ) : null}
-
+
{maskedHint(secret.hint)}
diff --git a/src/renderer/src/components/settings/cloud-secrets/CloudSecretVmBadge.tsx b/src/renderer/src/components/settings/cloud-secrets/CloudSecretVmBadge.tsx
index 6cba05971db..9b302bf3a66 100644
--- a/src/renderer/src/components/settings/cloud-secrets/CloudSecretVmBadge.tsx
+++ b/src/renderer/src/components/settings/cloud-secrets/CloudSecretVmBadge.tsx
@@ -1,7 +1,9 @@
-import { TriangleAlert } from 'lucide-react'
+import { KeyRound, TriangleAlert } from 'lucide-react'
import { useTranslate } from '@/i18n/use-translate'
import { cloudSecretStoredOnVm } from '../../../../../shared/cloud-secrets/cloud-secret-rules'
+import type { CloudSecretKind } from '../../../../../shared/cloud-secrets/cloud-secrets-wire'
import { Badge } from '../../ui/badge'
+import { cloudSecretKindLabel } from './cloud-secrets-copy'
import { Tooltip, TooltipContent, TooltipTrigger } from '../../ui/tooltip'
/**
@@ -47,3 +49,30 @@ export function cloudSecretVmWarning(t: ReturnType, name: s
'Orca can’t swap this key at the network edge, so cloud workspaces get the real value. Anything running in the sandbox can read it.'
)
}
+
+/** The chips on a secret's row, on their own line under the name: Agent key, or Real value in sandbox. */
+export function CloudSecretChips({
+ name,
+ kind
+}: {
+ name: string
+ kind: CloudSecretKind
+}): React.JSX.Element | null {
+ const t = useTranslate()
+ const inFull = cloudSecretStoredOnVm(name)
+ if (kind !== 'agent_key' && !inFull) {
+ return null
+ }
+ return (
+
+ {inFull ? (
+
+ ) : (
+
+
+ {cloudSecretKindLabel(name, t)}
+
+ )}
+
+ )
+}
diff --git a/src/renderer/src/components/settings/cloud-secrets/CloudSecretsEffectiveView.tsx b/src/renderer/src/components/settings/cloud-secrets/CloudSecretsEffectiveView.tsx
index cca4900eac6..d22df9d441e 100644
--- a/src/renderer/src/components/settings/cloud-secrets/CloudSecretsEffectiveView.tsx
+++ b/src/renderer/src/components/settings/cloud-secrets/CloudSecretsEffectiveView.tsx
@@ -1,20 +1,15 @@
-import { KeyRound, Layers } from 'lucide-react'
+import { Layers } from 'lucide-react'
import { useTranslate, type Translate } from '@/i18n/use-translate'
import type {
CloudSecretScope,
CloudSecretsEffective
} from '../../../../../shared/cloud-secrets/cloud-secrets-wire'
import { Badge } from '../../ui/badge'
-import { cloudSecretStoredOnVm } from '../../../../../shared/cloud-secrets/cloud-secret-rules'
-import { CloudSecretVmBadge } from './CloudSecretVmBadge'
+import { CloudSecretChips } from './CloudSecretVmBadge'
import { InlineError } from '../../ui/inline-error'
import { Skeleton } from '../../ui/skeleton'
import { CloudApiEmptyState } from '../cloud-api/cloud-api-parts'
-import {
- cloudSecretKindLabel,
- cloudSecretScopeLabel,
- cloudSecretsErrorCopy
-} from './cloud-secrets-copy'
+import { cloudSecretScopeLabel, cloudSecretsErrorCopy } from './cloud-secrets-copy'
import { maskedHint } from './CloudSecretList'
import type { Loadable } from './use-cloud-secrets'
@@ -126,15 +121,9 @@ export function CloudSecretsEffectiveView({
{secrets.map((secret) => (
-
- {secret.name}
- {secret.kind === 'agent_key' && !cloudSecretStoredOnVm(secret.name) ? (
-
-
- {cloudSecretKindLabel(secret.name, t)}
-
- ) : null}
-
+
+ {secret.name}
+