@skyhook-io/radar-app 1.16.3 → 1.17.1

package/src/components/resource/WorkloadMetricsHelpDialog.test.tsx

@@ -35,7 +35,9 @@ describe('Metrics help', () => {
     expect(html).toContain('--prometheus-single-cluster')
     expect(html).toContain('they do not add missing metrics')
     expect(html).toContain('Leave both unset for automatic matching')
-    expect(html).toContain('it does not scope rightsizing')
+    expect(html).toContain('It does not scope rightsizing')
+    expect(html).toContain('Pod comparison and PVC usage')
+    expect(html).toContain('labels must exist on the kubelet volume stats')
     expect(html).toContain('Standalone CLI:')
     expect(html).toContain('when starting Radar')
     expect(html).toContain('traffic.prometheusSingleCluster')

package/src/components/resource/WorkloadMetricsHelpDialog.tsx

@@ -133,7 +133,7 @@ export function WorkloadMetricsHelpContent({ data, pending, error }: Pick<Props,
           <div><dt className="font-medium">Backend dedicated to this cluster</dt><dd><code className="break-all font-mono text-xs">--prometheus-single-cluster</code><p className="mt-1">Helm: <code className="break-all font-mono text-xs">traffic.prometheusSingleCluster: true</code></p></dd></div>
           <div><dt className="font-medium">Shared backend with a cluster label</dt><dd><code className="break-all font-mono text-xs">--prometheus-cluster-label cluster=your-cluster</code><p className="mt-1">Helm: set the backend’s actual label and value in <code className="break-all font-mono text-xs">traffic.prometheusClusterLabels</code>.</p></dd></div>
         </dl>
-        <p>Leave both unset for automatic matching. An override replaces automatic matching for workload requests, resources, history and Pod comparison only; it does not scope rightsizing or other metrics features.</p>
+        <p>Leave both unset for automatic matching. An override replaces automatic matching for workload requests, resources, history, Pod comparison and PVC usage. For PVC usage, its labels must exist on the kubelet volume stats. It does not scope rightsizing, node/HPA or legacy network/storage metrics.</p>
         <h4 className="font-medium text-theme-text-primary">Operator configuration</h4>
         <p><strong className="font-medium">Standalone CLI:</strong> supply the flag when starting Radar. Overrides are not saved; after changing the cluster, backend or credentials, verify the new scope before restarting with a fresh override.</p>
         <p><strong className="font-medium">In-cluster OSS or Radar Cloud:</strong> ask the installation’s operator to update its Helm values or GitOps configuration. These are shared backend settings, not viewer preferences.</p>

package/src/components/resources/CompositeRenderer.tsx

@@ -12,7 +12,7 @@ import {
   type CrossplaneResourceRef,
 } from '@skyhook-io/k8s-ui/components/resources/resource-utils-crossplane'
 import { getResourceStatus } from '@skyhook-io/k8s-ui'
-import { kindToPlural } from '@skyhook-io/k8s-ui/utils/navigation'
+import { kindToPluralWithGroup } from '@skyhook-io/k8s-ui/utils/navigation'
 import type { ResourceRef as NavRef } from '../../types'
 import { fetchJSON, ApiError } from '../../api/client'
 
@@ -59,8 +59,8 @@ export function CompositeRenderer({ data, onNavigate }: CompositeRendererProps)
     ],
     queryFn: async () => {
       const ns = boundXRRef!.namespace || '_'
-      const plural = kindToPlural(boundXRRef!.kind)
       const group = groupFromApiVersion(boundXRRef!.apiVersion)
+      const plural = kindToPluralWithGroup(boundXRRef!.kind, group)
       const query = group ? `?group=${encodeURIComponent(group)}` : ''
       return fetchJSON<{ resource: any }>(`/resources/${plural}/${ns}/${boundXRRef!.name}${query}`)
     },
@@ -99,7 +99,7 @@ export function CompositeRenderer({ data, onNavigate }: CompositeRendererProps)
         queryKey: ['composed-ref', group, ref.kind, ref.namespace ?? '', ref.name],
         queryFn: async () => {
           const ns = ref.namespace || '_'
-          const plural = kindToPlural(ref.kind)
+          const plural = kindToPluralWithGroup(ref.kind, group)
           const query = group ? `?group=${encodeURIComponent(group)}` : ''
           return fetchJSON<{ resource: any }>(`/resources/${plural}/${ns}/${ref.name}${query}`)
         },
@@ -137,7 +137,7 @@ export function CompositeRenderer({ data, onNavigate }: CompositeRendererProps)
         map.set(key, { ref, missing: true })
         return
       }
-      const status = getResourceStatus(kindToPlural(ref.kind), q.data.resource) ?? undefined
+      const status = getResourceStatus(kindToPluralWithGroup(ref.kind, groupFromApiVersion(ref.apiVersion)), q.data.resource) ?? undefined
       map.set(key, {
         ref,
         status: status ? { ...status, level: (status as any).level ?? 'unknown' } : undefined,

package/src/components/resources/ResourceDetailDrawer.tsx

@@ -1,7 +1,7 @@
 import { ResourceDetailDrawer as BaseResourceDetailDrawer } from '@skyhook-io/k8s-ui'
 import type { SelectedResource } from '../../types'
 import { WorkloadView } from '../workload/WorkloadView'
-import { CNPGDrawerTrailBack } from '../cnpg/CNPGDrawerTrail'
+import { ResourceDrawerNavigation } from '../../integrations/resourceHosts'
 
 interface ResourceDetailDrawerProps {
   resource: SelectedResource
@@ -33,7 +33,7 @@ export function ResourceDetailDrawer(props: ResourceDetailDrawerProps) {
     <BaseResourceDetailDrawer {...props}>
       {({ resource, expanded, active, initialTab, onClose, onExpand, onExpandIntent, onCancelExpandIntent, onBack, onNavigateToResource, onCollapseToDrawer }) => (
         <div className="flex h-full min-h-0 flex-col">
-        {!expanded && <CNPGDrawerTrailBack resource={resource} />}
+        {!expanded && <ResourceDrawerNavigation resource={resource} />}
         <div className="min-h-0 flex-1">
         <WorkloadView
           kind={resource.kind}

package/src/components/resources/ResourcesView.tsx

@@ -1,4 +1,4 @@
-import { useState, useMemo, useCallback, useEffect } from 'react'
+import { useState, useMemo, useCallback } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 import { useQuery } from '@tanstack/react-query'
 import { ApiError, debugNamespaceLog, fetchJSON, isForbiddenError, isKindSyncFailed, isStillLoadingError, useCapabilities, useNamespaceCapabilities, useResources, useSecretCertExpiry, useTopPodMetrics, useTopNodeMetrics, useBulkDeleteResources, useBulkRestartWorkloads, useBulkScaleWorkloads, useAudit } from '../../api/client'
@@ -8,10 +8,11 @@ import { apiUrl, getAuthHeaders, getCredentialsMode, stripBasename } from '../..
 import { readErrorBody } from '../../api/httpErrors'
 import { useAPIResources } from '../../api/apiResources'
 import { useConnection } from '../../context/ConnectionContext'
-import { initNavigationMap, getSecretStoreProviderType } from '@skyhook-io/k8s-ui'
+import { getSecretStoreProviderType } from '@skyhook-io/k8s-ui'
 import { usePinnedKinds } from '../../hooks/useFavorites'
 import { useResourceCounts } from '../../hooks/useResourceCounts'
 import { useCNPGSidebarWorkspace } from '../cnpg/useCNPGSidebarWorkspace'
+import { renderResourceKindList, resourceKindListMode, useResourceHostFeatures } from '../../integrations/resourceHosts'
 import { useOpenLogs, useOpenWorkloadLogs } from '../dock'
 import {
   canBulkRestartKind,
@@ -35,6 +36,9 @@ interface ResourcesViewProps {
   onResourceClickYaml?: NavigateToResource
   onKindChange?: () => void
   onClearNamespaces?: () => void
+  rememberedKindSearch?: (kind: { name: string; group: string }) => string | undefined
+  onKindFiltersChange?: (kind: { name: string; group: string }, search: string) => void
+  onApplyNamespacesToAllSections?: (namespaces: string[]) => Promise<unknown> | void
 }
 
 type SelectedKindInfo = { name: string; kind: string; group: string } | null
@@ -70,12 +74,13 @@ function hasResourceCount(counts: Record<string, number> | undefined, key: strin
   return Object.prototype.hasOwnProperty.call(counts ?? {}, key)
 }
 
-export function ResourcesView({ namespaces, selectedResource, onResourceClick, onResourceClickYaml, onKindChange, onClearNamespaces }: ResourcesViewProps) {
+export function ResourcesView({ namespaces, selectedResource, onResourceClick, onResourceClickYaml, onKindChange, onClearNamespaces, rememberedKindSearch, onKindFiltersChange, onApplyNamespacesToAllSections }: ResourcesViewProps) {
   const location = useLocation()
   const navigate = useNavigate()
   const { connection } = useConnection()
 
-  const { data: capabilities } = useCapabilities()
+  const { data: capabilities, isPending: capabilitiesPending } = useCapabilities()
+  const hostFeatures = useResourceHostFeatures()
   const namespaceForCapabilities = namespaces.length === 1 ? namespaces[0] : undefined
   const { data: namespaceCapabilities } = useNamespaceCapabilities(namespaceForCapabilities, capabilities)
   const namespaceCapabilityNames = useMemo(() => namespaces.length > 1 ? [...namespaces].sort() : [], [namespaces])
@@ -104,15 +109,9 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
   // API resources discovery
   const { data: apiResources } = useAPIResources()
 
-  // Initialize navigation kind↔plural maps from discovered API resources
-  useEffect(() => {
-    if (apiResources) initNavigationMap(apiResources)
-  }, [apiResources])
-
-  const cnpgSidebarWorkspace = useCNPGSidebarWorkspace({ apiResources, namespaces })
-
   // Track the selected kind from the k8s-ui component
   const [selectedKind, setSelectedKind] = useState<SelectedKindInfo>(null)
+  const cnpgSidebarWorkspace = useCNPGSidebarWorkspace({ apiResources, namespaces, withMetrics: selectedKind?.group === 'postgresql.cnpg.io' })
   const workloadWrites = namespaces.length === 0
     ? capabilities?.workloadWrites
     : namespaces.length === 1
@@ -281,7 +280,7 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
         printerTable: sanitizePrinterTable(body),
       }
     },
-    enabled: !!selectedKind && !selectedKindQueryBlocked,
+    enabled: !!selectedKind && !selectedKindQueryBlocked && resourceKindListMode(selectedKind, hostFeatures, capabilitiesPending) === 'table',
     staleTime: 30000,
     refetchInterval: 120000, // Safety net — SSE k8s_event drives near-real-time invalidation
     retry: (failureCount: number, error: Error) => {
@@ -385,6 +384,17 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
     setCreateDialogOpen(true)
   }, [])
 
+  const renderKindView = useCallback(
+    (kind: SelectedKindInfo) => renderResourceKindList(kind, hostFeatures, capabilitiesPending, {
+      namespaces,
+      inspected: selectedResource ?? null,
+      onInspect: (resource) => onResourceClick?.(resource),
+      onClearNamespaces: onClearNamespaces ?? (() => {}),
+      onCreate: handleCreateResource,
+    }),
+    [hostFeatures, capabilitiesPending, namespaces, selectedResource, onResourceClick, onClearNamespaces, handleCreateResource],
+  )
+
   return (
     <>
     <BaseResourcesView
@@ -395,6 +405,9 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
       onResourceClickYaml={onResourceClickYaml}
       onKindChange={onKindChange}
       onClearNamespaces={onClearNamespaces}
+      rememberedKindSearch={rememberedKindSearch}
+      onKindFiltersChange={onKindFiltersChange}
+      onApplyNamespacesToAllSections={onApplyNamespacesToAllSections}
       // Injected data
       apiResources={apiResources}
       // Lightweight counts for sidebar (replaces 233 parallel queries)
@@ -434,6 +447,7 @@ export function ResourcesView({ namespaces, selectedResource, onResourceClick, o
       onOpenWorkloadLogs={openWorkloadLogs}
       // Create resource
       onCreateResource={handleCreateResource}
+      renderKindView={renderKindView}
       // Bulk operations
       onBulkDelete={(items, options) => bulkDeleteMutation.mutate({ items, force: options?.force }, { onSuccess: options?.onSuccess })}
       isBulkDeleting={bulkDeleteMutation.isPending}

package/src/components/resources/renderers/KyvernoPolicyQueued.tsx

@@ -7,6 +7,7 @@ import { formatAge } from '@skyhook-io/k8s-ui/components/resources/resource-util
 import { isForbiddenError } from '../../../api/client'
 import { isKyvernoMutateExistingEnabled } from '@skyhook-io/k8s-ui/components/resources/resource-utils-kyverno-modern'
 import { usePolicyQueued } from '../../../api/policy'
+import { TimeValue } from '@skyhook-io/k8s-ui/components/ui/ScheduleValue'
 
 /** A request sitting this long is not mid-flight. Kyverno retries on every
  *  reconcile, so past this point a backlog grows rather than drains. */
@@ -160,7 +161,7 @@ export function KyvernoPolicyQueued({ data }: { data: any }) {
             />
           ))}
           {oldestPending && (
-            <Property label="Oldest Pending" value={`${formatAge(oldestPending)} ago`} />
+            <Property label="Oldest Pending" value={<TimeValue timestamp={oldestPending} />} />
           )}
         </PropertyList>
         {messages.length > 0 && (

package/src/components/resources/renderers/NodeRenderer.tsx

@@ -1,6 +1,7 @@
 import { NodeRenderer as BaseNodeRenderer } from '@skyhook-io/k8s-ui/components/resources/renderers/NodeRenderer'
 import { useNavigate } from 'react-router-dom'
-import { getVisibleLiveMetrics, isLiveMetricsUnavailable, shouldFetchLiveMetrics, useNodeMetrics, useNodeMetricsHistory, usePrometheusResourceMetrics, usePrometheusStatus } from '../../../api/client'
+import { getVisibleLiveMetrics, isLiveMetricsUnavailable, shouldFetchLiveMetrics, useNodeRemovalPlan, useNodeMetrics, useNodeMetricsHistory, usePrometheusResourceMetrics, usePrometheusStatus } from '../../../api/client'
+import { getNodeLifecycle } from '@skyhook-io/k8s-ui/utils/node-lifecycle'
 import { serializeColumnFilters } from '../resource-utils'
 
 interface NodeRendererProps {
@@ -11,6 +12,8 @@ interface NodeRendererProps {
 export function NodeRenderer({ data, relationships }: NodeRendererProps) {
   const navigate = useNavigate()
   const nodeName = data.metadata?.name
+  const lifecycle = getNodeLifecycle(data)
+  const removalPlan = useNodeRemovalPlan(nodeName, lifecycle.removing)
 
   // Fetch node metrics
   const metricsHistoryQuery = useNodeMetricsHistory(nodeName)
@@ -35,6 +38,9 @@ export function NodeRenderer({ data, relationships }: NodeRendererProps) {
   return (
     <BaseNodeRenderer
       data={data}
+      removalPlan={removalPlan.data}
+      removalPlanLoading={removalPlan.isLoading}
+      removalPlanError={removalPlan.error?.message}
       relationships={relationships}
       onViewPods={nodeName ? () => {
         const params = new URLSearchParams()

package/src/components/resources/renderers/ServiceRenderer.test.tsx

@@ -0,0 +1,81 @@
+import { renderToStaticMarkup } from 'react-dom/server'
+import { beforeEach, expect, it, vi } from 'vitest'
+import { RadarFeatureUnsupportedError } from '../../../api/radarFeatures'
+import { ServiceRenderer } from './ServiceRenderer'
+
+const mock = vi.hoisted(() => ({
+  serviceQuery: {} as any,
+  namespaceQuery: {} as any,
+  serviceReads: [] as any[],
+  namespaceReads: [] as any[],
+}))
+vi.mock('../../../api/client', () => ({
+  useServiceEndpointSlices: (...args: any[]) => { mock.serviceReads.push(args); return mock.serviceQuery },
+  useResources: (...args: any[]) => { mock.namespaceReads.push(args); return mock.namespaceQuery },
+}))
+vi.mock('../../../contexts/CapabilitiesContext', () => ({ useNamespacedCapabilities: () => ({ canPortForward: false }), useIsLocalDeployment: () => true }))
+vi.mock('../../portforward/PortForwardButton', () => ({ PortForwardInlineButton: () => null }))
+vi.mock('../../curl/ServiceCurlButton', () => ({ CurlButton: () => null, CurlPanel: () => null, isHttpishPort: () => false, defaultScheme: () => '', defaultPathForPort: () => '' }))
+
+const service = { apiVersion: 'v1', kind: 'Service', metadata: { name: 'web', namespace: 'team' }, spec: { selector: { app: 'web' } } }
+const selectorless = { ...service, spec: {} }
+const slice = (name: string, labels?: Record<string, string>) => ({ apiVersion: 'discovery.k8s.io/v1', kind: 'EndpointSlice', metadata: { namespace: 'team', name, labels } })
+const render = (data: any = service) => renderToStaticMarkup(<ServiceRenderer data={data} onCopy={() => {}} copied={null} />)
+const unsupported = () => new RadarFeatureUnsupportedError('serviceEndpointSlices', { currentVersion: 'v1.7.0' })
+
+beforeEach(() => {
+  mock.serviceQuery = {}
+  mock.namespaceQuery = {}
+  mock.serviceReads = []
+  mock.namespaceReads = []
+})
+
+it('renders the server-selected slices for a selector Service without listing the namespace', () => {
+  mock.serviceQuery = { data: { items: [slice('web-abc', { 'kubernetes.io/service-name': 'web' })], truncated: false } }
+  const html = render()
+  expect(mock.serviceReads[0]).toEqual(['team', 'web', true])
+  expect(mock.namespaceReads[0][3].enabled).toBe(false)
+  expect(html).toContain('EndpointSlices')
+  expect(html).toContain('web-abc')
+  expect(html).not.toContain('Showing the first')
+})
+
+it('says when the server cut the inventory off', () => {
+  mock.serviceQuery = { data: { items: [slice('web-abc')], truncated: true } }
+  expect(render()).toContain('Showing the first 1 EndpointSlices.')
+})
+
+it('surfaces a failed lookup instead of an empty inventory', () => {
+  mock.serviceQuery = { error: new Error('insufficient permissions to list endpointslices') }
+  const html = render()
+  expect(html).toContain('EndpointSlice inventory unavailable')
+  expect(html).toContain('insufficient permissions to list endpointslices')
+  expect(html).not.toContain('No EndpointSlices found')
+})
+
+it('does not query slices for ExternalName Services', () => {
+  const html = render({ ...service, spec: { type: 'ExternalName', externalName: 'example.org' } })
+  expect(mock.serviceReads[0][2]).toBe(false)
+  expect(mock.namespaceReads[0][3].enabled).toBe(false)
+  expect(html).not.toContain('EndpointSlices')
+})
+
+it('falls back to the label-filtered namespace list for selector-less Services on an older Radar', () => {
+  mock.serviceQuery = { error: unsupported() }
+  mock.namespaceQuery = { data: [
+    slice('manual-abc', { 'kubernetes.io/service-name': 'web' }),
+    slice('other-abc', { 'kubernetes.io/service-name': 'other' }),
+  ] }
+  const html = render(selectorless)
+  expect(mock.namespaceReads[0]).toEqual(['endpointslices', 'team', 'discovery.k8s.io', { enabled: true, refetchInterval: 30000 }])
+  expect(html).toContain('manual-abc')
+  expect(html).not.toContain('other-abc')
+  expect(html).not.toContain('EndpointSlice inventory unavailable')
+})
+
+it('keeps selector Services free of slice lookups on an older Radar', () => {
+  mock.serviceQuery = { error: unsupported() }
+  const html = render()
+  expect(mock.namespaceReads[0][3].enabled).toBe(false)
+  expect(html).not.toContain('EndpointSlices')
+})

package/src/components/resources/renderers/ServiceRenderer.tsx

@@ -2,7 +2,8 @@ import { useMemo, useState, useCallback } from 'react'
 import { ServiceRenderer as BaseServiceRenderer } from '@skyhook-io/k8s-ui/components/resources/renderers/ServiceRenderer'
 import { PortForwardInlineButton } from '../../portforward/PortForwardButton'
 import { CurlButton, CurlPanel, isHttpishPort, defaultScheme, defaultPathForPort } from '../../curl/ServiceCurlButton'
-import { useResources } from '../../../api/client'
+import { useResources, useServiceEndpointSlices } from '../../../api/client'
+import { isRadarFeatureUnsupported } from '../../../api/radarFeatures'
 import { useNamespacedCapabilities, useIsLocalDeployment } from '../../../contexts/CapabilitiesContext'
 import type { ResourceRef } from '../../../types'
 import { DURATION_DISCLOSURE } from '@skyhook-io/k8s-ui/utils/animation'
@@ -36,21 +37,22 @@ export function ServiceRenderer({ data, onCopy, copied, onNavigate }: ServiceRen
     window.setTimeout(() => setCurl((p) => (p?.closing ? null : p)), DURATION_DISCLOSURE + 20)
   }, [])
   const spec = data.spec || {}
-  const shouldLoadEndpointSlices = Boolean(
-    namespace &&
-    serviceName &&
-    spec.type !== 'ExternalName' &&
-    (!spec.selector || Object.keys(spec.selector).length === 0)
-  )
-  const { data: endpointSlices, isLoading: endpointSlicesLoading } = useResources<any>(
+  const hasNoSelector = !spec.selector || Object.keys(spec.selector).length === 0
+  const canListEndpointSlices = Boolean(namespace && serviceName && spec.type !== 'ExternalName')
+  const serviceSlices = useServiceEndpointSlices(namespace, serviceName, canListEndpointSlices)
+  // A Radar without the per-Service endpoint keeps its earlier behavior: only
+  // selector-less Services list the namespace's slices and filter them here.
+  const legacy = isRadarFeatureUnsupported(serviceSlices.error, 'serviceEndpointSlices')
+  const shouldLoadNamespaceSlices = canListEndpointSlices && hasNoSelector && legacy
+  const { data: namespaceSlices, isLoading: namespaceSlicesLoading, error: namespaceSlicesError } = useResources<any>(
     'endpointslices',
     namespace,
     'discovery.k8s.io',
-    { enabled: shouldLoadEndpointSlices, refetchInterval: 30000 }
+    { enabled: shouldLoadNamespaceSlices, refetchInterval: 30000 }
   )
-  const matchingEndpointSlices = useMemo(
-    () => (endpointSlices || []).filter((slice: any) => slice.metadata?.labels?.['kubernetes.io/service-name'] === serviceName),
-    [endpointSlices, serviceName]
+  const matchingNamespaceSlices = useMemo(
+    () => (namespaceSlices || []).filter((slice: any) => slice.metadata?.labels?.['kubernetes.io/service-name'] === serviceName),
+    [namespaceSlices, serviceName]
   )
 
   return (
@@ -58,8 +60,11 @@ export function ServiceRenderer({ data, onCopy, copied, onNavigate }: ServiceRen
       data={data}
       onCopy={onCopy}
       copied={copied}
-      endpointSlices={matchingEndpointSlices}
-      endpointSlicesLoading={endpointSlicesLoading}
+      endpointSlices={legacy ? matchingNamespaceSlices : serviceSlices.data?.items}
+      endpointSlicesLoading={legacy ? namespaceSlicesLoading : serviceSlices.isLoading}
+      endpointSlicesEnabled={!legacy && canListEndpointSlices}
+      endpointSlicesError={(legacy ? namespaceSlicesError : serviceSlices.error)?.message}
+      endpointSlicesTruncated={!legacy && serviceSlices.data?.truncated}
       onNavigate={onNavigate}
       renderPortAction={({ port, name, appProtocol, protocol }) => (
         <>

package/src/components/settings/LocalIntegrationStatus.test.tsx

@@ -0,0 +1,52 @@
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, it, vi } from 'vitest'
+import type { useArgoStatus } from '../../api/client'
+import type { IntegrationProfile } from './LocalConnectionSettings'
+import { LocalIntegrationStatus } from './LocalIntegrationStatus'
+
+vi.mock('../../api/client', () => ({
+  usePrometheusStatus: () => ({}),
+  useOpenCostSummary: () => ({}),
+}))
+
+const profile: IntegrationProfile = {
+  target: {
+    binding: 'opaque',
+    context: 'development',
+    source: '/configs/team',
+    inFileName: 'dev',
+    fingerprint: 'target',
+    clientGeneration: 1,
+    operationGeneration: 1,
+    identity: { server: 'https://kubernetes', user: 'developer', trust: 'trust', insecureTls: false },
+  },
+  revision: 'revision',
+  state: 'saved',
+  mode: 'auto',
+  url: '',
+  headerKeys: [],
+  envHeaderKeys: [],
+  headersManaged: false,
+  secretSet: true,
+  insecureTls: false,
+  clusterId: '',
+}
+
+const render = (data: Record<string, unknown>) => {
+  const argo = { data, isError: false, isPlaceholderData: false, isFetching: false, dataUpdatedAt: 1, errorUpdatedAt: 0 } as unknown as ReturnType<typeof useArgoStatus>
+  return renderToStaticMarkup(<LocalIntegrationStatus kind="argocd" profile={profile} argo={argo} busy={false} changedAt={0} />)
+}
+
+describe('LocalIntegrationStatus for Argo CD', () => {
+  it('says Connecting while the first connection is being made', () => {
+    const html = render({ configured: true, connected: false, connecting: true })
+    expect(html).toContain('Connecting…')
+    expect(html).not.toContain('Not connected')
+  })
+
+  it('shows why the last read failed on a working connection', () => {
+    const html = render({ configured: true, connected: true, address: 'https://argocd', reason: "Radar's last read from Argo CD failed: the request timed out." })
+    expect(html).toContain('Connected')
+    expect(html).toContain('the request timed out')
+  })
+})

package/src/components/settings/LocalIntegrationStatus.tsx

@@ -26,13 +26,12 @@ export function LocalIntegrationStatus({ kind, profile, argo, busy, changedAt }:
       status = prom.data.connected ? 'Connected' : prom.data.discovering ? 'Discovering…' : 'Not connected'
       detail = prom.data.connected ? !profile.url ? `Discovered: ${prom.data.address}` : undefined : prom.data.error
     } else if (kind === 'argocd' && argo.data) {
-      status = argo.data.connected ? argo.data.anonymous ? 'Connected · no token needed' : 'Connected' : 'Not connected'
-      detail = argo.data.connected ? !profile.url ? `Discovered: ${argo.data.address}` : undefined : argo.data.reason
+      status = argo.data.connected ? argo.data.anonymous ? 'Connected · no token needed' : 'Connected' : argo.data.connecting ? 'Connecting…' : 'Not connected'
+      detail = argo.data.reason ?? (argo.data.connected && !profile.url ? `Discovered: ${argo.data.address}` : undefined)
     } else if (kind === 'cost' && cost.data) {
       status = cost.data.available ? `Available · ${costSourceLabel(cost.data.source)}`
         : ['no_prometheus', 'no_cost_source', 'no_metrics'].includes(cost.data.reason ?? '') ? 'No cost data' : 'Unavailable'
-      detail = cost.data.reason ? costIntegrationUnavailableMessage(cost.data.reason)
-        ?? (cost.data.reason === 'query_error' ? 'The active cost source query failed.' : undefined) : undefined
+      detail = cost.data.reason ? costIntegrationUnavailableMessage(cost.data.reason) : undefined
     }
   }
   const lastDetail = useRef({ text: detail, visible: !!detail })