@skyhook-io/radar-app 1.11.0 → 1.12.3

package/src/components/settings/currency-options.test.ts

@@ -0,0 +1,49 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { CURRENCY_OPTIONS, currencyOptionsForValue } from './currency-options'
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
+describe('currency options', () => {
+  it('offers Auto followed by named ISO 4217 currencies', () => {
+    expect(CURRENCY_OPTIONS[0]).toEqual({
+      value: '',
+      label: 'Auto (detect from OpenCost/Kubecost)',
+    })
+    expect(CURRENCY_OPTIONS).toContainEqual({
+      value: 'EUR',
+      label: 'Euro (EUR)',
+    })
+    expect(CURRENCY_OPTIONS).toContainEqual({
+      value: 'USD',
+      label: 'US Dollar (USD)',
+    })
+    for (const code of ['MRU', 'SLE', 'UYW', 'VED', 'VES', 'XAD', 'XCG', 'ZWG']) {
+      expect(CURRENCY_OPTIONS.some((option) => option.value === code)).toBe(true)
+    }
+  })
+
+  it('contains unique uppercase three-letter currency codes', () => {
+    const codes = CURRENCY_OPTIONS.slice(1).map((option) => option.value)
+    expect(new Set(codes).size).toBe(codes.length)
+    expect(codes.every((code) => /^[A-Z]{3}$/.test(code))).toBe(true)
+    expect(codes).not.toContain('XTS')
+    expect(codes).not.toContain('XXX')
+  })
+
+  it('supplements current codes when browser currency data lags', async () => {
+    vi.spyOn(Intl, 'supportedValuesOf').mockReturnValue(['EUR', 'USD'])
+    vi.resetModules()
+    const { CURRENCY_OPTIONS: options } = await import('./currency-options')
+
+    for (const code of ['MRU', 'SLE', 'UYW', 'VED', 'VES', 'XAD', 'XCG', 'ZWG']) {
+      expect(options.some((option) => option.value === code)).toBe(true)
+    }
+  })
+
+  it('shows an existing saved code instead of misrepresenting it as Auto', () => {
+    expect(currencyOptionsForValue('EUR')).toBe(CURRENCY_OPTIONS)
+    expect(currencyOptionsForValue('ADP')).toContainEqual({ value: 'ADP', label: 'ADP' })
+  })
+})

package/src/components/settings/currency-options.ts

@@ -0,0 +1,38 @@
+import type { SelectMenuOption } from '@skyhook-io/k8s-ui'
+
+const currencyNames = new Intl.DisplayNames(['en'], { type: 'currency' })
+const currentISO4217CurrenciesAddedSinceCLDR32: Record<string, string> = {
+  MRU: 'Mauritanian Ouguiya',
+  SLE: 'Sierra Leonean Leone',
+  UYW: 'Uruguayan Nominal Wage Index Unit',
+  VED: 'Bolívar Soberano',
+  VES: 'Venezuelan Bolívar',
+  XAD: 'Arab Accounting Dinar',
+  XCG: 'Caribbean Guilder',
+  ZWG: 'Zimbabwean Gold',
+}
+const currencyCodes = [
+  ...new Set([
+    ...Intl.supportedValuesOf('currency'),
+    ...Object.keys(currentISO4217CurrenciesAddedSinceCLDR32),
+  ]),
+]
+
+export const CURRENCY_OPTIONS: SelectMenuOption[] = [
+  { value: '', label: 'Auto (detect from OpenCost/Kubecost)' },
+  ...currencyCodes
+    .filter((code) => code !== 'XTS' && code !== 'XXX')
+    .map((code) => {
+      const name = currentISO4217CurrenciesAddedSinceCLDR32[code] ?? currencyNames.of(code)
+      return {
+        value: code,
+        label: name && name !== code ? `${name} (${code})` : code,
+      }
+    })
+    .sort((a, b) => a.label.localeCompare(b.label, 'en')),
+]
+
+export function currencyOptionsForValue(value: string): SelectMenuOption[] {
+  if (!value || CURRENCY_OPTIONS.some((option) => option.value === value)) return CURRENCY_OPTIONS
+  return [...CURRENCY_OPTIONS, { value, label: value }]
+}

