@skyhook-io/k8s-ui 1.7.13 → 1.7.15

package/src/components/ui/drawer-components.tsx

@@ -701,6 +701,14 @@ export function formatKindName(kind: string): string {
   return kind
 }
 
+// Resolve the display label for a kind chip. The fetched resource's `dataKind`
+// is the authoritative PascalCase kind and is correct for every CRD; prefer it.
+// Before data loads, fall back to deriving from the URL plural — which is only
+// reliable for the core kinds in formatKindName's map.
+export function displayKindName(urlPlural: string, dataKind?: string): string {
+  return dataKind || formatKindName(urlPlural)
+}
+
 // Type for copy handler
 export type CopyHandler = (text: string, key: string) => void
 

package/src/components/workload/WorkloadView.tsx

@@ -51,7 +51,7 @@ import { EditableYamlView, SaveSuccessAnimation } from '../shared/EditableYamlVi
 import { ResourceRendererDispatch, getResourceStatus, type RendererOverrides } from '../shared/ResourceRendererDispatch'
 import { DetailShell, type DetailShellTab } from '../shared/DetailShell'
 import { HelmManagedByChip, ManagedByChip, type HelmOwnerRef } from '../shared/ManagedByChip'
-import { getKindColorOutline, formatKindName } from '../ui/drawer-components'
+import { getKindColorOutline, displayKindName } from '../ui/drawer-components'
 import { midTruncate } from '../../utils/format'
 
 export type WorkloadTabType = 'overview' | 'topology' | 'timeline' | 'logs' | 'metrics' | 'yaml'
