@skyhook-io/radar-app 1.12.3 → 1.13.1

package/src/components/gitops/GitOpsView.tsx

@@ -25,6 +25,7 @@ import {
   initNavigationMap,
   kindToPluralWithGroup,
   normalizeArgoApplication,
+  normalizeArgoApplicationSet,
   normalizeFluxHelmRelease,
   normalizeFluxKustomization,
   parseArgoRollbackID,
@@ -159,6 +160,7 @@ function GitOpsTableView({ namespaces, onClearNamespaces }: { namespaces: string
 
   const hasGitOpsRowResource = useMemo(() => (
     hasAPIResource(apiResources, 'applications', 'argoproj.io') ||
+    hasAPIResource(apiResources, 'applicationsets', 'argoproj.io') ||
     hasAPIResource(apiResources, 'kustomizations', 'kustomize.toolkit.fluxcd.io') ||
     hasAPIResource(apiResources, 'helmreleases', 'helm.toolkit.fluxcd.io')
   ), [apiResources])
@@ -186,6 +188,7 @@ function GitOpsTableView({ namespaces, onClearNamespaces }: { namespaces: string
     queryKey: ['gitops-rows-main', namespaces, apiResources?.length ?? 0],
     queryFn: async () => {
       const hasApplications = hasAPIResource(apiResources, 'applications', 'argoproj.io')
+      const hasApplicationSets = hasAPIResource(apiResources, 'applicationsets', 'argoproj.io')
       const hasKustomizations = hasAPIResource(apiResources, 'kustomizations', 'kustomize.toolkit.fluxcd.io')
       const hasHelmReleases = hasAPIResource(apiResources, 'helmreleases', 'helm.toolkit.fluxcd.io')
       const hasFluxSources = hasKustomizations || hasHelmReleases
@@ -193,8 +196,9 @@ function GitOpsTableView({ namespaces, onClearNamespaces }: { namespaces: string
       const hasHelmRepos = hasFluxSources && hasAPIResource(apiResources, 'helmrepositories', 'source.toolkit.fluxcd.io')
       const hasOCIRepos = hasFluxSources && hasAPIResource(apiResources, 'ocirepositories', 'source.toolkit.fluxcd.io')
       const hasBuckets = hasFluxSources && hasAPIResource(apiResources, 'buckets', 'source.toolkit.fluxcd.io')
-      const [applications, kustomizations, helmReleases, gitRepos, helmRepos, ociRepos, buckets] = await Promise.all([
+      const [applications, applicationSets, kustomizations, helmReleases, gitRepos, helmRepos, ociRepos, buckets] = await Promise.all([
         hasApplications ? fetchResourceList('applications', 'argoproj.io', namespacesParam) : Promise.resolve([]),
+        hasApplicationSets ? fetchResourceList('applicationsets', 'argoproj.io', namespacesParam) : Promise.resolve([]),
         hasKustomizations ? fetchResourceList('kustomizations', 'kustomize.toolkit.fluxcd.io', namespacesParam) : Promise.resolve([]),
         hasHelmReleases ? fetchResourceList('helmreleases', 'helm.toolkit.fluxcd.io', namespacesParam) : Promise.resolve([]),
         hasGitRepos ? fetchResourceList('gitrepositories', 'source.toolkit.fluxcd.io', '') : Promise.resolve([]),
@@ -205,6 +209,7 @@ function GitOpsTableView({ namespaces, onClearNamespaces }: { namespaces: string
       const fluxSourceUrls = buildFluxSourceUrlMap([...gitRepos, ...helmRepos, ...ociRepos, ...buckets])
       return [
         ...applications.map((r) => normalizeArgoApplication(r)),
+        ...applicationSets.map((r) => normalizeArgoApplicationSet(r)),
         ...kustomizations.map((r) => normalizeFluxKustomization(r, fluxSourceUrls)),
         ...helmReleases.map((r) => normalizeFluxHelmRelease(r, fluxSourceUrls)),
       ]
@@ -462,8 +467,17 @@ function GitOpsDetailView({ namespaces, onOpenResource, onOpenSettings }: GitOps
       // The tree's root node is this page's own subject — clicking it must not
       // open a nested copy of the same detail page (which stacks an identical
       // "GitOps / X / X" breadcrumb, and again, ad infinitum). A self-reference
-      // is a no-op; the header already represents this resource.
+      // opens the standard resource drawer instead, matching how every other
+      // resource in Radar responds to a click — the header already represents
+      // this resource, so a full navigation would be redundant, but a raw
+      // metadata/YAML drawer is not.
       if (detailKind === kind && (ref.namespace || '') === (namespace || '') && ref.name === name) {
+        onOpenResource({
+          kind: kindToPluralWithGroup(ref.kind, ref.group ?? ''),
+          namespace: ref.namespace || '',
+          name: ref.name,
+          group: ref.group,
+        })
         return
       }
       const params = new URLSearchParams()
@@ -555,12 +569,19 @@ function GitOpsDetailView({ namespaces, onOpenResource, onOpenSettings }: GitOps
   // The bulk of the JSX is now in <GitOpsDetailLayout>; this wrapper does
   // the OSS-specific things the layout can't (call OSS-side data hooks,
   // open OSS dialogs, talk to OSS Toast, hit OSS keyboard registry).
+  const isApplicationSet = kind === 'applicationsets'
   const detail: GitOpsDetailMetadata = {
     project: detailRow?.project,
     repository: detailRow?.repository ? formatGitOpsSourceUrl(detailRow.repository) : undefined,
     path: detailRow?.path || undefined,
     chart: detailRow?.chart || undefined,
-    destination: formatGitOpsDestination(detailRow?.destination, detailRow?.destinationNamespace),
+    // An empty destination means "in-cluster" for an Application - that is
+    // Argo's default when the field is unset. For an ApplicationSet it means
+    // the template's destination was a generator placeholder, which is not the
+    // same claim, so the server half is dropped rather than asserted.
+    destination: isApplicationSet && !detailRow?.destination
+      ? (detailRow?.destinationNamespace ? `Namespace: ${detailRow.destinationNamespace}` : '')
+      : formatGitOpsDestination(detailRow?.destination, detailRow?.destinationNamespace),
     autoSyncMode: insightsQ.data?.summary?.autoSyncMode,
   }
 
@@ -920,6 +941,7 @@ function tryParseYaml(value: string): unknown {
 
 function normalizeDetailResource(kind: string, group: string, resource: any): GitOpsRow | null {
   if (kind === 'applications') return normalizeArgoApplication(resource)
+  if (kind === 'applicationsets') return normalizeArgoApplicationSet(resource)
   if (kind === 'kustomizations') return normalizeFluxKustomization(resource)
   if (kind === 'helmreleases') return normalizeFluxHelmRelease(resource)
   const status = getGitOpsResourceStatus(kind, resource)

package/src/components/home/CostCard.tsx

@@ -8,6 +8,7 @@ import {
   formatProjectedMonthlyCost,
   formatProjectedMonthlyRate,
 } from '../cost/format'
+import { costFreshnessLabel } from '../cost/source'
 
 export function CostCard({ onNavigate }: { onNavigate?: () => void }) {
   const { data } = useOpenCostSummary()
@@ -87,13 +88,13 @@ function CostCardContent({ data, onNavigate }: { data: OpenCostSummary; onNaviga
 
         <div className="px-4 py-1.5 border-t border-theme-border/50 flex items-center justify-between">
           <span className="text-[10px] text-theme-text-tertiary">
-            {currency} &middot; projected monthly from {data.window ?? '1h'} window
+            {currency} &middot; projected from {costFreshnessLabel(data.source, data.window, data.dataThrough)}
             {currency !== DEFAULT_COST_CURRENCY && (
               <> &middot; no conversion</>
             )}
           </span>
           <span className="flex items-center gap-1.5 text-[10px] font-semibold uppercase tracking-wider text-accent-text">
-            OpenCost
+            {data.source === 'kubecost' ? 'Kubecost' : 'OpenCost'}
           </span>
         </div>
       </div>

package/src/components/nav/navigation.test.ts

@@ -0,0 +1,26 @@
+import { describe, expect, it, vi } from 'vitest'
+import { navigateFromPrimaryRail } from './navigation'
+
+describe('navigateFromPrimaryRail', () => {
+  it('closes an expanded investigation before showing the selected destination', () => {
+    const calls: string[] = []
+
+    navigateFromPrimaryRail(
+      true,
+      () => calls.push('close'),
+      () => calls.push('navigate'),
+    )
+
+    expect(calls).toEqual(['close', 'navigate'])
+  })
+
+  it('keeps a docked investigation open across sidebar navigation', () => {
+    const close = vi.fn()
+    const navigate = vi.fn()
+
+    navigateFromPrimaryRail(false, close, navigate)
+
+    expect(close).not.toHaveBeenCalled()
+    expect(navigate).toHaveBeenCalledOnce()
+  })
+})

package/src/components/nav/navigation.ts

@@ -0,0 +1,10 @@
+// Sidebar navigation means “show me that destination.” An expanded investigation
+// obscures it, while a docked investigation intentionally stays alongside it.
+export function navigateFromPrimaryRail(
+  expandedInvestigationOpen: boolean,
+  closeDiagnose: () => void,
+  navigate: () => void,
+) {
+  if (expandedInvestigationOpen) closeDiagnose()
+  navigate()
+}

package/src/components/rightsizing/RightsizingScanView.tsx

@@ -33,11 +33,17 @@ import {
   type ResourceSignal,
   type RightsizingActionTone,
 } from './presentation'
+import { useNavCustomization } from '../../context/NavCustomization'
 
 export const RIGHTSIZING_SCAN_DESCRIPTION =
   'Find CPU and memory requests to increase, reduce, or review. Radar never changes them.'
 export const RIGHTSIZING_SCAN_METHODOLOGY =
   'Based on 7 days of history: CPU P95 and memory maximum, plus 15% headroom. Memory reductions require verifiable restart history.'
+export const RIGHTSIZING_METRICS_REQUIRED_TITLE = 'Metrics history is required'
+export const RIGHTSIZING_METRICS_REQUIRED_BODY =
+  'Rightsizing needs 7 days of Kubernetes workload history from a PromQL-compatible metrics backend (Prometheus, VictoriaMetrics, Thanos, or Mimir).\nCost Overview remains available without it.'
+export const RIGHTSIZING_EMBEDDED_METRICS_REQUIRED_BODY =
+  `${RIGHTSIZING_METRICS_REQUIRED_BODY}\nConfigure metrics for this cluster in the host application or Radar deployment.`
 
 export type RightsizingScanSurfaceState =
   | 'discovering'
@@ -97,6 +103,7 @@ const ACTION_META: Record<
 
 export function RightsizingScanView({ namespaces }: RightsizingScanViewProps) {
   useAutoPromConnect()
+  const settingsAvailable = !useNavCustomization().embedded
   const navigate = useNavigate()
   const [params, setParams] = useSearchParams()
   const { data: clusterInfo } = useClusterInfo()
@@ -242,16 +249,33 @@ export function RightsizingScanView({ namespaces }: RightsizingScanViewProps) {
           />
         ) : surfaceState === 'prometheus_required' ? (
           <CenteredState
-            title="Prometheus is required"
-            body="Rightsizing uses Prometheus history. Cost Overview can still use OpenCost independently."
+            title={RIGHTSIZING_METRICS_REQUIRED_TITLE}
+            body={settingsAvailable
+              ? RIGHTSIZING_METRICS_REQUIRED_BODY
+              : RIGHTSIZING_EMBEDDED_METRICS_REQUIRED_BODY}
             action={
-              <button
-                type="button"
-                onClick={() => retryPrometheus()}
-                className="btn-brand px-3 py-1.5 text-xs font-medium"
-              >
-                Check again
-              </button>
+              <div className="flex flex-wrap items-center justify-center gap-3">
+                {settingsAvailable && (
+                  <button
+                    type="button"
+                    onClick={() =>
+                      window.dispatchEvent(
+                        new CustomEvent('radar:open-settings', { detail: { section: 'prometheus' } }),
+                      )
+                    }
+                    className="btn-brand px-4 py-2 text-sm font-medium"
+                  >
+                    Configure metrics
+                  </button>
+                )}
+                <button
+                  type="button"
+                  onClick={() => retryPrometheus()}
+                  className="rounded-lg border border-theme-border px-4 py-2 text-sm font-medium text-theme-text-secondary transition-colors hover:bg-theme-hover hover:text-theme-text-primary"
+                >
+                  Check again
+                </button>
+              </div>
             }
           />
         ) : surfaceState === 'first_run' ? (
@@ -860,15 +884,15 @@ function CenteredState({
   action?: React.ReactNode
 }) {
   return (
-    <div className="flex min-h-48 items-center justify-center rounded-xl border border-theme-border bg-theme-surface">
-      <div className="flex max-w-lg flex-col items-center px-6 text-center">
+    <div className="flex min-h-56 items-center justify-center rounded-xl border border-theme-border bg-theme-surface px-6 py-8">
+      <div className="flex w-full max-w-xl flex-col items-center text-center">
         {loading ? (
           <Loader2 className="h-8 w-8 animate-spin text-theme-text-tertiary" />
         ) : (
           <Gauge className="h-8 w-8 text-theme-text-tertiary" />
         )}
         <h2 className="mt-3 text-base font-semibold text-theme-text-primary">{title}</h2>
-        <p className="mt-1 text-sm text-theme-text-secondary">{body}</p>
+        <p className="mt-1 whitespace-pre-line text-sm text-theme-text-secondary">{body}</p>
         {action && <div className="mt-4">{action}</div>}
       </div>
     </div>

package/src/components/rightsizing/copy.test.ts

@@ -1,6 +1,9 @@
 import { describe, expect, it } from 'vitest'
 import {
   getRightsizingScanSurfaceState,
+  RIGHTSIZING_EMBEDDED_METRICS_REQUIRED_BODY,
+  RIGHTSIZING_METRICS_REQUIRED_BODY,
+  RIGHTSIZING_METRICS_REQUIRED_TITLE,
   RIGHTSIZING_SCAN_DESCRIPTION,
   RIGHTSIZING_SCAN_METHODOLOGY,
 } from './RightsizingScanView'
@@ -17,6 +20,22 @@ describe('rightsizing scan copy', () => {
     expect(copy.toLowerCase()).not.toContain('savings')
   })
 
+  it('describes the metrics contract without assuming one provider or cost source', () => {
+    const copy = `${RIGHTSIZING_METRICS_REQUIRED_TITLE} ${RIGHTSIZING_METRICS_REQUIRED_BODY}`
+    expect(copy).toContain('Metrics history')
+    expect(copy).toContain('PromQL-compatible metrics backend')
+    expect(copy).toContain('7 days')
+    expect(copy).toContain('Prometheus, VictoriaMetrics, Thanos, or Mimir')
+    expect(RIGHTSIZING_METRICS_REQUIRED_BODY).toContain('\nCost Overview')
+    expect(copy).not.toContain('OpenCost')
+    expect(copy).not.toContain('Kubecost')
+  })
+
+  it('routes embedded configuration through the host instead of standalone Settings', () => {
+    expect(RIGHTSIZING_EMBEDDED_METRICS_REQUIRED_BODY).toContain('host application')
+    expect(RIGHTSIZING_EMBEDDED_METRICS_REQUIRED_BODY).not.toContain('Settings')
+  })
+
   it('retains a prior snapshot after a failed rerun but treats a first-run failure as fatal', () => {
     expect(
       getRightsizingScanSurfaceState({