@skyhook-io/radar-app 1.9.4 → 1.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyhook-io/radar-app",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "description": "Radar's full web UI as a reusable React component. Used by Radar's own binary and by external consumers like Radar Cloud.",
   "repository": {
     "type": "git",

package/src/App.tsx

@@ -9,7 +9,7 @@ import { DebugOverlay } from './components/DebugOverlay'
 import { GlobalDiagnoseButton } from './components/diagnose/LocalDiagnoseAction'
 import { useDiagnoseLayout } from './components/diagnose/DiagnoseContext'
 import { DiagnoseSurface } from './components/diagnose/DiagnoseSurface'
-import { TopologyGraph, TopologySearch, TopologyBreadcrumb, TopologyFilterSidebar, TopologyControls, FreshnessControl, gitOpsRouteForKind, gitOpsRouteForResource, ScopePill, PaneLoader } from '@skyhook-io/k8s-ui'
+import { TopologyGraph, TopologySearch, TopologyBreadcrumb, TopologyFilterSidebar, TopologyControls, FreshnessControl, gitOpsRouteForKind, gitOpsRouteForResource, ScopePill, PaneLoader, assetUrl } from '@skyhook-io/k8s-ui'
 import { initNavigationMap } from '@skyhook-io/k8s-ui/utils/navigation'
 import { useAPIResources, findAPIResourceForRoute } from './api/apiResources'
 import { TimelineView } from './components/timeline/TimelineView'
@@ -33,6 +33,7 @@ import { DockProvider, BottomDock, useDock, useDockReservedHeight, useOpenLocalT
 import { DURATION_DOCK } from '@skyhook-io/k8s-ui/utils/animation'
 import { ContextSwitcher } from './components/ContextSwitcher'
 import { NamespaceSwitcher, type NamespaceSwitcherHandle } from './components/NamespaceSwitcher'
+import { CloudFunnelButton } from './components/CloudFunnelButton'
 import { useNavCustomization } from './context/NavCustomization'
 import type { FleetTakeoverTarget } from './context/NavCustomization'
 import { PrimaryNavRail } from './components/nav/PrimaryNavRail'
@@ -68,6 +69,8 @@ import { type OmnibarHandle } from './components/ui/Omnibar'
 import { RadarOmnibar } from './components/ui/RadarOmnibar'
 import type { ContextSwitcherHandle } from './components/ContextSwitcher'
 
+const radarLogoUrl = assetUrl('/images/radar/radar-icon.svg')
+
 // All possible node kinds (core + GitOps)
 const ALL_NODE_KINDS: NodeKind[] = [
   'Internet', 'Ingress', 'Gateway', 'HTTPRoute', 'GRPCRoute', 'TCPRoute', 'TLSRoute',
@@ -1878,6 +1881,11 @@ function AppInner({ manageDocumentTitle = false, documentTitleSuffix, onClusterL
           {/* AI investigations (self-hides when no agent CLI is present) */}
           <GlobalDiagnoseButton />
 
+          {/* Radar Cloud funnel — OSS-only chrome, same gate as the star.
+              Cloud embeds render chromeless anyway; the explicit gate is
+              belt-and-braces for future chrome-bearing embedders. */}
+          {!navCustomization.embedded && <CloudFunnelButton />}
+
           {/* Local terminal */}
           {capabilities.localTerminal && (
             <Tooltip content="Open local terminal">
@@ -2566,7 +2574,7 @@ function Logo() {
     <div className="flex items-center gap-2.5">
       <div className="relative w-7 h-7 rounded-lg overflow-hidden flex-shrink-0 bg-emerald-500/10 border border-emerald-500/20">
         <img
-          src="/images/radar/radar-icon.svg"
+          src={radarLogoUrl}
           alt=""
           aria-hidden
           className="w-full h-full p-0.5"

package/src/api/client.ts

@@ -1545,6 +1545,190 @@ export function useCapabilities() {
   });
 }
 
+// ============================================================================
+// In-product Cloud Connect (driver lane)
+// ============================================================================
+
+export interface CloudInstallRecoveryGuidance {
+  summary: string
+  lines?: string[]
+  inspect?: string[]
+  clusterUrl?: string
+}
+
+export interface CloudInstallPlanSummary {
+  mode: 'fresh' | 'adopt'
+  contextName: string
+  namespace: string
+  release: string
+  defaultClusterName: string
+  targetChartVersion: string
+  targetAppVersion: string
+  currentChartVersion?: string
+  currentRevision?: number
+  currentImageTag?: string
+  preservedImageRepository?: string
+  uncertainty?: string
+  advisories?: string[]
+  sharedListener?: boolean
+}
+
+export interface CloudInstallConnected {
+  clusterId: string
+  clusterUrl: string
+  trackCommand: string
+  rollback?: CloudInstallRecoveryGuidance
+}
+
+export interface CloudInstallFailure {
+  kind: string
+  message: string
+  guidance?: CloudInstallRecoveryGuidance
+  retrySafe: boolean
+}
+
+export interface CloudInstallBlocked {
+  reason: 'gitops' | 'preflight' | 'unsupported'
+  message: string
+  blocking?: string[]
+}
+
+export type CloudInstallState =
+  | 'idle'
+  | 'preparing'
+  | 'ready'
+  | 'starting'
+  | 'awaiting_approval'
+  | 'provisioning'
+  | 'waiting_tunnel'
+  | 'connected'
+  | 'failed'
+  | 'blocked'
+
+export interface CloudInstallStatus {
+  flowId?: string
+  state: CloudInstallState
+  plan?: CloudInstallPlanSummary
+  clusterName?: string
+  connectUrl?: string
+  connected?: CloudInstallConnected
+  failure?: CloudInstallFailure
+  blocked?: CloudInstallBlocked
+}
+
+export const cloudInstallActive = (state: CloudInstallState | undefined): boolean =>
+  state === 'preparing' ||
+  state === 'ready' ||
+  state === 'starting' ||
+  state === 'awaiting_approval' ||
+  state === 'provisioning' ||
+  state === 'waiting_tunnel';
+
+// Poll while a flow is live so progress renders in near-real-time; the flow
+// itself is server-owned, so this hook merely observes (and re-attaches after
+// a page reload). gcTime 0: never cache connect-flow payloads.
+// What the Hub says about connecting to it. Fetched from the Hub itself, not
+// from Radar's API, so the dialog states current terms instead of whatever was
+// compiled into this binary months ago — a stale free-tier claim is a promise
+// Radar can't keep. Every field is optional and falls back per-field, so a Hub
+// that doesn't serve this (self-hosted, older, offline) renders exactly what
+// Radar renders today.
+export interface CloudConnectInfo {
+  assurances?: string[]
+  notice?: string
+}
+
+// Deliberately a bare cross-origin GET: no credentials, no identifiers, no
+// params. The Hub learns only what any HTTP request reveals.
+export function useCloudConnectInfo(apiUrl: string | undefined, enabled: boolean) {
+  return useQuery<CloudConnectInfo>({
+    queryKey: ["cloud-connect-info", apiUrl],
+    queryFn: async () => {
+      const res = await fetch(`${apiUrl}/api/connect/info`, {
+        credentials: "omit",
+        signal: AbortSignal.timeout(4000),
+      });
+      if (!res.ok) throw new Error(`connect info: ${res.status}`);
+      return res.json();
+    },
+    // No apiUrl means the server decided this deployment must not fetch.
+    enabled: enabled && !!apiUrl,
+    staleTime: 5 * 60 * 1000,
+    retry: false,
+  });
+}
+
+export function useCloudInstallStatus(enabled: boolean) {
+  const queryClient = useQueryClient()
+  const query = useQuery<CloudInstallStatus>({
+    queryKey: ['cloud-install-status'],
+    queryFn: () => fetchJSON('/cloud/install/status'),
+    enabled,
+    gcTime: 0,
+    staleTime: 0,
+    refetchInterval: (q) => (cloudInstallActive(q.state.data?.state) ? 1500 : false),
+  })
+  return {
+    ...query,
+    invalidate: () => queryClient.invalidateQueries({ queryKey: ['cloud-install-status'] }),
+  }
+}
+
+// In-cluster Radar describing its own installation, so the modal can route to
+// the right handoff instead of a generic signup link.
+export interface CloudConnectSelf {
+  ownership: 'helm' | 'gitops' | 'ambiguous' | 'unknown'
+  namespace?: string
+  release?: string
+  deploymentName?: string
+  chart?: string
+  controller?: string
+  wizardUrl?: string
+}
+
+export function useCloudConnectSelf(enabled: boolean) {
+  return useQuery<CloudConnectSelf>({
+    queryKey: ['cloud-connect-self'],
+    queryFn: () => fetchJSON('/cloud/connect/self'),
+    enabled,
+    staleTime: 60000,
+  })
+}
+
+export function prepareCloudInstall(): Promise<CloudInstallStatus> {
+  return fetchJSON('/cloud/install/prepare', { method: 'POST' })
+}
+
+export function startCloudInstall(body: {
+  flowId: string
+  clusterName: string
+  acceptAdoption?: boolean
+  acknowledgeIncompleteDiscovery?: boolean
+  acknowledgeSharedListener?: boolean
+}): Promise<CloudInstallStatus> {
+  return fetchJSON('/cloud/install/start', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(body),
+  })
+}
+
+export function cancelCloudInstall(flowId: string): Promise<CloudInstallStatus> {
+  return fetchJSON('/cloud/install/cancel', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ flowId }),
+  })
+}
+
+export function dismissCloudInstall(flowId: string): Promise<CloudInstallStatus> {
+  return fetchJSON('/cloud/install/dismiss', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ flowId }),
+  })
+}
+
 // Namespace-scoped capabilities. Users with namespace-scoped RoleBindings may
 // have these permissions in specific namespaces.
 export function useNamespaceCapabilities(

package/src/api/config.test.ts

@@ -40,6 +40,25 @@ describe('stripBasename', () => {
     expect(stripBasename('/c/abcdef/resources')).toBe('/c/abcdef/resources')
   })
 
+  // Standalone Radar sets a basename too once --base-path is configured, so the
+  // session-expiry return path round-trips through this in a new shape. Store
+  // strips once (client.ts) and restore strips again defensively (App.tsx) before
+  // navigate() re-applies the basename — the net effect must be the original
+  // route, never a doubled one.
+  it('round-trips a return path under a base path without doubling', () => {
+    setBasename('/radar')
+    const stored = stripBasename('/radar/resources/pods') + '?namespaces=prod'
+    expect(stored).toBe('/resources/pods?namespaces=prod')
+    // Restore side strips a second time; already-relative values are untouched.
+    expect(stripBasename(stored)).toBe('/resources/pods?namespaces=prod')
+  })
+
+  it('leaves a nested base path return path relative', () => {
+    setBasename('/tools/radar')
+    expect(stripBasename('/tools/radar/topology')).toBe('/topology')
+    expect(stripBasename(stripBasename('/tools/radar/topology'))).toBe('/topology')
+  })
+
   it('inverts routePath', () => {
     setBasename('/c/abc')
     expect(stripBasename(routePath('/auth/login'))).toBe('/auth/login')