@skyhook-io/k8s-ui 1.18.0 → 1.18.2

package/src/components/resources/ResourcesSidebar.tsx

@@ -1,3 +1,5 @@
+import type { ResourceCoverage } from '../../types/resource-coverage'
+import { boundedCountLabel, isEmptyCount, isLowerBound, resourceCountHint, resourceCountLabel } from '../../utils/resource-coverage'
 import { useState, useMemo, useEffect, useRef, useCallback, useId, forwardRef, type ComponentType } from 'react'
 import {
   Search,
@@ -60,6 +62,7 @@ export interface ResourcesSidebarProps {
   onKindChange?: () => void
   apiResources?: APIResource[]
   resourceCounts?: Record<string, number | null>
+  resourceCoverage?: Record<string, ResourceCoverage>
   resourceUnavailable?: string[]
   resourceForbidden?: string[]
   pinned?: PinnedItem[]
@@ -76,6 +79,18 @@ export interface ResourcesSidebarProps {
   /** Task destinations keyed by category name (e.g. "CloudNativePG"). A category
    *  with a workspace stays visible even when it has no resources. */
   categoryWorkspaces?: Record<string, SidebarCategoryWorkspace>
+  /** Display settings held by the parent, for a sidebar that unmounts between
+   *  uses (the phone drawer) and should not reset them each time it opens. */
+  displayState?: SidebarDisplayState
+  onDisplayStateChange?: (state: SidebarDisplayState) => void
+  /** Escape in a non-empty kind filter clears it without letting the key
+   *  reach an enclosing dialog, which would close. */
+  containEscape?: boolean
+}
+
+export interface SidebarDisplayState {
+  showEmptyKinds: boolean
+  favoritesExpanded: boolean
 }
 
 // Persisted across remounts so collapsed categories survive tab switches
@@ -143,6 +158,7 @@ interface ResourceTypeButtonProps {
   /** `null` means "count not loaded yet" — rendered as a placeholder so
    *  the badge doesn't flicker to "0" while the API call is in flight. */
   count: number | null
+  coverage?: ResourceCoverage
   isSelected: boolean
   /** Keyboard-highlight state (arrow nav in the filter input). */
   isHighlighted?: boolean
@@ -154,7 +170,7 @@ interface ResourceTypeButtonProps {
 }
 
 const ResourceTypeButton = forwardRef<HTMLButtonElement, ResourceTypeButtonProps>(
-  function ResourceTypeButton({ resource, count, isSelected, isHighlighted, isForbidden: forbidden, isPinned, onTogglePin, onClick, indent }, ref) {
+  function ResourceTypeButton({ resource, count, coverage, isSelected, isHighlighted, isForbidden: forbidden, isPinned, onTogglePin, onClick, indent }, ref) {
     const Icon = getResourceIcon(resource.kind, resource.group)
     return (
       <button
@@ -214,13 +230,14 @@ const ResourceTypeButton = forwardRef<HTMLButtonElement, ResourceTypeButtonProps
               </span>
             </Tooltip>
           ) : (
-            <span className={clsx(
-              'text-xs py-0.5 rounded text-center font-mono',
-              isSelected ? 'bg-skyhook-500/30 selection-text' : 'bg-theme-elevated',
-              count < 1000 ? 'w-8' : 'w-9',
-            )}>
-              {count}
-            </span>
+            <Tooltip disabled={!resourceCountHint(coverage)} content={resourceCountHint(coverage)} position="left">
+              <span className={clsx(
+                'text-xs py-0.5 px-1 min-w-8 rounded text-center font-mono',
+                isSelected ? 'bg-skyhook-500/30 selection-text' : 'bg-theme-elevated',
+              )}>
+                {resourceCountLabel(count, coverage)}
+              </span>
+            </Tooltip>
           )}
         </div>
       </button>
@@ -234,6 +251,7 @@ export function ResourcesSidebar({
   onKindChange,
   apiResources,
   resourceCounts,
+  resourceCoverage,
   resourceUnavailable,
   resourceForbidden,
   pinned = [],
@@ -244,6 +262,9 @@ export function ResourcesSidebar({
   basePath,
   onKindNavigated,
   categoryWorkspaces,
+  displayState,
+  onDisplayStateChange,
+  containEscape,
 }: ResourcesSidebarProps) {
   // Wraps kind selection to also navigate when basePath/onNavigate are provided
   const selectKind = (kind: SelectedKindInfo) => {
@@ -261,8 +282,13 @@ export function ResourcesSidebar({
     () => persistedExpandedCategories ?? new Set(['Workloads', 'Networking', 'Configuration'])
   )
   useEffect(() => { persistedExpandedCategories = expandedCategories }, [expandedCategories])
-  const [showEmptyKinds, setShowEmptyKinds] = useState(false)
-  const [favoritesExpanded, setFavoritesExpanded] = useState(() => pinned.length > 0)
+  const [ownDisplayState, setOwnDisplayState] = useState<SidebarDisplayState>(() => ({ showEmptyKinds: false, favoritesExpanded: pinned.length > 0 }))
+  const { showEmptyKinds, favoritesExpanded } = displayState ?? ownDisplayState
+  const setDisplayState = (patch: Partial<SidebarDisplayState>) => {
+    const next = { showEmptyKinds, favoritesExpanded, ...patch }
+    if (onDisplayStateChange) onDisplayStateChange(next)
+    else setOwnDisplayState(next)
+  }
   const favoritesDisclosure = useDisclosure(favoritesExpanded)
   // Category sections are mapped inline, so they can't each call useDisclosure;
   // one generated prefix plus the category name keeps aria-controls unique.
@@ -401,20 +427,25 @@ export function ResourcesSidebar({
         (sum, resource) => sum + (counts[resource.group ? `${resource.group}/${resource.kind}` : resource.kind] ?? 0),
         0
       )
+      const lowerBound = category.resources.some(resource =>
+        isLowerBound(resourceCoverage?.[resource.group ? `${resource.group}/${resource.kind}` : resource.kind]))
+      const totalLabel = boundedCountLabel(total, lowerBound)
 
-      // Filter resources: hide only confirmed-empty kinds. Unknown counts stay
-      // visible as a dash so count coverage gaps do not masquerade as emptiness.
+      // Filter resources: hide only empty kinds. An unknown count stays visible
+      // as a dash, and a partial zero as one too, so count coverage gaps do not
+      // masquerade as emptiness.
       const visibleResources = category.resources.filter(resource => {
         const count = counts[resource.group ? `${resource.group}/${resource.kind}` : resource.kind]
         const isSelectedResource =
           (effectiveSelectedKind.name === resource.name && effectiveSelectedKind.group === resource.group) ||
           (effectiveSelectedKind.kind.toLowerCase() === resource.kind.toLowerCase() && effectiveSelectedKind.group === resource.group)
-        const shouldShow = isSelectedResource || count === null || (count ?? 0) > 0 || showEmptyKinds
+        const key = resource.group ? `${resource.group}/${resource.kind}` : resource.kind
+        const shouldShow = isSelectedResource || count === null || !isEmptyCount(count ?? 0, resourceCoverage?.[key]) || showEmptyKinds
         if (!shouldShow) totalHiddenKinds++
         return shouldShow
       })
 
-      return { ...category, total, visibleResources }
+      return { ...category, total, totalLabel, visibleResources }
     })
 
     // Sort: the category whose workspace is open first, then categories with
@@ -435,7 +466,7 @@ export function ResourcesSidebar({
     })
 
     return { sortedCategories: visibleCategories, hiddenKindsCount: totalHiddenKinds, hiddenGroupsCount: totalHiddenGroups }
-  }, [categories, counts, showEmptyKinds, effectiveSelectedKind.name, effectiveSelectedKind.kind, effectiveSelectedKind.group, categoryWorkspaces, activeDestinationCategory])
+  }, [categories, counts, resourceCoverage, showEmptyKinds, effectiveSelectedKind.name, effectiveSelectedKind.kind, effectiveSelectedKind.group, categoryWorkspaces, activeDestinationCategory])
 
   // Filter sidebar categories/kinds by the kind search term
   const filteredCategories = useMemo(() => {
@@ -518,6 +549,7 @@ export function ResourcesSidebar({
 
   const handleSearchKeyDown = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {
     if (e.key === 'Escape') {
+      if (containEscape && kindFilter) e.stopPropagation()
       setKindFilter('')
       setHighlightedIndex(-1)
       ;(e.target as HTMLInputElement).blur()
@@ -535,7 +567,7 @@ export function ResourcesSidebar({
       setKindFilter('')
       onKindNavigated?.()
     }
-  }, [visibleResults.length, highlightedResult, selectKind, onKindNavigated]) // eslint-disable-line react-hooks/exhaustive-deps
+  }, [visibleResults.length, highlightedResult, selectKind, onKindNavigated, containEscape, kindFilter]) // eslint-disable-line react-hooks/exhaustive-deps
 
   const isKindHighlighted = useCallback((name: string, group: string) => {
     return highlightedKind?.name === name && highlightedKind?.group === group
@@ -592,7 +624,7 @@ export function ResourcesSidebar({
         <div className="mb-2">
           <button
             {...favoritesDisclosure.buttonProps}
-            onClick={() => setFavoritesExpanded((v) => !v)}
+            onClick={() => setDisplayState({ favoritesExpanded: !favoritesExpanded })}
             className="w-full flex items-center gap-2 px-2 py-1.5 text-xs font-medium text-theme-text-tertiary hover:text-theme-text-secondary uppercase tracking-wide"
           >
             <CollapseChevron open={favoritesExpanded} className="w-3 h-3" />
@@ -621,6 +653,7 @@ export function ResourcesSidebar({
                       ref={highlighted ? highlightedRef : (isResourceSelected ? selectedSidebarRef : null)}
                       resource={{ name: p.name, kind: p.kind, group: p.group, version: '', namespaced: true, isCrd: false, verbs: [] }}
                       count={counts[p.group ? `${p.group}/${p.kind}` : p.kind] ?? null}
+                      coverage={resourceCoverage?.[p.group ? `${p.group}/${p.kind}` : p.kind]}
                       isSelected={isResourceSelected}
                       isHighlighted={highlighted}
                       isForbidden={forbiddenKinds.has(p.group ? `${p.group}/${p.kind}` : p.kind)}
@@ -653,8 +686,8 @@ export function ResourcesSidebar({
                   <CollapseChevron open={isExpanded} className="w-3 h-3" />
                   <span className="flex-1 text-left truncate" title={rawGroupTitle}>{category.name}</span>
                   {!isExpanded && (
-                    <span className={clsx('text-xs py-0.5 rounded bg-theme-elevated text-theme-text-secondary font-normal normal-case text-center font-mono', category.total < 1000 ? 'w-8' : 'w-9')}>
-                      {category.total}
+                    <span className="text-xs py-0.5 px-1 min-w-8 rounded bg-theme-elevated text-theme-text-secondary font-normal normal-case text-center font-mono">
+                      {category.totalLabel}
                     </span>
                   )}
                 </button>
@@ -692,6 +725,7 @@ export function ResourcesSidebar({
                         ref={highlighted ? highlightedRef : (isResourceSelected ? selectedSidebarRef : null)}
                         resource={resource}
                         count={counts[resource.group ? `${resource.group}/${resource.kind}` : resource.kind] ?? null}
+                        coverage={resourceCoverage?.[resource.group ? `${resource.group}/${resource.kind}` : resource.kind]}
                         isSelected={showSelected}
                         isHighlighted={highlighted}
                         isForbidden={forbiddenKinds.has(resource.group ? `${resource.group}/${resource.kind}` : resource.kind)}
@@ -748,12 +782,14 @@ export function ResourcesSidebar({
                     </span>
                   </Tooltip>
                 ) : (
-                  <span className={clsx(
-                    'badge font-mono',
-                    isSelected ? 'bg-skyhook-500/30 selection-text' : 'bg-theme-elevated',
-                  )}>
-                    {count}
-                  </span>
+                  <Tooltip disabled={!resourceCountHint(resourceCoverage?.[kindKey])} content={resourceCountHint(resourceCoverage?.[kindKey])} position="left">
+                    <span className={clsx(
+                      'badge font-mono',
+                      isSelected ? 'bg-skyhook-500/30 selection-text' : 'bg-theme-elevated',
+                    )}>
+                      {resourceCountLabel(count, resourceCoverage?.[kindKey])}
+                    </span>
+                  </Tooltip>
                 )}
               </button>
             )
@@ -763,7 +799,7 @@ export function ResourcesSidebar({
         {/* Toggle for showing/hiding empty kinds and groups */}
         {hiddenKindsCount > 0 || hiddenGroupsCount > 0 || showEmptyKinds ? (
           <button
-            onClick={() => setShowEmptyKinds(!showEmptyKinds)}
+            onClick={() => setDisplayState({ showEmptyKinds: !showEmptyKinds })}
             className="w-full flex items-center gap-2 px-3 py-2 mt-2 text-xs text-theme-text-tertiary hover:text-theme-text-secondary border-t border-theme-border"
           >
             {showEmptyKinds ? (

package/src/components/resources/ResourcesView.crossplane-pause.test.tsx

@@ -0,0 +1,133 @@
+// @vitest-environment jsdom
+import { act } from 'react'
+import { createRoot } from 'react-dom/client'
+import { VirtuosoMockContext } from 'react-virtuoso'
+import { afterEach, expect, it, vi } from 'vitest'
+import { ResourcesView } from './ResourcesView'
+import { getCellFilterValue, serializeColumnFilters } from './resource-utils'
+import { getResourceStatus } from '../shared/ResourceRendererDispatch'
+import { KeyboardShortcutProvider } from '../../hooks/useKeyboardShortcuts'
+import type { APIResource } from '../../types'
+import type { PrinterTable } from './printer-columns'
+
+;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true
+window.matchMedia = vi.fn().mockReturnValue({ matches: false, addEventListener: vi.fn(), removeEventListener: vi.fn() })
+Element.prototype.scrollIntoView = vi.fn()
+let root: ReturnType<typeof createRoot>
+let host: HTMLDivElement
+
+afterEach(() => { act(() => root?.unmount()); host?.remove(); localStorage.clear(); window.history.replaceState(null, '', '/') })
+
+const pause = { type: 'Synced', status: 'False', reason: 'ReconcilePaused' }
+const mr = { providerConfigRef: { name: 'default' } }
+const xr = { resourceRefs: [] }
+const claim = { resourceRef: { kind: 'Archive', name: 'xr' }, compositionRef: { name: 'archive' } }
+
+it.each([
+  ['managed', 'test.crossplane.io', mr, false],
+  ['foreign-group managed', 'example.com', mr, false],
+  ['composite default', 'example.com', xr, false],
+  ['composite printer', 'example.com', xr, true],
+  ['claim printer', 'example.com', claim, true],
+  ['ref-less early composite printer', 'example.com', {}, true],
+  ['ref-less early claim default', 'example.com', {}, false],
+] as const)('keeps pause context and primary evidence on the real %s table path', async (_name, group, spec, printer) => {
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  const kind: APIResource = { group, version: 'v1', kind: 'Archive', name: 'archives', namespaced: true, isCrd: true, verbs: ['get', 'list'] }
+  const resource = {
+    apiVersion: `${group}/v1`, kind: 'Archive',
+    metadata: { name: 'acknowledged', namespace: 'test', uid: 'fixture', annotations: { 'crossplane.io/paused': 'true' } },
+    spec, status: { conditions: [pause, { type: 'Ready', status: 'False', reason: 'Unavailable' }] },
+  }
+  const printerTable: PrinterTable | undefined = printer ? {
+    kind: kind.name, group,
+    columns: [
+      { name: 'Synced', jsonPath: ".status.conditions[?(@.type=='Synced')].status", type: 'string' },
+      { name: 'Ready', jsonPath: ".status.conditions[?(@.type=='Ready')].status", type: 'string' },
+    ],
+    cells: { fixture: ['False', 'False'] },
+  } : undefined
+  await act(async () => root.render(<VirtuosoMockContext.Provider value={{ viewportHeight: 600, itemHeight: 48 }}><KeyboardShortcutProvider><ResourcesView
+    namespaces={['test']}
+    apiResources={[kind]}
+    resourceCounts={{ Archive: 1 }}
+    selectedKindQuery={{ isLoading: false, data: [resource], resourceName: kind.name, group }}
+    locationPathname="/resources/archives"
+    locationSearch={`?apiGroup=${group}`}
+    onNavigate={() => {}}
+    printerTable={printerTable}
+  /></KeyboardShortcutProvider></VirtuosoMockContext.Provider>))
+  const row = host.querySelector('tbody tr')!
+  expect(row.textContent).toContain('acknowledged')
+  expect(row.textContent?.match(/Paused/g)).toHaveLength(1)
+  if (printer) {
+    const printed = [...row.querySelectorAll('td')].filter(cell => cell.textContent?.trim() === 'False')
+    expect(printed).toHaveLength(2)
+    expect(printed[0].querySelector('.status-neutral')).not.toBeNull()
+    expect(printed[1].querySelector('.status-unhealthy')).not.toBeNull()
+    expect(row.textContent).not.toContain('Unavailable')
+  } else {
+    expect(row.textContent).toContain('Unavailable')
+    expect(row.textContent).not.toContain('Out of sync')
+  }
+})
+
+
+it('preserves curated package install failure ahead of a recorded pause in the table and filter', async () => {
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  const group = 'pkg.crossplane.io'
+  const kind: APIResource = { group, version: 'v1', kind: 'Provider', name: 'providers', namespaced: false, isCrd: true, verbs: ['get', 'list'] }
+  const resource = {
+    apiVersion: `${group}/v1`, kind: 'Provider',
+    metadata: { name: 'install-failure', uid: 'package-fixture', annotations: { 'crossplane.io/paused': 'true' } },
+    spec: { package: 'example.invalid/provider:v1' },
+    status: { conditions: [pause, { type: 'Installed', status: 'False', reason: 'UnpackFailed' }, { type: 'Healthy', status: 'True' }] },
+  }
+  await act(async () => root.render(<VirtuosoMockContext.Provider value={{ viewportHeight: 600, itemHeight: 48 }}><KeyboardShortcutProvider><ResourcesView
+    namespaces={[]}
+    apiResources={[kind]}
+    resourceCounts={{ Provider: 1 }}
+    selectedKindQuery={{ isLoading: false, data: [resource], resourceName: kind.name, group }}
+    locationPathname="/resources/providers"
+    locationSearch={`?apiGroup=${group}`}
+    onNavigate={() => {}}
+  /></KeyboardShortcutProvider></VirtuosoMockContext.Provider>))
+  const row = host.querySelector('tbody tr')!
+  expect(row.textContent).toContain('UnpackFailed')
+  expect(row.querySelector('.status-unhealthy')).not.toBeNull()
+  expect(row.textContent).not.toContain('Readiness unknown')
+  expect(getCellFilterValue(resource, 'status', 'providers')).toBe('UnpackFailed')
+  expect(getCellFilterValue(resource, 'status', 'providers')).toBe(getResourceStatus('providers', resource)?.text)
+})
+
+
+it.each([
+  ['ref-less generic', 'example.com', 'Archive', 'archives', {}, 'Ready (reported)', 'Ready (reported)'],
+  ['managed-name collision', 'acm.aws.upbound.io', 'Certificate', 'certificates', mr, 'Ready (reported)', 'Ready (reported)'],
+  ['curated Knative', 'serving.knative.dev', 'Revision', 'revisions', {}, 'Ready', 'Scaled to Zero'],
+] as const)('routes the actual %s status filter through the existing column policy', async (_name, group, kindName, plural, spec, filterText, cellText) => {
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  const kind: APIResource = { group, version: 'v1', kind: kindName, name: plural, namespaced: true, isCrd: true, verbs: ['get', 'list'] }
+  const resource = {
+    apiVersion: `${group}/v1`, kind: kindName,
+    metadata: { name: 'kept', namespace: 'test', uid: 'kept-fixture', annotations: { 'crossplane.io/paused': 'true' } },
+    spec, status: { conditions: [pause, { type: 'Ready', status: 'True' }, { type: 'Active', status: 'False', reason: 'NoTraffic' }] },
+  }
+  const excluded = { ...resource, metadata: { ...resource.metadata, name: 'excluded', uid: 'excluded-fixture' }, status: { conditions: [pause, { type: 'Ready', status: 'False', reason: 'Unavailable' }] } }
+  const search = `?${new URLSearchParams({ apiGroup: group, filters: serializeColumnFilters({ status: [filterText] }) })}`
+  window.history.replaceState(null, '', `/resources/${plural}${search}`)
+  await act(async () => root.render(<VirtuosoMockContext.Provider value={{ viewportHeight: 600, itemHeight: 48 }}><KeyboardShortcutProvider><ResourcesView
+    namespaces={['test']}
+    apiResources={[kind]}
+    resourceCounts={{ [kindName]: 2 }}
+    selectedKindQuery={{ isLoading: false, data: [resource, excluded], resourceName: plural, group }}
+    locationPathname={`/resources/${plural}`}
+    locationSearch={search}
+    onNavigate={() => {}}
+  /></KeyboardShortcutProvider></VirtuosoMockContext.Provider>))
+  const rows = host.querySelectorAll('tbody tr')
+  expect(rows).toHaveLength(1)
+  expect(rows[0].textContent).toContain('kept')
+  expect(rows[0].textContent).toContain(cellText)
+  expect(rows[0].textContent).not.toContain('excluded')
+})

package/src/components/resources/ResourcesView.flagger.test.tsx

@@ -0,0 +1,31 @@
+// @vitest-environment jsdom
+import { act } from 'react'
+import { createRoot } from 'react-dom/client'
+import { VirtuosoMockContext } from 'react-virtuoso'
+import { afterEach, expect, it, vi } from 'vitest'
+import { ResourcesView } from './ResourcesView'
+import { KeyboardShortcutProvider } from '../../hooks/useKeyboardShortcuts'
+import type { APIResource } from '../../types'
+
+;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true
+window.matchMedia = vi.fn().mockReturnValue({ matches: false, addEventListener: vi.fn(), removeEventListener: vi.fn() })
+Element.prototype.scrollIntoView = vi.fn()
+let root: ReturnType<typeof createRoot>
+let host: HTMLDivElement
+afterEach(() => { act(() => root?.unmount()); host?.remove(); localStorage.clear() })
+
+it('shows failed rollout and suspension together in the actual Canary table', async () => {
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  const kind: APIResource = { group: 'flagger.app', version: 'v1beta1', kind: 'Canary', name: 'canaries', namespaced: true, isCrd: true, verbs: ['get', 'list'] }
+  const data = { apiVersion: 'flagger.app/v1beta1', kind: 'Canary', metadata: { name: 'storefront', namespace: 'test' }, spec: { suspend: true, targetRef: { kind: 'Deployment', name: 'storefront' }, analysis: { iterations: 2 } }, status: { phase: 'Failed' } }
+  await act(async () => root.render(<VirtuosoMockContext.Provider value={{ viewportHeight: 600, itemHeight: 48 }}><KeyboardShortcutProvider><ResourcesView namespaces={['test']} apiResources={[kind]} resourceCounts={{ Canary: 1 }} selectedKindQuery={{ isLoading: false, data: [data], resourceName: kind.name, group: kind.group }} locationPathname="/resources/canaries" locationSearch="?apiGroup=flagger.app" onNavigate={() => {}} /></KeyboardShortcutProvider></VirtuosoMockContext.Provider>))
+  const table = host.querySelector('table')!
+  expect(table).not.toBeNull()
+  expect(table.textContent).toContain('Rollout State')
+  expect(table.textContent).toContain('Failed')
+  expect(table.querySelector('.status-unhealthy')).not.toBeNull()
+  expect(table.textContent).toContain('Blue/green')
+  expect(table.textContent).toContain('Not weighted')
+  expect(table.textContent).toContain('Suspend Requested')
+  expect(table.textContent).toContain('Yes')
+})

package/src/components/resources/ResourcesView.kind-view.test.tsx

@@ -3,6 +3,7 @@ import { act, type ComponentProps } from 'react'
 import { createRoot } from 'react-dom/client'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { ResourcesView } from './ResourcesView'
+import { ResourceActionsBar } from '../shared/ResourceActionsBar'
 import { KeyboardShortcutProvider } from '../../hooks/useKeyboardShortcuts'
 import type { APIResource } from '../../types'
 
@@ -252,7 +253,7 @@ it('can show selection from compare without turning off the saved preference', (
   expect(localStorage.getItem(checkboxKey)).toBe('true')
 })
 
-it('keeps delete confirmation and clears successful selection without hiding checkboxes', () => {
+it('confirms bulk deletion and clears successful selection without hiding checkboxes', () => {
   const { remove } = renderBulkTable()
   key('b')
   act(() => required<HTMLInputElement>('input[title="Select all"]').click())
@@ -268,6 +269,32 @@ it('keeps delete confirmation and clears successful selection without hiding che
   expect(localStorage.getItem(checkboxKey)).toBe('true')
 })
 
+it('requires a new bulk confirmation after submission without clearing uncertain selection', async () => {
+  const { remove, render } = renderBulkTable()
+  const other = { ...pod, metadata: { ...pod.metadata, name: 'remaining', uid: 'remaining-id' } }
+  render(pods, [pod, other])
+  key('b')
+  act(() => required<HTMLInputElement>('input[title="Select all"]').click())
+  clickButton('Delete')
+  const dialog = required<HTMLElement>('[role="dialog"]', document)
+  clickButton('Delete 2 resources', dialog)
+  expect(remove).toHaveBeenCalledTimes(1)
+  expect(remove.mock.calls[0]?.[0]).toHaveLength(2)
+  expect(dialog.closest('[inert]')).not.toBeNull()
+  expect(host.textContent).toContain('2 selected')
+
+  render(pods, [other])
+  await act(async () => { await new Promise(resolve => setTimeout(resolve, 300)) })
+  expect(document.querySelector('[role="dialog"]')).toBeNull()
+  expect(host.textContent).toContain('1 selected')
+  expect(remove).toHaveBeenCalledTimes(1)
+  clickButton('Delete')
+  const nextDialog = required<HTMLElement>('[role="dialog"]', document)
+  expect(nextDialog.textContent).toContain('Delete 1 Pod?')
+  clickButton('Delete 1 resource', nextDialog)
+  expect(remove.mock.calls[1]?.[0]).toEqual([{ kind: 'pods', group: '', namespace: 'test', name: 'remaining' }])
+})
+
 it.each(['false', 'garbage', 'null', '1'])('ignores invalid or disabled visibility value %s', value => {
   localStorage.setItem(checkboxKey, value)
   renderBulkTable()
@@ -294,3 +321,71 @@ it('does not offer selection without a bulk action callback even with saved visi
   expect(host.querySelector('input[title="Select all"]')).toBeNull()
   expect(localStorage.getItem(checkboxKey)).toBe('true')
 })
+
+it('closes single-delete confirmation on submission but keeps the inspected resource until known success', () => {
+  const remove = vi.fn<NonNullable<ComponentProps<typeof ResourceActionsBar>['onDelete']>>()
+  const close = vi.fn()
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  act(() => root.render(<ResourceActionsBar
+    resource={{ kind: 'pods', namespace: 'test', name: 'example' }}
+    data={pod}
+    onDelete={remove}
+    onClose={close}
+  />))
+  act(() => required<SVGElement>('svg[class*="trash"]').closest<HTMLButtonElement>('button')!.click())
+  const dialog = required<HTMLElement>('[role="dialog"]', document)
+  clickButton('Delete', dialog)
+  expect(remove).toHaveBeenCalledTimes(1)
+  expect(dialog.closest('[inert]')).not.toBeNull()
+  expect(close).not.toHaveBeenCalled()
+  act(() => remove.mock.calls[0]?.[1]?.onSuccess?.())
+  expect(close).toHaveBeenCalledTimes(1)
+})
+
+it('preserves rows selected after a bulk delete was submitted', () => {
+  const { remove, render } = renderBulkTable()
+  key('b')
+  act(() => required<HTMLInputElement>('input[title="Select all"]').click())
+  clickButton('Delete')
+  clickButton('Delete 1 resource', required<HTMLElement>('[role="dialog"]', document))
+  const other = { ...pod, metadata: { ...pod.metadata, name: 'remaining', uid: 'remaining-id' } }
+  render(pods, [pod, other])
+  act(() => required<HTMLInputElement>('input[title="Deselect all"]').click())
+  expect(host.textContent).toContain('2 selected')
+  act(() => remove.mock.calls[0]?.[1]?.onSuccess?.())
+  expect(host.textContent).toContain('1 selected')
+  render(pods, [other])
+  expect(host.textContent).toContain('1 selected')
+})
+
+it.each(['name', 'uid'])('does not close a newly inspected resource after an earlier delete succeeds (%s)', change => {
+  const remove = vi.fn<NonNullable<ComponentProps<typeof ResourceActionsBar>['onDelete']>>()
+  const close = vi.fn()
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  const render = (name: string, uid: string, deleting = false) => act(() => root.render(<ResourceActionsBar
+    resource={{ kind: 'pods', namespace: 'test', name }}
+    data={{ ...pod, metadata: { ...pod.metadata, name, uid } }}
+    onDelete={remove}
+    onClose={close}
+    isDeleting={deleting}
+  />))
+  render('example', 'original')
+  act(() => required<HTMLButtonElement>('button[aria-label="Delete resource"]').click())
+  clickButton('Delete', required<HTMLElement>('[role="dialog"]', document))
+  render(change === 'name' ? 'other' : 'example', 'replacement', true)
+  expect(required<HTMLButtonElement>('button[aria-label="Deleting resource"]').disabled).toBe(true)
+  act(() => remove.mock.calls[0]?.[1]?.onSuccess?.())
+  expect(close).not.toHaveBeenCalled()
+})
+
+it('ignores a delete success callback after its action bar is unmounted', () => {
+  const remove = vi.fn<NonNullable<ComponentProps<typeof ResourceActionsBar>['onDelete']>>()
+  const close = vi.fn()
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  act(() => root.render(<ResourceActionsBar resource={{ kind: 'pods', namespace: 'test', name: 'example' }} data={pod} onDelete={remove} onClose={close} />))
+  act(() => required<HTMLButtonElement>('button[aria-label="Delete resource"]').click())
+  clickButton('Delete', required<HTMLElement>('[role="dialog"]', document))
+  act(() => root.render(<div>Another view</div>))
+  act(() => remove.mock.calls[0]?.[1]?.onSuccess?.())
+  expect(close).not.toHaveBeenCalled()
+})

package/src/components/resources/ResourcesView.opentelemetry.test.tsx

@@ -0,0 +1,29 @@
+// @vitest-environment jsdom
+import { act } from 'react'
+import { createRoot } from 'react-dom/client'
+import { VirtuosoMockContext } from 'react-virtuoso'
+import { afterEach, expect, it, vi } from 'vitest'
+import { ResourcesView } from './ResourcesView'
+import { KeyboardShortcutProvider } from '../../hooks/useKeyboardShortcuts'
+import type { APIResource } from '../../types'
+
+;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true
+window.matchMedia = vi.fn().mockReturnValue({ matches: false, addEventListener: vi.fn(), removeEventListener: vi.fn() })
+Element.prototype.scrollIntoView = vi.fn()
+let root: ReturnType<typeof createRoot>
+let host: HTMLDivElement
+afterEach(() => { act(() => root?.unmount()); host?.remove(); localStorage.clear() })
+
+it('shows reconciliation and labeled Pod snapshots in the actual collector table', async () => {
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  const kind: APIResource = { group: 'opentelemetry.io', version: 'v1beta1', kind: 'OpenTelemetryCollector', name: 'opentelemetrycollectors', namespaced: true, isCrd: true, verbs: ['get', 'list'] }
+  const data = { apiVersion: 'opentelemetry.io/v1beta1', kind: 'OpenTelemetryCollector', metadata: { name: 'collector', namespace: 'test' }, spec: { mode: 'deployment', managementState: 'managed' }, status: { conditions: [{ type: 'Ready', status: 'False', reason: 'ReconcileError' }], scale: { statusReplicas: '0/1' }, version: '0.162.0' } }
+  await act(async () => root.render(<VirtuosoMockContext.Provider value={{ viewportHeight: 600, itemHeight: 48 }}><KeyboardShortcutProvider><ResourcesView namespaces={['test']} apiResources={[kind]} resourceCounts={{ OpenTelemetryCollector: 1 }} selectedKindQuery={{ isLoading: false, data: [data], resourceName: kind.name, group: kind.group }} locationPathname="/resources/opentelemetrycollectors" locationSearch="?apiGroup=opentelemetry.io" onNavigate={() => {}} /></KeyboardShortcutProvider></VirtuosoMockContext.Provider>))
+  const table = host.querySelector('table')!
+  expect(table).not.toBeNull()
+  expect(table.textContent).toContain('Reconciliation')
+  expect(table.textContent).toContain('Reconcile failed')
+  expect(table.textContent).toContain('Reported Pods')
+  expect(table.textContent).toContain('0/1')
+  expect(table.textContent).toContain('0.162.0')
+})

package/src/components/resources/ResourcesView.selected-kind.test.ts

@@ -3,6 +3,7 @@ import type { APIResource } from '../../types'
 import {
   canonicalizeSelectedKind,
   deriveSidebarResourceCounts,
+  deriveSidebarResourceCoverage,
   LOADED_RESOURCE_COUNT_TTL_MS,
   resourceQueryMatchesSelectedKind,
 } from './ResourcesView'
@@ -141,3 +142,16 @@ describe('resourceQueryMatchesSelectedKind', () => {
     ).toBe(true)
   })
 })
+
+
+describe('loaded count coverage', () => {
+  const partial = { status: 'partial' as const, scope: { type: 'all_namespaces' as const }, read: { type: 'namespaces' as const, namespaces: { names: ['alpha'], count: 1 } }, gaps: [{ code: 'radar_namespace_not_collected' }] }
+  it('retains a cached partial count qualification and expires both together', () => {
+    const cache = { Endpoints: { count: 0, expiresAt: 20, coverage: partial } }
+    expect(deriveSidebarResourceCoverage({}, {}, cache, 10)).toEqual({ Endpoints: partial })
+    expect(deriveSidebarResourceCoverage({}, {}, cache, 20)).toEqual({})
+  })
+  it('does not pair older unqualified count responses with cached newer metadata', () => {
+    expect(deriveSidebarResourceCoverage({ Endpoints: 0 }, undefined, { Endpoints: { count: 0, expiresAt: 20, coverage: partial } }, 10)).toEqual({ Endpoints: { status: 'unknown' } })
+  })
+})

package/src/components/resources/ResourcesView.trivy-search.test.tsx

@@ -0,0 +1,59 @@
+// @vitest-environment jsdom
+import { act } from 'react'
+import { createRoot } from 'react-dom/client'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { ResourcesView } from './ResourcesView'
+import { KeyboardShortcutProvider } from '../../hooks/useKeyboardShortcuts'
+import type { APIResource } from '../../types'
+
+;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true
+window.matchMedia = vi.fn().mockReturnValue({ matches: false, addEventListener: vi.fn(), removeEventListener: vi.fn() })
+Element.prototype.scrollIntoView = vi.fn()
+
+const group = 'aquasecurity.github.io'
+const vulnReports: APIResource = { group, version: 'v1alpha1', kind: 'VulnerabilityReport', name: 'vulnerabilityreports', namespaced: true, isCrd: true, verbs: ['get', 'list'] }
+const report = (name: string, vulnerabilityID: string) => ({
+  apiVersion: `${group}/v1alpha1`, kind: 'VulnerabilityReport',
+  metadata: { name, namespace: 'legacy', uid: name },
+  report: { artifact: { repository: 'trafex/php-nginx', tag: '3.6.0' }, vulnerabilities: [{ vulnerabilityID, resource: 'php83', installedVersion: '8.3.20-r0', fixedVersion: '8.3.36-r0' }] },
+})
+// The match sorts last, so selecting the first row proves the filter ran.
+const billing = report('replicaset-billing-5cfccf7776-php-nginx', 'CVE-2025-0001')
+const web = report('replicaset-web-7685556d86-php', 'CVE-2026-109618')
+
+let root: ReturnType<typeof createRoot>
+let host: HTMLDivElement
+afterEach(() => { act(() => root?.unmount()); host?.remove(); localStorage.clear(); window.history.replaceState(null, '', '/') })
+
+function render(search: string, onResourceClick = vi.fn()) {
+  const locationSearch = `?apiGroup=${group}&search=${encodeURIComponent(search)}`
+  window.history.replaceState(null, '', `/resources/vulnerabilityreports${locationSearch}`)
+  host = document.createElement('div'); document.body.append(host); root = createRoot(host)
+  act(() => root.render(<KeyboardShortcutProvider><ResourcesView
+    namespaces={[]}
+    apiResources={[vulnReports]}
+    resourceCounts={{ VulnerabilityReport: 2 }}
+    selectedKindQuery={{ isLoading: false, data: [web, billing], resourceName: 'vulnerabilityreports', group }}
+    locationPathname="/resources/vulnerabilityreports"
+    locationSearch={locationSearch}
+    onNavigate={() => {}}
+    onResourceClick={onResourceClick}
+  /></KeyboardShortcutProvider>))
+  return onResourceClick
+}
+
+describe('Trivy report table search', () => {
+  it('finds a report by a CVE in its findings', () => {
+    const selected = render('CVE-2026-109618')
+    act(() => document.body.dispatchEvent(new KeyboardEvent('keydown', { key: 'j', bubbles: true })))
+    act(() => document.body.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })))
+    expect(selected).toHaveBeenCalledTimes(1)
+    expect(selected).toHaveBeenCalledWith(expect.objectContaining({ name: web.metadata.name }))
+  })
+
+  it('says what it searched when nothing matches', () => {
+    render('CVE-1999-0001')
+    expect(host.textContent).toContain('No results for "CVE-1999-0001"')
+    expect(host.textContent).toContain('Searched names, namespaces and report findings')
+  })
+})