@skyhook-io/radar-app 1.14.4 → 1.14.6

package/src/components/dock/WorkloadLogsTab.test.tsx

@@ -0,0 +1,66 @@
+// @vitest-environment jsdom
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { WorkloadLogsTab } from './WorkloadLogsTab'
+
+const state = vi.hoisted(() => ({ targets: [] as Array<{ kind: string; name: string; role?: string; snapshotOnly?: boolean }> }))
+vi.mock('../../api/client', () => ({
+  useResource: (_kind: string, _namespace: string, name: string) => ({
+    data: { metadata: { uid: name }, spec: { replicatedJobs: [{ name: name === 'first' ? 'workers' : 'leader' }] } },
+  }),
+  useWorkloadRuns: (_kind: string, namespace: string, name: string) => ({
+    data: { collection: 'members', runs: [{ group: 'batch', kind: 'jobs', namespace, name: `${name}-0`, phase: 'Running', active: true }], total: 1 },
+  }),
+}))
+vi.mock('../logs/WorkloadLogsViewer', () => ({
+  WorkloadLogsViewer: (props: { kind: string; name: string; role?: string; snapshotOnly?: boolean }) => {
+    state.targets.push(props)
+    return <div data-log-target={`${props.kind}/${props.name}`} />
+  },
+}))
+
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
+let root: Root
+let element: HTMLDivElement
+beforeEach(() => {
+  state.targets = []
+  element = document.createElement('div')
+  document.body.appendChild(element)
+  root = createRoot(element)
+})
+afterEach(async () => {
+  await act(async () => root.unmount())
+  element.remove()
+})
+async function render(name: string, kind = 'JobSet') {
+  await act(async () => root.render(<WorkloadLogsTab namespace="training" workloadKind={kind} workloadName={name} />))
+}
+
+describe('dock JobSet logs', () => {
+  it.each(['JobSet', 'jobsets'])('routes %s to selected member logs and supports role snapshots', async kind => {
+    await render('first', kind)
+    expect(element.querySelector('[data-log-target="jobs/first-0"]')).not.toBeNull()
+    const scope = element.querySelector<HTMLSelectElement>('#jobset-log-scope')!
+    await act(async () => {
+      scope.value = 'role'
+      scope.dispatchEvent(new Event('change', { bubbles: true }))
+    })
+    expect(state.targets.at(-1)).toMatchObject({ kind: 'jobsets', name: 'first', role: 'workers', snapshotOnly: true })
+  })
+
+  it('resets aggregate scope and role before rendering another JobSet log source', async () => {
+    await render('first')
+    const scope = element.querySelector<HTMLSelectElement>('#jobset-log-scope')!
+    await act(async () => {
+      scope.value = 'role'
+      scope.dispatchEvent(new Event('change', { bubbles: true }))
+    })
+    state.targets = []
+    await render('second')
+    expect(element.querySelector<HTMLSelectElement>('#jobset-log-scope')?.value).toBe('selected')
+    expect(element.textContent).not.toContain('workers')
+    expect(state.targets.every(target => target.name === 'second-0' && target.role === undefined)).toBe(true)
+    expect(element.querySelector('[data-log-target="jobs/second-0"]')).not.toBeNull()
+  })
+})

package/src/components/dock/WorkloadLogsTab.tsx