package/src/components/ui/DiagnosticsOverlay.test.ts

@@ -73,3 +73,43 @@ describe('formatForGitHub desktop section', () => {
     expect(md).toContain('Desktop: `(unset)`')
   })
 })
+
+describe('formatForGitHub kubeconfig section', () => {
+  it('reports combined source counts and ignored ambient configuration', () => {
+    const md = formatForGitHub({
+      ...baseSnapshot,
+      kubeconfig: {
+        mode: 'multi-source',
+        fileCount: 3,
+        directoryFileCount: 2,
+        contextCount: 7,
+        enrichedFromShell: true,
+        kubeconfigEnvIgnored: true,
+        kubeconfigEnvIgnoredReason: 'directories-only configuration',
+        currentContextUsesExec: false,
+      },
+    }, undefined, false)
+
+    expect(md).toContain('Mode: `multi-source` | Files: 3 | Directory Files: 2 | Contexts (after source resolution): 7')
+    expect(md).toContain('KUBECONFIG Captured From Shell: Yes | Ignored: Yes — directories-only configuration')
+  })
+
+  it('omits directory counts for environment path lists', () => {
+    const md = formatForGitHub({
+      ...baseSnapshot,
+      kubeconfig: {
+        mode: 'multi-env',
+        fileCount: 2,
+        directoryFileCount: 0,
+        contextCount: 4,
+        enrichedFromShell: false,
+        kubeconfigEnvIgnored: false,
+        kubeconfigEnvIgnoredReason: '',
+        currentContextUsesExec: true,
+      },
+    }, undefined, false)
+
+    expect(md).toContain('Mode: `multi-env` | Files: 2 | Contexts (after source resolution): 4')
+    expect(md).not.toContain('Directory Files:')
+  })
+})

package/src/components/ui/DiagnosticsOverlay.tsx