@@ -555,7 +555,7 @@ export function WorkloadView({
           <div className="flex items-center justify-between px-4 pt-3 pb-2">
             <div className="flex items-center gap-2 flex-wrap">
               <span className={clsx('badge', getKindColorOutline(apiKind))}>
-                {formatKindName(apiKind)}
+                {displayKindName(apiKind, resource?.kind)}
               </span>
               {status && (
                 <span className={clsx('badge', status.color)}>
@@ -706,7 +706,7 @@ export function WorkloadView({
           </div>
           <div className="flex items-center gap-3 text-sm text-theme-text-secondary">
             <span className={clsx('badge', getKindColorOutline(apiKind))}>
-              {formatKindName(apiKind)}
+              {displayKindName(apiKind, resource?.kind)}
             </span>
             {status && (
               <span className={clsx('badge', status.color)}>
@@ -860,7 +860,7 @@ export function WorkloadView({
                       )}
                     >
                       <span className="truncate text-xs font-medium text-theme-text-primary">{midTruncate(o.name, 26)}</span>
-                      <span className="text-[10px] uppercase tracking-wide text-theme-text-tertiary">{formatKindName(o.kind)}</span>
+                      <span className="text-[10px] uppercase tracking-wide text-theme-text-tertiary">{o.kind}</span>
                     </button>
                   )
                 })}

package/src/types/core.ts

@@ -47,6 +47,15 @@ export const OPTIONAL_RESOURCE_KINDS: ReadonlyArray<keyof ResourcePermissions> =
   'verticalPodAutoscalers',
 ]
 
+// Per-workload write permissions. Field names must match
+// WorkloadWritePermissions in internal/k8s/capabilities.go.
+export interface WorkloadWritePermissions {
+  deployments: boolean
+  daemonSets: boolean
+  statefulSets: boolean
+  rollouts: boolean
+}
+
 // Feature capabilities based on RBAC permissions
 export interface Capabilities {
   exec: boolean           // Terminal feature (pods/exec)
@@ -57,6 +66,7 @@ export interface Capabilities {
   secretsUpdate: boolean  // Update secrets (inline editing)
   helmWrite: boolean      // Helm write operations (install, upgrade, rollback, uninstall, apply values)
   nodeWrite: boolean      // Node write operations (cordon, uncordon, drain)
+  workloadWrites?: WorkloadWritePermissions // Workload patch permissions (restart/scale controls)
   mcpEnabled: boolean     // MCP server is running
   // How / where this Radar binary is running. Optional on the wire so a
   // newer frontend (e.g. radar-hub-web bundling a fresher @skyhook-io/radar-app)

package/src/utils/bulk-workload-actions.test.ts

@@ -0,0 +1,78 @@
+import { describe, expect, it } from 'vitest'
+import {
+  canBulkRestartKind,
+  canBulkScaleKind,
+  intersectWorkloadWrites,
+} from './bulk-workload-actions'
+import type { Capabilities, WorkloadWritePermissions } from '../types/core'
+
+const writes = (overrides: Partial<WorkloadWritePermissions> = {}): WorkloadWritePermissions => ({
+  deployments: false,
+  daemonSets: false,
+  statefulSets: false,
+  rollouts: false,
+  ...overrides,
+})
+
+const caps = (workloadWrites: WorkloadWritePermissions): Pick<Capabilities, 'workloadWrites'> => ({
+  workloadWrites,
+})
+
+describe('bulk workload action gating', () => {
+  it('allows restart for patchable workload kinds', () => {
+    const all = writes({ deployments: true, daemonSets: true, statefulSets: true, rollouts: true })
+
+    expect(canBulkRestartKind({ name: 'deployments', group: 'apps' }, all)).toBe(true)
+    expect(canBulkRestartKind({ name: 'daemonsets', group: 'apps' }, all)).toBe(true)
+    expect(canBulkRestartKind({ name: 'statefulsets', group: 'apps' }, all)).toBe(true)
+    expect(canBulkRestartKind({ name: 'rollouts', group: 'argoproj.io' }, all)).toBe(true)
+  })
+
+  it('requires the apps group for built-in workload restart', () => {
+    const all = writes({ deployments: true, daemonSets: true, statefulSets: true })
+
+    expect(canBulkRestartKind({ name: 'deployments', group: 'apps' }, all)).toBe(true)
+    expect(canBulkRestartKind({ name: 'deployments', group: 'example.com' }, all)).toBe(false)
+    expect(canBulkRestartKind({ name: 'deployments' }, all)).toBe(false)
+    expect(canBulkRestartKind({ name: 'daemonsets', group: 'example.com' }, all)).toBe(false)
+    expect(canBulkRestartKind({ name: 'statefulsets', group: 'example.com' }, all)).toBe(false)
+  })
+
+  it('requires the Argo group for rollout restart', () => {
+    const all = writes({ rollouts: true })
+
+    expect(canBulkRestartKind({ name: 'rollouts', group: 'argoproj.io' }, all)).toBe(true)
+    expect(canBulkRestartKind({ name: 'rollouts', group: 'example.com' }, all)).toBe(false)
+    expect(canBulkRestartKind({ name: 'rollouts' }, all)).toBe(false)
+  })
+
+  it('allows scale only for deployments and statefulsets', () => {
+    const all = writes({ deployments: true, daemonSets: true, statefulSets: true, rollouts: true })
+
+    expect(canBulkScaleKind({ name: 'deployments', group: 'apps' }, all)).toBe(true)
+    expect(canBulkScaleKind({ name: 'statefulsets', group: 'apps' }, all)).toBe(true)
+    expect(canBulkScaleKind({ name: 'daemonsets', group: 'apps' }, all)).toBe(false)
+    expect(canBulkScaleKind({ name: 'rollouts', group: 'argoproj.io' }, all)).toBe(false)
+    expect(canBulkScaleKind({ name: 'deployments', group: 'example.com' }, all)).toBe(false)
+    expect(canBulkScaleKind({ name: 'deployments' }, all)).toBe(false)
+  })
+
+  it('withholds actions when permissions are absent', () => {
+    expect(canBulkRestartKind({ name: 'deployments', group: 'apps' }, undefined)).toBe(false)
+    expect(canBulkScaleKind({ name: 'deployments', group: 'apps' }, undefined)).toBe(false)
+    expect(intersectWorkloadWrites(undefined)).toBeUndefined()
+    expect(intersectWorkloadWrites([])).toBeUndefined()
+  })
+
+  it('intersects multi-namespace permissions with AND semantics', () => {
+    expect(intersectWorkloadWrites([
+      caps(writes({ deployments: true, daemonSets: true, statefulSets: true, rollouts: true })),
+      caps(writes({ deployments: true, statefulSets: true })),
+    ])).toEqual({
+      deployments: true,
+      daemonSets: false,
+      statefulSets: true,
+      rollouts: false,
+    })
+  })
+})

package/src/utils/bulk-workload-actions.ts

@@ -0,0 +1,50 @@
+import type { Capabilities, WorkloadWritePermissions } from '../types/core'
+
+export type BulkWorkloadKindInfo = {
+  name: string
+  group?: string
+}
+
+export function canBulkRestartKind(
+  kind: BulkWorkloadKindInfo | null | undefined,
+  writes: WorkloadWritePermissions | undefined,
+): boolean {
+  switch (kind?.name.toLowerCase()) {
+    case 'deployments':
+      return kind.group === 'apps' && writes?.deployments === true
+    case 'daemonsets':
+      return kind.group === 'apps' && writes?.daemonSets === true
+    case 'statefulsets':
+      return kind.group === 'apps' && writes?.statefulSets === true
+    case 'rollouts':
+      return kind.group === 'argoproj.io' && writes?.rollouts === true
+    default:
+      return false
+  }
+}
+
+export function canBulkScaleKind(
+  kind: BulkWorkloadKindInfo | null | undefined,
+  writes: WorkloadWritePermissions | undefined,
+): boolean {
+  switch (kind?.name.toLowerCase()) {
+    case 'deployments':
+      return kind.group === 'apps' && writes?.deployments === true
+    case 'statefulsets':
+      return kind.group === 'apps' && writes?.statefulSets === true
+    default:
+      return false
+  }
+}
+
+export function intersectWorkloadWrites(
+  capabilities: Array<Pick<Capabilities, 'workloadWrites'>> | undefined,
+): WorkloadWritePermissions | undefined {
+  if (!capabilities || capabilities.length === 0) return undefined
+  return {
+    deployments: capabilities.every(c => c.workloadWrites?.deployments === true),
+    daemonSets: capabilities.every(c => c.workloadWrites?.daemonSets === true),
+    statefulSets: capabilities.every(c => c.workloadWrites?.statefulSets === true),
+    rollouts: capabilities.every(c => c.workloadWrites?.rollouts === true),
+  }
+}

package/src/utils/index.ts

@@ -22,3 +22,4 @@ export * from './rbac-badges'
 export * from './git-provider-urls'
 export * from './applications'
 export * from './topology-neighborhood'
+export * from './bulk-workload-actions'