@@ -17,7 +17,8 @@ export function WorkloadLogsTab({
     normalizedKind === 'cronworkflow' || normalizedKind === 'cronworkflows' ||
     normalizedKind === 'workflowtemplate' || normalizedKind === 'workflowtemplates' ||
     normalizedKind === 'clusterworkflowtemplate' || normalizedKind === 'clusterworkflowtemplates' ||
-    normalizedKind === 'scaledjob' || normalizedKind === 'scaledjobs'
+    normalizedKind === 'scaledjob' || normalizedKind === 'scaledjobs' ||
+    normalizedKind === 'jobset' || normalizedKind === 'jobsets'
 
   return (
     <div className="h-full">

package/src/components/execution/BatchExecutionView.render.test.tsx

@@ -5,7 +5,8 @@ import { BatchExecutionFullscreen } from './BatchExecutionView'
 vi.mock('../../api/client', () => ({
   useResource: () => ({}),
   useWorkloadPods: () => ({}),
-  useWorkloadRuns: () => ({ data: { runs: [] } }),
+  useJobSetResources: () => ({ data: undefined, isLoading: false }),
+  useWorkloadRuns: () => ({ data: { collection: 'runs', runs: [], total: 0, truncated: false } }),
 }))
 
 describe.each(['Job', 'CronJob', 'ScaledJob'])('%s cleanup retention display', (kind) => {

package/src/components/execution/BatchExecutionView.test.ts

@@ -1,6 +1,18 @@
 import { describe, expect, it } from 'vitest'
 import type { WorkflowExecutionActivity } from '@skyhook-io/k8s-ui/utils/workflow-execution'
-import { activityPreviewItems, effectiveDefinitionResource, isDirectRunKind, retentionHistoryCopy, runMessageNeedsDisclosure, workflowDefinitionParameters, workflowDefinitionTarget, workflowRunArguments } from './BatchExecutionView'
+import {
+  activityPreviewItems,
+  selectedRunMissing,
+  effectiveDefinitionResource,
+  isDirectRunKind,
+  resourceTargetForRun,
+  retentionHistoryCopy,
+  runMessageNeedsDisclosure,
+  workflowDefinitionParameters,
+  workflowDefinitionTarget,
+  workflowRunArguments,
+  workloadRunKey,
+} from './BatchExecutionView'
 
 function activity(id: string, tone: WorkflowExecutionActivity['tone'] = 'success'): WorkflowExecutionActivity {
   return { id, at: '2026-01-01T00:00:00Z', label: id, tone }
@@ -168,3 +180,42 @@ describe('direct run identity', () => {
     expect(isDirectRunKind('WorkflowTemplate', 'workflows')).toBe(false)
   })
 })
+
+describe('JobSet member presentation', () => {
+  it('keeps the selected Job as the core Kubernetes intermediate', () => {
+    expect(resourceTargetForRun({
+      kind: 'jobs',
+      group: 'batch',
+      namespace: 'training',
+      name: 'distributed-workers-2',
+      phase: 'Running',
+      active: true,
+    })).toEqual({
+      kind: 'jobs',
+      group: 'batch',
+      namespace: 'training',
+      name: 'distributed-workers-2',
+    })
+  })
+})
+
+describe('selection across a member refresh', () => {
+  it('preserves a selected Job that has fallen outside the shown window', () => {
+    const shown = [{ kind: 'jobs', group: 'batch', namespace: 'training', name: 'current', phase: 'Running', active: true }]
+    expect(selectedRunMissing(shown, 'jobs/training/earlier')).toBe(true)
+    expect(selectedRunMissing(shown, 'jobs/training/current')).toBe(false)
+    expect(selectedRunMissing([], 'jobs/training/earlier')).toBe(true)
+    expect(selectedRunMissing(shown, '')).toBe(false)
+  })
+})
+
+
+describe('run navigation identity', () => {
+  it('uses the reported group and preserves the released selection address', () => {
+    const run = { group: 'batch', kind: 'jobs', namespace: 'training', name: 'worker', phase: 'Running', active: true }
+    expect(workloadRunKey(run)).toBe('jobs/training/worker')
+    expect(resourceTargetForRun(run).group).toBe('batch')
+    expect(resourceTargetForRun({ ...run, group: 'batch.volcano.sh' }).group).toBe('batch.volcano.sh')
+    expect(resourceTargetForRun({ ...run, group: 'argoproj.io', kind: 'workflows' }).group).toBe('argoproj.io')
+  })
+})