@skyhook-io/k8s-ui 1.19.0 → 1.20.0

package/src/components/resources/renderers/CustomResourceDefinitionRenderer.test.tsx

@@ -0,0 +1,106 @@
+// @vitest-environment jsdom
+import { act } from 'react'
+import { createRoot } from 'react-dom/client'
+import { afterEach, expect, it, vi } from 'vitest'
+import { CustomResourceDefinitionRenderer } from './CustomResourceDefinitionRenderer'
+
+;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true
+window.matchMedia = vi.fn().mockReturnValue({ matches: false, addEventListener: vi.fn(), removeEventListener: vi.fn() })
+let root: ReturnType<typeof createRoot>
+let host: HTMLDivElement
+const schema = { type: 'object', properties: { spec: { type: 'object', description: 'Specification', required: ['field0'], properties: Object.fromEntries(Array.from({ length: 205 }, (_, i) => [`field${i}`, { type: 'string', description: `Description ${i}`, format: 'uri', 'x-kubernetes-validations': [{ rule: 'self.size() > 0', message: 'Must be set' }], oneOf: [{ required: ['a'] }, { required: ['b'] }] }])) } } }
+const data = { apiVersion: 'apiextensions.k8s.io/v1', metadata: { uid: 'a', resourceVersion: '1' }, spec: { group: 'example.io', scope: 'Namespaced', names: { kind: 'Widget', plural: 'widgets', singular: 'widget' }, versions: [{ name: 'v1beta1', served: true, storage: true, schema: { openAPIV3Schema: { properties: { old: { type: 'string' } } } } }, { name: 'v1', served: true, schema: { openAPIV3Schema: schema } }, { name: 'v2', served: false }] } }
+afterEach(() => { act(() => root?.unmount()); host?.remove() })
+function mount(resource: unknown = data, onViewInstances?: () => void) {
+  if (!host) { host = document.createElement('div'); document.body.append(host); root = createRoot(host) }
+  act(() => root.render(<CustomResourceDefinitionRenderer data={resource} onViewInstances={onViewInstances} />))
+}
+function start(onViewInstances?: () => void) { host = document.createElement('div'); document.body.append(host); root = createRoot(host); mount(data, onViewInstances) }
+function click(text: string) { const button = Array.from(host.querySelectorAll('button')).find(b => b.textContent?.includes(text)); expect(button).toBeDefined(); act(() => button!.click()) }
+function filter(value: string) { const input = host.querySelector('input')!; act(() => { Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')!.set!.call(input, value); input.dispatchEvent(new Event('input', { bubbles: true })) }) }
+const versionButton = () => host.querySelector<HTMLButtonElement>('button[aria-haspopup="listbox"]')
+function openVersions() { act(() => versionButton()!.click()); return Array.from(document.querySelectorAll<HTMLButtonElement>('[role="option"]')) }
+function version(value: string) { const option = openVersions().find(o => o.textContent === value || o.textContent?.match(new RegExp(`^${value}(storage|not served|schema)`))); expect(option).toBeDefined(); act(() => option!.click()) }
+
+it('shows definition facts, highest served version and optional Instances action', () => {
+  const view = vi.fn(); start(view)
+  expect(host.textContent).toContain('Widget')
+  expect(host.textContent).toContain('example.io')
+  expect(host.textContent).toContain('Namespaced')
+  expect(versionButton()?.getAttribute('aria-label')).toBe('Schema version: v1')
+  const options = openVersions()
+  expect(options.map(o => o.textContent)).toEqual(['v1beta1storage', 'v1', 'v2not served · schema not received'])
+  act(() => options[1].click())
+  click('View Widget resources'); expect(view).toHaveBeenCalledOnce()
+  mount(data); expect(host.textContent).not.toContain('View Widget resources')
+})
+it('lazily expands at most 100 children, reveals details and pages siblings', () => {
+  start(); expect(host.textContent).not.toContain('field0')
+  click('spec'); expect(host.textContent).toContain('field99'); expect(host.textContent).not.toContain('field100')
+  click('field0'); expect(host.textContent).toContain('format: uri'); expect(host.textContent).toContain('self.size() > 0'); expect(host.textContent).toContain('Must be set'); expect(host.textContent).toContain('One of: a · b')
+  click('Show 100 more'); expect(host.textContent).toContain('field199'); expect(host.textContent).not.toContain('field200')
+  click('Show 5 more'); expect(host.textContent).toContain('field204')
+})
+it('caps filter results, keeps the filter across versions and updates, and resets on another CRD', () => {
+  start(); filter('SPEC.FIELD')
+  expect(host.textContent).toContain('205 matching fields — showing 200')
+  expect(host.textContent).toContain('spec.field0')
+  expect(host.textContent).not.toContain('spec.field200')
+  version('v1beta1'); expect(host.querySelector('input')?.value).toBe('SPEC.FIELD'); expect(host.textContent).toContain('0 matching fields')
+  filter(''); expect(host.textContent).toContain('old')
+  version('v1'); click('spec'); expect(host.textContent).toContain('field0')
+  version('v1beta1'); version('v1'); expect(host.textContent).not.toContain('field0')
+  filter('field1'); mount({ ...data, metadata: { uid: 'a', resourceVersion: '2' } }); expect(host.querySelector('input')?.value).toBe('field1')
+  mount({ ...data, metadata: { uid: 'b', resourceVersion: '1' } }); expect(host.querySelector('input')?.value).toBe('')
+})
+it('shows constraints nested inside arrays of maps on the field that holds them', () => {
+  start(); mount({ ...data, metadata: { uid: 'n' }, spec: { ...data.spec, versions: [{ name: 'v1', served: true, schema: { openAPIV3Schema: { properties: { tiers: { type: 'array', items: { type: 'object', additionalProperties: { type: 'string', enum: ['gold', 'silver'] } } } } } } }] } })
+  expect(host.textContent).toContain('tiers[]map[string]string')
+  click('tiers'); expect(host.textContent).toContain('items values enum: gold · silver')
+})
+it('falls back to the preferred version when an update removes the one being read', () => {
+  start(); version('v1beta1'); expect(host.textContent).toContain('old')
+  mount({ ...data, spec: { ...data.spec, versions: data.spec.versions.filter(v => v.name !== 'v1beta1') } })
+  expect(versionButton()?.getAttribute('aria-label')).toBe('Schema version: v1')
+  expect(host.textContent).not.toContain("didn't receive a schema")
+})
+it('shows the rules on parent fields for a field found by search, and an empty schema plainly', () => {
+  const withRules = { ...data, spec: { ...data.spec, versions: [{ name: 'v1', served: true, schema: { openAPIV3Schema: { properties: { spec: { 'x-kubernetes-validations': [{ rule: 'has(self.a) != has(self.b)', message: 'set a or b' }], properties: { a: { type: 'string' }, b: { type: 'string' } } } } } } }] } }
+  start(); mount(withRules); filter('spec.a'); click('spec.astring')
+  expect(host.textContent).toContain('Rules on parent fields')
+  expect(host.textContent).toContain('has(self.a) != has(self.b)')
+  mount({ ...data, metadata: { uid: 'c' }, spec: { ...data.spec, versions: [{ name: 'v1', served: true, schema: { openAPIV3Schema: { type: 'object' } } }] } })
+  expect(host.textContent).toContain('This schema declares no fields.')
+})
+it('reports missing schemas honestly per version and for a stripped object', () => {
+  start(); version('v2'); expect(host.textContent).toContain("Radar didn't receive a schema for this version")
+  mount({ ...data, spec: { ...data.spec, versions: [{ name: 'v1', served: false }] } })
+  expect(host.textContent).toContain("Radar didn't receive this definition's schema. The YAML tab shows the object as returned.")
+  expect(host.textContent).not.toContain('View Widget resources')
+})
+
+it('shows preserve-unknown and int-or-string notes without replacing the declared type', () => {
+  start()
+  mount({ ...data, spec: { ...data.spec, versions: [{ name: 'v1', served: true, schema: { openAPIV3Schema: { properties: { extra: { type: 'object', 'x-kubernetes-preserve-unknown-fields': true }, port: { 'x-kubernetes-int-or-string': true } } } } }] } })
+  expect(host.textContent).toContain('extraobject')
+  click('extra'); expect(host.textContent).toContain('Accepts fields not declared in this schema.')
+  click('port'); expect(host.textContent).toContain('Accepts an integer or a string.')
+})
+
+it('suppresses boilerplate root summaries and keeps other summaries visible on expansion', () => {
+  start()
+  const short = 'Brief description'
+  const long = 'Long description. '.repeat(10)
+  mount({ ...data, spec: { ...data.spec, versions: [{ name: 'v1', served: true, schema: { openAPIV3Schema: { properties: {
+    apiVersion: { type: 'string', description: 'Version boilerplate' }, kind: { type: 'string', description: 'Kind boilerplate' }, metadata: { type: 'object', description: 'Metadata boilerplate' },
+    brief: { type: 'string', description: short }, verbose: { type: 'string', description: long },
+  } } } }] } })
+  expect(host.textContent).not.toContain('boilerplate')
+  click('brief')
+  expect(Array.from(host.querySelectorAll('button')).find(b => b.textContent?.includes('brief'))?.textContent).toContain(short)
+  expect(host.textContent?.split(short)).toHaveLength(2)
+  click('verbose')
+  expect(Array.from(host.querySelectorAll('p')).some(p => p.textContent === long)).toBe(true)
+  click('apiVersion')
+  expect(Array.from(host.querySelectorAll('button')).find(b => b.textContent?.includes('apiVersion'))?.getAttribute('aria-expanded')).toBe('true')
+})

package/src/components/resources/renderers/CustomResourceDefinitionRenderer.tsx

@@ -0,0 +1,152 @@
+import { useMemo, useRef, useState, type ReactNode } from 'react'
+import { Braces, FileCode, Tags } from 'lucide-react'
+import type { ResourceRef } from '../../../types'
+import { Collapse, CollapseChevron, useDisclosure } from '../../ui/Collapse'
+import { SelectMenu } from '../../ui/SelectMenu'
+import { AlertBanner, ConditionsSection, Property, PropertyList, ResourceLink, Section } from '../../ui/drawer-components'
+import { getCRDStatus } from '../resource-utils-crd'
+import { CRDVersionLabel } from './crd-cells'
+import { ParentRulesList, RequiredMarker, SchemaFacts, SchemaFieldFilter, SchemaPathText } from './crd-schema-parts'
+import {
+  filterCRDSchema, indexCRDSchema, preferredCRDVersion,
+  schemaChildren, schemaLeafName, schemaTypeLabel,
+  type CRDSchema, type CRDVersion, type SchemaNode,
+} from '../../../utils/crd-schema'
+
+export interface CustomResourceDefinitionRendererProps {
+  data: any
+  onNavigate?: (ref: ResourceRef) => void
+  onViewInstances?: () => void
+}
+
+function versionNotes(version: CRDVersion): string | undefined {
+  const notes = [
+    version.storage && 'storage',
+    version.deprecated && 'deprecated',
+    !version.served && 'not served',
+    !version.schema?.openAPIV3Schema && 'schema not received',
+  ].filter(Boolean)
+  return notes.length ? notes.join(' · ') : undefined
+}
+
+function SchemaRows({ nodes, root, query }: { nodes: SchemaNode[]; root?: CRDSchema; query?: string }) {
+  const fullPath = !!root
+  const [visible, setVisible] = useState(100)
+  return <div className="space-y-0.5">
+    {nodes.slice(0, fullPath ? 200 : visible).map(node => <SchemaRow key={JSON.stringify(node.path)} node={node} root={root} query={query} />)}
+    {!fullPath && nodes.length > visible && <button type="button" className="text-sm text-accent" onClick={() => setVisible(n => n + 100)}>Show {Math.min(100, nodes.length - visible)} more</button>}
+  </div>
+}
+
+function SchemaRow({ node, root, query }: { node: SchemaNode; root?: CRDSchema; query?: string }) {
+  const fullPath = !!root
+  const [open, setOpen] = useState(false)
+  const disclosure = useDisclosure(open)
+  const schema = node.schema
+  return <div className="border-l border-theme-border pl-2">
+    <button type="button" {...disclosure.buttonProps} onClick={() => setOpen(v => !v)} className="flex w-full items-start gap-1.5 rounded py-1 text-left text-sm hover:bg-theme-hover">
+      <CollapseChevron open={open} className="mt-1 h-3 w-3 shrink-0" />
+      <span className="min-w-0 flex-1">
+        {fullPath && <SchemaPathText path={node.path} query={query} part="parent" />}
+        <span className="flex flex-wrap items-baseline gap-x-2">
+          <span className="font-mono break-all text-theme-text-primary">{fullPath ? <SchemaPathText path={node.path} query={query} part="leaf" /> : schemaLeafName(node.path)}</span>
+          <span className="text-xs text-theme-text-tertiary">{schemaTypeLabel(schema)}</span>
+          {node.required && <RequiredMarker />}
+        </span>
+        {schema.description && !(node.path.length === 1 && ['apiVersion', 'kind', 'metadata'].includes(schemaLeafName(node.path))) && <span className="block truncate text-theme-text-tertiary">{schema.description}</span>}
+      </span>
+    </button>
+    <Collapse open={open} id={disclosure.panelId} mountLazily>
+      <div className="space-y-2 pb-2 pl-5 text-sm text-theme-text-secondary">
+        <SchemaFacts schema={schema} showDescription={(schema.description?.length ?? 0) > 100} />
+        {root ? <ParentRulesList node={node} root={root} /> : <SchemaChildren node={node} />}
+      </div>
+    </Collapse>
+  </div>
+}
+
+function SchemaChildren({ node }: { node: SchemaNode }) {
+  const children = useMemo(() => schemaChildren(node.schema, node.path, node), [node])
+  return children.length > 0 ? <SchemaRows nodes={children} /> : null
+}
+
+function SchemaExplorer({ version, versionPicker, filter, onFilterChange }: {
+  version?: CRDVersion
+  versionPicker?: ReactNode
+  filter: string
+  onFilterChange: (filter: string) => void
+}) {
+  const index = useRef<{ schema: CRDSchema; nodes: SchemaNode[] } | null>(null)
+  const schema = version?.schema?.openAPIV3Schema
+  const nodes = useMemo(() => schema ? schemaChildren(schema) : [], [schema])
+  let results: ReturnType<typeof filterCRDSchema> | undefined
+  if (schema && filter.trim()) {
+    if (index.current?.schema !== schema) index.current = { schema, nodes: indexCRDSchema(schema) }
+    results = filterCRDSchema(index.current.nodes, filter)
+  }
+  return <div className="space-y-3">
+    <div className="flex items-center gap-2">
+      {schema && <SchemaFieldFilter value={filter} onChange={onFilterChange} />}
+      {versionPicker && <div className="flex shrink-0 items-center gap-2 text-xs text-theme-text-secondary"><span>Version</span><div className="w-32">{versionPicker}</div></div>}
+    </div>
+    {!schema ? <p className="text-sm text-theme-text-tertiary">Radar didn't receive a schema for this version. The YAML tab shows the object as returned.</p>
+      : results ? <>
+        <p className="text-sm text-theme-text-tertiary">{results.total === 1 ? '1 matching field' : `${results.total} matching fields`}{results.total > 200 ? ' — showing 200; narrow the filter' : ''}</p>
+        <SchemaRows key="filter" nodes={results.nodes} root={schema} query={filter} />
+      </> : <>
+        <div className="space-y-2 text-sm text-theme-text-secondary"><SchemaFacts schema={{ ...schema, description: undefined }} /></div>
+        {nodes.length > 0 ? <SchemaRows key="tree" nodes={nodes} /> : <p className="text-sm text-theme-text-tertiary">This schema declares no fields.</p>}
+      </>}
+  </div>
+}
+
+export function CustomResourceDefinitionRenderer(props: CustomResourceDefinitionRendererProps) {
+  const identity = JSON.stringify([props.data.metadata?.uid, props.data.metadata?.name])
+  return <CRDDefinition key={identity} {...props} identity={identity} />
+}
+
+function CRDDefinition({ data, onNavigate, onViewInstances, identity }: CustomResourceDefinitionRendererProps & { identity: string }) {
+  const spec = data.spec || {}
+  const names = spec.names || {}
+  const versions: CRDVersion[] = spec.versions || []
+  const [picked, setSelected] = useState(() => preferredCRDVersion(versions)?.name)
+  const [filter, setFilter] = useState('')
+  // An update can remove the version being read; fall back rather than
+  // reporting its schema as missing.
+  const version = versions.find(v => v.name === picked) ?? preferredCRDVersion(versions)
+  const selected = version?.name
+  const status = getCRDStatus(data)
+  const service = spec.conversion?.webhook?.clientConfig?.service
+  const allMissing = versions.every(v => !v.schema?.openAPIV3Schema)
+  return <>
+    {(status.tone === 'unhealthy' || status.tone === 'degraded') && <AlertBanner variant={status.tone === 'unhealthy' ? 'error' : 'warning'} title={status.text} message={status.reason} />}
+    <Section title="Definition" icon={FileCode} defaultExpanded={true}>
+      <PropertyList>
+        <Property label="Kind" value={names.kind} />
+        <Property label="Group" value={spec.group} />
+        <Property label="Scope" value={spec.scope} />
+        <Property label="Versions" value={<div className="space-y-1">{versions.map(v => <div key={v.name}><CRDVersionLabel version={v} />{v.deprecationWarning && <p className="text-sm text-theme-text-tertiary">{v.deprecationWarning}</p>}</div>)}</div>} />
+        {onViewInstances && versions.some(v => v.served) && <Property label="Instances" value={<button type="button" onClick={onViewInstances} className="text-accent hover:underline">View {names.kind} resources →</button>} />}
+      </PropertyList>
+    </Section>
+    <Section title="Schema" icon={Braces} defaultExpanded={true}>
+      <div className="space-y-3">
+        {allMissing ? <p className="text-sm text-theme-text-tertiary">Radar didn't receive this definition's schema. The YAML tab shows the object as returned.</p>
+          : <SchemaExplorer key={`${identity}:${selected}`} version={version} filter={filter} onFilterChange={setFilter} versionPicker={versions.length > 1 && <SelectMenu ariaLabel="Schema version" value={selected || ''} onChange={setSelected}
+            options={versions.map(v => ({ value: v.name, label: v.name, description: versionNotes(v) }))} />} />}
+      </div>
+    </Section>
+    <Section title="Names & conversion" icon={Tags} defaultExpanded={false}>
+      <PropertyList>
+        <Property label="Plural" value={names.plural} />
+        <Property label="Singular" value={names.singular} />
+        <Property label="List kind" value={names.listKind} />
+        <Property label="Short names" value={names.shortNames?.join(', ')} />
+        <Property label="Categories" value={names.categories?.join(', ')} />
+        <Property label="Conversion strategy" value={spec.conversion?.strategy} />
+        {service && <Property label="Webhook service" value={<><ResourceLink kind="Service" namespace={service.namespace} name={service.name} onNavigate={onNavigate} />{service.path && <span className="font-mono ml-1">{service.path}</span>}</>} />}
+      </PropertyList>
+    </Section>
+    <ConditionsSection conditions={data.status?.conditions} />
+  </>
+}

package/src/components/resources/renderers/JobRenderer.test.tsx

@@ -0,0 +1,35 @@
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, it } from 'vitest'
+import { JobRenderer } from './JobRenderer'
+
+const job = { apiVersion: 'batch/v1', kind: 'Job', metadata: {}, spec: { suspend: true } }
+
+describe('Job suspension banner', () => {
+  it('keeps the ordinary suspension advice without Kueue evidence', () => {
+    expect(renderToStaticMarkup(<JobRenderer data={job} />)).toContain('Pods will not be created until this Job is resumed.')
+  })
+
+  it('recognizes the queue label without a host lookup', () => {
+    const html = renderToStaticMarkup(<JobRenderer data={{ ...job, metadata: { labels: { 'kueue.x-k8s.io/queue-name': 'quota' } } }} />)
+    expect(html).toContain('Held by Kueue until admitted')
+    expect(html).not.toContain('until this Job is resumed')
+  })
+
+  it('accepts controller-owned admission evidence from the host', () => {
+    expect(renderToStaticMarkup(<JobRenderer data={job} kueueManaged />)).toContain('Held by Kueue until admitted')
+  })
+
+  it('does not treat a label on a colliding Job kind as Kueue evidence', () => {
+    const html = renderToStaticMarkup(<JobRenderer data={{ ...job, apiVersion: 'batch.volcano.sh/v1alpha1', metadata: { labels: { 'kueue.x-k8s.io/queue-name': 'quota' } } }} />)
+    expect(html).toContain('Job Suspended')
+    expect(html).not.toContain('Held by Kueue')
+  })
+
+  it('preserves failures above admission and omits a hold banner when unsuspended', () => {
+    const html = renderToStaticMarkup(<JobRenderer data={{ ...job, status: { conditions: [{ type: 'Failed', status: 'True', reason: 'DeadlineExceeded' }] } }} kueueManaged admissionContent={<p>admission evidence</p>} />)
+    expect(html).toContain('Job Issues')
+    expect(html.indexOf('Job Issues')).toBeLessThan(html.indexOf('admission evidence'))
+    expect(html).not.toContain('Held by Kueue')
+    expect(renderToStaticMarkup(<JobRenderer data={{ ...job, spec: { suspend: false } }} kueueManaged />)).not.toContain('Held by Kueue')
+  })
+})

package/src/components/resources/renderers/JobRenderer.tsx

@@ -6,6 +6,7 @@ import { formatDuration } from '../resource-utils'
 interface JobRendererProps {
   data: any
   admissionContent?: ReactNode
+  kueueManaged?: boolean
 }
 
 // Extract problems from Job status and conditions
@@ -44,7 +45,7 @@ function getJobProblems(data: any): string[] {
   return problems
 }
 
-export function JobRenderer({ data, admissionContent }: JobRendererProps) {
+export function JobRenderer({ data, admissionContent, kueueManaged = false }: JobRendererProps) {
   const status = data.status || {}
   const spec = data.spec || {}
   const conditions = status.conditions || []
@@ -66,6 +67,7 @@ export function JobRenderer({ data, admissionContent }: JobRendererProps) {
   // Check if job completed successfully
   const isComplete = conditions.some((c: any) => c.type === 'Complete' && c.status === 'True')
   const isSuspended = spec.suspend === true
+  const heldByKueue = kueueManaged || (data.apiVersion === 'batch/v1' && data.kind === 'Job' && Boolean(data.metadata?.labels?.['kueue.x-k8s.io/queue-name']))
 
   return (
     <>
@@ -76,7 +78,10 @@ export function JobRenderer({ data, admissionContent }: JobRendererProps) {
 
       {/* Suspended is an intentional state, not a fault — keep it informational. */}
       {isSuspended && !hasProblems && (
-        <AlertBanner variant="info" title="Job Suspended" message="Pods will not be created until this Job is resumed." />
+        <AlertBanner variant="info"
+          title={heldByKueue ? 'Held by Kueue until admitted' : 'Job Suspended'}
+          message={heldByKueue ? 'See Kueue admission for the queue and admission evidence.' : 'Pods will not be created until this Job is resumed.'}
+        />
       )}
 
       {/* Success banner */}

package/src/components/resources/renderers/KueueQueueRenderers.test.tsx

@@ -49,8 +49,8 @@ describe('queue quota accounting', () => {
 describe('queue status and policy', () => {
   it('does not turn absent status into zero workloads or healthy state', () => {
     const html = render(base)
-    expect(html).toContain('Controller status has not been reported')
-    expect(html).not.toContain('No Active condition reported')
+    expect(html).toContain('No Active condition reported')
+    expect(html).toContain('Not reported')
     expect(html).toContain('Unknown')
     const counted = render({ ...base, status: { pendingWorkloads: 0, reservingWorkloads: 1, admittedWorkloads: 1 } })
     expect(counted).not.toContain('counts have not been reported')
@@ -79,8 +79,8 @@ describe('queue status and policy', () => {
     const data = { ...base, spec: { stopPolicy }, status: { conditions: [{ type: 'Active', status: 'False', reason: 'FlavorNotFound', message: 'flavor missing' }] } }
     expect(getClusterQueueStatus(data).text).toBe('FlavorNotFound')
     const html = render(data)
-    expect(html).toContain('cancel reservations')
-    expect(html).toContain(stopPolicy === 'Hold' ? 'may continue' : 'are to be evicted')
+    expect(html).toContain('reservations are cancelled')
+    expect(html).toContain(stopPolicy === 'Hold' ? 'admitted Workloads run to completion' : 'admitted Workloads are evicted')
     expect(html).toContain('flavor missing')
   })
 
@@ -111,7 +111,7 @@ it('omits zero borrowing and irrelevant cohort policies on a real-shaped standal
   } }
   const html = render(data)
   expect(html).not.toContain('Nominal quota is not a hard ceiling')
-  for (const text of ['Borrowed reservation:', 'Reclaim within Cohort', 'Borrow with Preemption', 'Flavor when Borrowing']) expect(html).not.toContain(text)
+  for (const text of ['Borrowed reservation:', 'Reclaim within cohort', 'Borrow with preemption', 'Flavor when borrowing']) expect(html).not.toContain(text)
   const cohort = render({ ...data, spec: { ...data.spec, cohortName: 'shared' } })
   expect(cohort).toContain('Nominal quota is not a hard ceiling')
   expect(cohort).toContain('borrowing has no configured cap')