@skyhook-io/radar-app 1.12.2 → 1.12.3

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/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()
+  })
+})