@skyhook-io/radar-app 1.12.2 → 1.13.0

package/src/utils/navigation.ts

@@ -1,5 +1,5 @@
 import { apiUrl, getAuthHeaders, getCredentialsMode } from '../api/config'
-import { apiVersionToGroup, kindToPlural } from '@skyhook-io/k8s-ui/utils/navigation'
+import { apiVersionToGroup, kindToPluralWithGroup } from '@skyhook-io/k8s-ui/utils/navigation'
 import type { SelectedResource, Topology } from '@skyhook-io/k8s-ui/types/core'
 import type { SearchHit } from '../api/client'
 
@@ -14,7 +14,7 @@ export function searchHitToSelectedResource(hit: SearchHit): SelectedResource {
 }
 
 // Re-export shared navigation utilities from @skyhook-io/k8s-ui.
-export { kindToPlural, pluralToKind, refToSelectedResource, apiVersionToGroup } from '@skyhook-io/k8s-ui/utils/navigation'
+export { kindToPlural, kindToPluralWithGroup, pluralToKind, refToSelectedResource, apiVersionToGroup } from '@skyhook-io/k8s-ui/utils/navigation'
 export type { NavigateToResource } from '@skyhook-io/k8s-ui/utils/navigation'
 
 const NETWORK_POLICY_TOPOLOGY_KINDS = new Set([
@@ -48,7 +48,7 @@ export function getNetworkPolicyResourceTarget(topology: Topology | null): { kin
 
     const group = networkPolicyGroup(node)
     const target = {
-      kind: kindToPlural(node.kind),
+      kind: kindToPluralWithGroup(node.kind, group ?? ''),
       ...(group ? { group } : {}),
     }
     targets.set(`${target.kind}\u0000${target.group ?? ''}`, target)
@@ -96,13 +96,13 @@ export function resourcePath(resource: SelectedResource): string {
   }
   if (resource.group) params.set('apiGroup', resource.group)
   const query = params.toString()
-  return `/resources/${kindToPlural(resource.kind)}${query ? `?${query}` : ''}`
+  return `/resources/${kindToPluralWithGroup(resource.kind, resource.group ?? '')}${query ? `?${query}` : ''}`
 }
 
 const FULLSCREEN_RESOURCE_KINDS = new Set(['pods', 'deployments', 'statefulsets', 'daemonsets', 'jobs', 'cronjobs', 'nodes'])
 
 export function relatedResourcePath(resource: SelectedResource): string {
-  const apiKind = kindToPlural(resource.kind).toLowerCase()
+  const apiKind = kindToPluralWithGroup(resource.kind, resource.group ?? '').toLowerCase()
   if (FULLSCREEN_RESOURCE_KINDS.has(apiKind)) {
     return buildWorkloadPath({ ...resource, kind: apiKind })
   }

package/src/utils/topology-selection.ts

@@ -1,5 +1,5 @@
 import type { SelectedResource, Topology, TopologyNode } from '@skyhook-io/k8s-ui/types/core'
-import { apiVersionToGroup, kindToPlural } from '@skyhook-io/k8s-ui/utils/navigation'
+import { apiVersionToGroup, kindToPluralWithGroup } from '@skyhook-io/k8s-ui/utils/navigation'
 
 function topologyNodeGroup(node: TopologyNode): string | undefined {
   const apiVersionGroup = apiVersionToGroup(node.data.apiVersion as string | undefined)
@@ -18,10 +18,11 @@ export function findSelectedTopologyNode(
   selectedResource: SelectedResource,
 ): TopologyNode | undefined {
   const namespace = selectedResource.namespace || ''
+  const selectedKind = kindToPluralWithGroup(selectedResource.kind, selectedResource.group ?? '')
   const candidates = topology?.nodes.filter(node =>
     ((node.data.namespace as string) || '') === namespace &&
     node.name === selectedResource.name &&
-    (kindToPlural(node.kind) === selectedResource.kind || node.kind === selectedResource.kind),
+    (kindToPluralWithGroup(node.kind, topologyNodeGroup(node) ?? '') === selectedKind || node.kind === selectedResource.kind),
   ) ?? []
 
   if (candidates.length === 0) return undefined

package/src/utils/version.test.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it } from 'vitest'
+import {
+  getVersionUpdateStatus,
+  IN_CLUSTER_UPGRADE_URL,
+  parseMajorMinor,
+  versionUpdateURL,
+} from './version'
+
+describe('Radar version helpers', () => {
+  it('parses major and minor versions with an optional v prefix', () => {
+    expect(parseMajorMinor('v1.12.3')).toEqual({ major: 1, minor: 12 })
+    expect(parseMajorMinor('dev')).toBeNull()
+  })
+
+  it('grades available updates by distance from the latest release', () => {
+    expect(getVersionUpdateStatus('1.12.0', '1.12.1')).toEqual({ tier: 'patch' })
+    expect(getVersionUpdateStatus('1.11.4', '1.12.1')).toEqual({ tier: 'minor', minorVersionsBehind: 1 })
+    expect(getVersionUpdateStatus('1.10.4', '1.12.1')).toEqual({ tier: 'minor', minorVersionsBehind: 2 })
+    expect(getVersionUpdateStatus('1.9.4', '1.12.1')).toEqual({ tier: 'stale', minorVersionsBehind: 3 })
+    expect(getVersionUpdateStatus('0.12.4', '1.12.1')).toEqual({ tier: 'stale', majorVersionBehind: true })
+    expect(getVersionUpdateStatus('1.12.1-rc.1', '1.12.1')).toEqual({ tier: 'patch' })
+  })
+
+  it('does not flag invalid, current, or newer local builds', () => {
+    expect(getVersionUpdateStatus('dev', '1.12.1')).toEqual({ tier: 'none' })
+    expect(getVersionUpdateStatus('1.12.1', '1.12.1')).toEqual({ tier: 'none' })
+    expect(getVersionUpdateStatus('1.13.0', '1.12.1')).toEqual({ tier: 'none' })
+    expect(getVersionUpdateStatus('2.0.0', '1.12.1')).toEqual({ tier: 'none' })
+  })
+
+  it('routes in-cluster upgrades to instructions instead of release notes', () => {
+    const releaseURL = 'https://github.com/skyhook-io/radar/releases/tag/v1.2.4'
+    expect(versionUpdateURL('in-cluster', releaseURL)).toBe(IN_CLUSTER_UPGRADE_URL)
+    expect(versionUpdateURL('local', releaseURL)).toBe(releaseURL)
+    expect(versionUpdateURL('cloud', releaseURL)).toBeUndefined()
+  })
+})

package/src/utils/version.ts

@@ -0,0 +1,56 @@
+import type { DeploymentMode } from '../types'
+
+export interface MajorMinorVersion {
+  major: number
+  minor: number
+}
+
+export type VersionUpdateTier = 'none' | 'patch' | 'minor' | 'stale'
+
+export interface VersionUpdateStatus {
+  tier: VersionUpdateTier
+  minorVersionsBehind?: number
+  majorVersionBehind?: boolean
+}
+
+export const IN_CLUSTER_UPGRADE_URL = 'https://radarhq.io/docs/configuration/in-cluster'
+
+export function versionUpdateURL(deploymentMode: DeploymentMode, releaseURL?: string): string | undefined {
+  if (deploymentMode === 'cloud') return undefined
+  return deploymentMode === 'in-cluster' ? IN_CLUSTER_UPGRADE_URL : releaseURL
+}
+
+export function parseMajorMinor(version: string): MajorMinorVersion | null {
+  const match = /^v?(\d+)\.(\d+)/.exec(version.trim())
+  if (!match) return null
+  return { major: Number(match[1]), minor: Number(match[2]) }
+}
+
+function parseVersion(version: string): [major: number, minor: number, patch: number, prerelease: boolean] | null {
+  const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(version.trim())
+  if (!match) return null
+  return [Number(match[1]), Number(match[2]), Number(match[3]), !!match[4]]
+}
+
+export function getVersionUpdateStatus(current: string, latest?: string): VersionUpdateStatus {
+  if (!latest) return { tier: 'none' }
+
+  const currentVersion = parseVersion(current)
+  const latestVersion = parseVersion(latest)
+  if (!currentVersion || !latestVersion) return { tier: 'none' }
+
+  const [currentMajor, currentMinor, currentPatch, currentPrerelease] = currentVersion
+  const [latestMajor, latestMinor, latestPatch, latestPrerelease] = latestVersion
+
+  if (latestMajor < currentMajor) return { tier: 'none' }
+  if (latestMajor > currentMajor) return { tier: 'stale', majorVersionBehind: true }
+
+  const minorVersionsBehind = latestMinor - currentMinor
+  if (minorVersionsBehind >= 3) return { tier: 'stale', minorVersionsBehind }
+  if (minorVersionsBehind > 0) return { tier: 'minor', minorVersionsBehind }
+  if (minorVersionsBehind < 0 || latestPatch < currentPatch) return { tier: 'none' }
+  if (latestPatch === currentPatch) {
+    return currentPrerelease && !latestPrerelease ? { tier: 'patch' } : { tier: 'none' }
+  }
+  return { tier: 'patch' }
+}