@@ -171,10 +171,10 @@ function Section({ title, children, warn }: { title: string; children: React.Rea
 
 function Row({ label, value, warn }: { label: string; value: React.ReactNode; warn?: boolean }) {
   return (
-    <div className="flex items-baseline justify-between gap-4 text-xs">
+    <div className="flex items-start justify-between gap-4 text-xs">
       <span className="text-theme-text-secondary shrink-0">{label}</span>
       <span className={clsx(
-        'text-right truncate',
+        'min-w-0 text-right break-words',
         warn ? 'text-yellow-400' : 'text-theme-text-primary'
       )}>{value}</span>
     </div>
@@ -219,11 +219,19 @@ function KubeconfigSection({ data }: { data: DiagnosticsSnapshot }) {
   const present = k.execPluginsPresent ?? []
   const hasMissing = missing.length > 0
   return (
-    <Section title="Kubeconfig" warn={hasMissing}>
+    <Section title="Kubeconfig" warn={hasMissing || k.kubeconfigEnvIgnored}>
       <Row label="Mode" value={k.mode || '(not initialized)'} />
       <Row label="Files Loaded" value={k.fileCount} />
-      <Row label="Contexts (post-merge)" value={k.contextCount} />
-      <Row label="Enriched From Shell" value={k.enrichedFromShell ? 'Yes' : 'No'} />
+      {(k.mode === 'multi-dir' || k.mode === 'multi-source') && (
+        <Row label="Directory Files Loaded" value={k.directoryFileCount} />
+      )}
+      <Row label="Contexts (after source resolution)" value={k.contextCount} />
+      <Row label="KUBECONFIG Captured From Shell" value={k.enrichedFromShell ? 'Yes' : 'No'} />
+      <Row
+        label="KUBECONFIG Ignored"
+        value={k.kubeconfigEnvIgnored ? `Yes — ${k.kubeconfigEnvIgnoredReason}` : 'No'}
+        warn={k.kubeconfigEnvIgnored}
+      />
       <Row
         label="Current Context Uses Exec"
         value={k.currentContextUsesExec ? 'Yes' : 'No'}
@@ -631,7 +639,11 @@ export function formatForGitHub(data: DiagnosticsSnapshot, frontendPerf?: K8sUIP
   if (data.kubeconfig) {
     const k = data.kubeconfig
     lines.push(`### Kubeconfig`)
-    lines.push(`- Mode: \`${k.mode || '(not initialized)'}\` | Files: ${k.fileCount} | Contexts (post-merge): ${k.contextCount} | Enriched From Shell: ${k.enrichedFromShell ? 'Yes' : 'No'}`)
+    const directoryFiles = k.mode === 'multi-dir' || k.mode === 'multi-source'
+      ? ` | Directory Files: ${k.directoryFileCount}`
+      : ''
+    lines.push(`- Mode: \`${k.mode || '(not initialized)'}\` | Files: ${k.fileCount}${directoryFiles} | Contexts (after source resolution): ${k.contextCount}`)
+    lines.push(`- KUBECONFIG Captured From Shell: ${k.enrichedFromShell ? 'Yes' : 'No'} | Ignored: ${k.kubeconfigEnvIgnored ? `Yes — ${k.kubeconfigEnvIgnoredReason}` : 'No'}`)
     lines.push(`- Current Context Uses Exec: ${k.currentContextUsesExec ? 'Yes' : 'No'}`)
     if (k.execPluginsPresent && k.execPluginsPresent.length > 0) {
       lines.push(`- Exec Plugins on PATH: \`${k.execPluginsPresent.join('`, `')}\``)

package/src/components/ui/ErrorBoundary.test.tsx

@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest'
+
+import { ErrorBoundary } from './ErrorBoundary'
+
+// Navigating re-renders this boundary rather than remounting it, so a boundary
+// that only latched would keep the fallback on screen for the rest of the
+// session. These drive the lifecycle hooks directly - a caught error needs a
+// real render loop, which the SSR-string tests used elsewhere here cannot give.
+const caught = (resetKey: string) => ({
+  hasError: true,
+  error: new Error("Cannot read properties of undefined (reading 'nodeCount')"),
+  resetKey,
+})
+
+describe('ErrorBoundary reset', () => {
+  it('clears a caught error when resetKey changes', () => {
+    expect(ErrorBoundary.getDerivedStateFromProps({ children: null, resetKey: '/topology' }, caught('/'))).toEqual({
+      hasError: false,
+      error: null,
+      resetKey: '/topology',
+    })
+  })
+
+  it('clears it when only a later path segment changes', () => {
+    // The view is just the first path segment, so /resources/pods and
+    // /resources/services are the same view. Resetting per view would leave a
+    // crash under /resources trapping the user as they switch kinds.
+    const next = ErrorBoundary.getDerivedStateFromProps(
+      { children: null, resetKey: '/resources/services' },
+      caught('/resources/pods'),
+    )
+    expect(next?.hasError).toBe(false)
+  })
+
+  it('clears it when only the query changes', () => {
+    // Selection rides in the query, so a path-only key would strand a crash on
+    // the view that produced it.
+    const next = ErrorBoundary.getDerivedStateFromProps(
+      { children: null, resetKey: '/resources/pods?resource=kube-system/coredns' },
+      caught('/resources/pods'),
+    )
+    expect(next?.hasError).toBe(false)
+  })
+
+  it('holds the error while resetKey is unchanged', () => {
+    expect(ErrorBoundary.getDerivedStateFromProps({ children: null, resetKey: '/' }, caught('/'))).toBeNull()
+  })
+
+  it('records the error', () => {
+    expect(ErrorBoundary.getDerivedStateFromError(new Error('boom'))).toEqual({
+      hasError: true,
+      error: new Error('boom'),
+    })
+  })
+})

package/src/components/ui/ErrorBoundary.tsx

@@ -3,20 +3,35 @@ import { AlertTriangle, RefreshCw } from 'lucide-react'
 
 interface Props {
   children: ReactNode
+  /**
+   * Clears a caught error whenever this value changes - pass whatever selects
+   * the children, typically the route. A boundary latches: nothing resets
+   * hasError on its own, so without this a view that throws keeps the fallback
+   * on screen and navigating away cannot escape it. Preferred over remounting
+   * via `key`, which would also discard the children's state on every change
+   * while nothing is wrong.
+   */
+  resetKey: string | number
 }
 
 interface State {
   hasError: boolean
   error: Error | null
+  resetKey: string | number
 }
 
 export class ErrorBoundary extends Component<Props, State> {
-  state: State = { hasError: false, error: null }
+  state: State = { hasError: false, error: null, resetKey: this.props.resetKey }
 
-  static getDerivedStateFromError(error: Error): State {
+  static getDerivedStateFromError(error: Error): Pick<State, 'hasError' | 'error'> {
     return { hasError: true, error }
   }
 
+  static getDerivedStateFromProps(props: Props, state: State): State | null {
+    if (Object.is(props.resetKey, state.resetKey)) return null
+    return { hasError: false, error: null, resetKey: props.resetKey }
+  }
+
   componentDidCatch(error: Error, info: React.ErrorInfo) {
     console.error('[ErrorBoundary]', error, info.componentStack)
   }

package/src/components/ui/UpdateNotification.test.tsx

@@ -0,0 +1,49 @@
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { renderToString } from 'react-dom/server'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+let deploymentMode = 'local'
+
+vi.mock('../../api/client', () => ({
+  useCapabilities: () => ({ data: { deployment: { mode: deploymentMode } } }),
+  useVersionCheck: () => ({
+    data: {
+      currentVersion: '1.2.3',
+      latestVersion: '1.3.0',
+      updateAvailable: true,
+      installMethod: 'direct',
+      releaseUrl: 'https://github.com/skyhook-io/radar/releases/tag/v1.3.0',
+    },
+  }),
+  useStartDesktopUpdate: () => ({ mutate: vi.fn(), isPending: false }),
+  useDesktopUpdateStatus: () => ({ data: undefined }),
+  useApplyDesktopUpdate: () => ({ mutate: vi.fn() }),
+}))
+
+import { UpdateNotification } from './UpdateNotification'
+
+function renderNotification() {
+  const client = new QueryClient()
+  return renderToString(
+    <QueryClientProvider client={client}>
+      <UpdateNotification />
+    </QueryClientProvider>,
+  )
+}
+
+describe('UpdateNotification', () => {
+  beforeEach(() => {
+    deploymentMode = 'local'
+  })
+
+  it('keeps the update popup for local installations', () => {
+    const html = renderNotification()
+    expect(html).toContain('Update Available')
+    expect(html).toContain('1.3.0')
+  })
+
+  it('suppresses the update popup for shared in-cluster viewers', () => {
+    deploymentMode = 'in-cluster'
+    expect(renderNotification()).toBe('')
+  })
+})

package/src/components/ui/UpdateNotification.tsx

@@ -3,6 +3,7 @@ import { Download, X, Copy, Check, RotateCw, ArrowDownToLine, Loader2 } from 'lu
 import { useQueryClient } from '@tanstack/react-query'
 import {
   useVersionCheck,
+  useCapabilities,
   useStartDesktopUpdate,
   useDesktopUpdateStatus,
   useApplyDesktopUpdate,
@@ -14,6 +15,8 @@ const DISMISSED_KEY = 'radar-update-dismissed'
 
 export function UpdateNotification() {
   const queryClient = useQueryClient()
+  const { data: capabilities } = useCapabilities()
+  const deploymentMode = capabilities ? (capabilities.deployment?.mode ?? 'local') : undefined
   const { data: versionInfo } = useVersionCheck()
   const [dismissed, setDismissed] = useState(false)
   const [copied, setCopied] = useState(false)
@@ -98,8 +101,9 @@ export function UpdateNotification() {
     })
   }
 
-  // Don't show if no update available, dismissed, or error
-  if (!versionInfo?.updateAvailable || dismissed) {
+  // Shared in-cluster viewers get a persistent Home notice instead of a
+  // floating action prompt they may not be able to act on.
+  if (!versionInfo?.updateAvailable || dismissed || deploymentMode === undefined || deploymentMode === 'in-cluster' || deploymentMode === 'cloud') {
     return null
   }
 

package/src/components/ui/command-items.ts

@@ -8,7 +8,7 @@ import {
   Activity,
   Sun,
   Stethoscope,
-  DollarSign,
+  Coins,
   Gauge,
   ShieldCheck,
   GitBranch,
@@ -19,15 +19,7 @@ import {
 import { useNamespaces, useContexts } from "../../api/client";
 import { CORE_RESOURCES, useAPIResources } from "../../api/apiResources";
 import { getResourceIcon } from "../../utils/resource-icons";
-import { parseContextName } from "../../utils/context-name";
-
-// Drop the disambiguating " (source)" suffix the context list appends, so the
-// GKE/EKS/AKS parser sees the bare context name (mirrors the cluster picker).
-function stripSourceSuffix(name: string, source?: string): string {
-  if (!source) return name;
-  const escaped = source.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return name.replace(new RegExp(`\\s+\\(${escaped}(?:\\s+#\\d+)?\\)$`), "");
-}
+import { parseContextForSwitcher, parseContextName } from "../../utils/context-name";
 
 export type MainView =
   | "home"
@@ -151,7 +143,7 @@ const VIEW_ENTRIES: {
   { view: "traffic", label: "Live Traffic", icon: Activity, shortcut: "g f" },
   { view: "checks", label: "Checks", icon: ShieldCheck, shortcut: "g u" },
   { view: "capacity", label: "Capacity", icon: Gauge, shortcut: "g p" },
-  { view: "cost", label: "Cost", icon: DollarSign, shortcut: "g c" },
+  { view: "cost", label: "Cost", icon: Coins, shortcut: "g c" },
 ];
 
 // The static command-palette items (Views, Resource Kinds, Contexts,
@@ -204,9 +196,7 @@ export function useCommandItems(cb: CommandItemCallbacks): CommandItem[] {
       // it. Count display names so genuine duplicates (same cluster name from
       // different kubeconfig sources) stay distinguishable; unique ones stay clean.
       const parsedCtx = contexts.map((ctx) => {
-        const parsed = parseContextName(
-          stripSourceSuffix(ctx.name, ctx.source),
-        );
+        const parsed = parseContextForSwitcher(ctx);
         const fromCluster = ctx.cluster ? parseContextName(ctx.cluster) : null;
         const meta = [
           parsed.provider ?? fromCluster?.provider,

package/src/components/workload/WorkloadView.test.ts

@@ -0,0 +1,60 @@
+import { describe, expect, it } from 'vitest'
+
+import { gitOpsOwnerFromRelationships } from '@skyhook-io/k8s-ui'
+import type { Relationships } from '../../types'
+import { findInheritedGitOpsLookupRef } from './WorkloadView'
+
+describe('findInheritedGitOpsLookupRef', () => {
+  it('follows a referenced ReplicaSet to its parent workload for inherited ownership', () => {
+    const relationships: Relationships = {
+      managedBy: [
+        {
+          kind: 'Deployment',
+          group: 'apps',
+          namespace: 'prod',
+          name: 'web',
+        },
+      ],
+    }
+
+    expect(
+      findInheritedGitOpsLookupRef(relationships, null, {
+        kind: 'ReplicaSet',
+        group: 'apps',
+        namespace: 'prod',
+        name: 'web-7b8d9',
+      }),
+    ).toEqual({
+      kind: 'Deployment',
+      group: 'apps',
+      namespace: 'prod',
+      name: 'web',
+    })
+  })
+
+  it('does not fetch a parent when the target has a direct GitOps owner', () => {
+    const relationships: Relationships = {
+      managedBy: [
+        {
+          kind: 'Application',
+          group: 'argoproj.io',
+          namespace: 'argocd',
+          name: 'web',
+        },
+      ],
+    }
+
+    expect(
+      findInheritedGitOpsLookupRef(
+        relationships,
+        gitOpsOwnerFromRelationships(relationships),
+        {
+          kind: 'Deployment',
+          group: 'apps',
+          namespace: 'prod',
+          name: 'web',
+        },
+      ),
+    ).toBeNull()
+  })
+})