@skyhook-io/k8s-ui 1.18.0 → 1.18.2

package/src/components/shared/ManagedByChip.tsx

@@ -1,6 +1,11 @@
+import { useEffect, useRef, useState } from 'react'
 import { GitBranch, Package } from 'lucide-react'
 import { clsx } from 'clsx'
-import type { GitOpsOwnerRef } from '../../utils/gitops-owner'
+import { activeManagerClaims, gitOpsOwnerFromRef, managerCandidates, managerChipPresentation, managerChoices, managerRefLabel, type GitOpsOwnerRef, type ManagerChoice, type ManagerListing } from '../../utils/gitops-owner'
+import { useAnimatedUnmount } from '../../hooks/useAnimatedUnmount'
+import { TRANSITION_MENU, overlayExitMs, overlayTransitionStyle } from '../../utils/animation'
+import type { ManagerAnswer, ResourceRef } from '../../types/core'
+import { resourceRefKey } from '../../utils/resource-refs'
 import type { GitOpsStatus } from '../../types/gitops'
 import { StatusDot, type StatusTone } from '../ui/status-tone'
 import { Tooltip } from '../ui/Tooltip'
@@ -11,7 +16,10 @@ export type HelmOwnerRef = {
 }
 
 // ManagedByChip renders the "Managed by <ArgoCD/FluxCD app>" affordance for
-// resources detected (via labels/annotations) to be GitOps-managed. The chip
+// resources detected (via labels/annotations) to be GitOps-managed. `listing`
+// compares that claim with the managers whose status lists the resource: a
+// manager that doesn't list it while another does is shown as "Tracked by"
+// with a warning, since the claim is all that names it. The chip
 // is clickable when the host wires `onOpen`; integrators that don't surface
 // a GitOps tab can omit the handler and the chip degrades to a passive badge
 // so the relationship is still visible.
@@ -21,26 +29,33 @@ export type HelmOwnerRef = {
 //   - block: starts a new line with mt-1 spacing, used in WorkloadView title strip
 export function ManagedByChip({
   owner,
+  manager,
   status,
   onOpen,
   verified = true,
   pending = false,
   source,
+  listing,
   variant = 'inline',
 }: {
-  owner: GitOpsOwnerRef
+  owner?: GitOpsOwnerRef | null
+  manager?: ManagerAnswer
   status?: GitOpsStatus | null
   onOpen?: (ref: GitOpsOwnerRef) => void
   verified?: boolean
   pending?: boolean
   source?: string | null
+  listing?: ManagerListing
   variant?: 'inline' | 'block'
 }) {
+  if (manager) return <ManagerAnswerChip manager={manager} status={status} onOpen={onOpen} variant={variant} />
+  if (!owner) return null
   const toolLabel = owner.tool === 'argocd' ? 'ArgoCD' : 'FluxCD'
   const ownerKindLabel = gitOpsOwnerKindLabel(owner)
   const label = owner.namespace ? `${owner.namespace}/${owner.name}` : owner.name
   const statusLabel = status ? gitOpsStatusLabel(status) : null
-  const prefix = pending ? 'Resolving' : verified ? 'Managed by' : 'Tracked by'
+  const conflict = listing?.state === 'conflict' ? listing.listedBy : null
+  const prefix = pending ? 'Resolving' : verified && !conflict ? 'Managed by' : 'Tracked by'
   const tooltipContent = (
     <span className="flex flex-col gap-1">
       <span>
@@ -48,10 +63,23 @@ export function ManagedByChip({
           <>
             Looking up matching {ownerKindLabel} <TooltipCode>{label}</TooltipCode> in this cluster.
           </>
+        ) : conflict ? (
+          <>
+            This resource's {toolLabel} tracking metadata names <TooltipCode>{label}</TooltipCode>, but that {ownerKindLabel}'s status doesn't list it.{' '}
+            {conflict.length === 1 ? 'The status of ' : 'The statuses of '}
+            {conflict.map((m, i) => (
+              <span key={`${m.namespace}/${m.name}`}>
+                {i > 0 && ', '}
+                <TooltipCode>{m.namespace ? `${m.namespace}/${m.name}` : m.name}</TooltipCode>
+              </span>
+            ))}{' '}
+            {conflict.length === 1 ? 'does.' : 'do.'}
+          </>
         ) : verified ? (
           <>
             Managed by {toolLabel} · <TooltipCode>{label}</TooltipCode>
             {statusLabel && <> · {statusLabel}{status?.message ? `: ${status.message}` : ''}</>}
+            {listing?.state === 'confirmed' && <>. Its status lists this resource too.</>}
           </>
         ) : (
           <>
@@ -80,6 +108,7 @@ export function ManagedByChip({
         )}
       >
         <GitBranch className="h-3 w-3 shrink-0" />
+        {conflict && <StatusDot tone="degraded" size="xs" />}
         <span className="shrink-0 text-theme-text-tertiary">{prefix}</span>
         <span className="truncate max-w-[180px]">{label}</span>
         {statusLabel && (
@@ -96,13 +125,136 @@ export function ManagedByChip({
   )
 }
 
+function ManagerAnswerChip({ manager, status, onOpen, variant }: {
+  manager: ManagerAnswer
+  status?: GitOpsStatus | null
+  onOpen?: (ref: GitOpsOwnerRef) => void
+  variant: 'inline' | 'block'
+}) {
+  const [open, setOpen] = useState(false)
+  const { shouldRender, isOpen } = useAnimatedUnmount(open, overlayExitMs('menu'))
+  const ref = useRef<HTMLDivElement>(null)
+  useEffect(() => {
+    if (!open) return
+    const onDown = (e: MouseEvent) => {
+      if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false)
+    }
+    // Consumed, so the Escape that closes the menu doesn't also close the drawer.
+    const onKey = (e: KeyboardEvent) => {
+      if (e.key !== 'Escape') return
+      e.preventDefault()
+      e.stopPropagation()
+      setOpen(false)
+    }
+    document.addEventListener('mousedown', onDown)
+    document.addEventListener('keydown', onKey, true)
+    return () => {
+      document.removeEventListener('mousedown', onDown)
+      document.removeEventListener('keydown', onKey, true)
+    }
+  }, [open])
+
+  const presentation = managerChipPresentation(manager)
+  if (!presentation) return null
+  // Several candidates open a menu naming each, so none is reached only
+  // through the one shown first; one opens directly.
+  // Every candidate is named; only one Radar found links. A label that names
+  // no namespace stays unlinked: Radar doesn't guess it.
+  const choices = managerChoices(manager).map(c => {
+    const owner = gitOpsOwnerFromRef(c.ref)
+    return { ...c, owner: c.found && owner?.namespace ? owner : null }
+  })
+  // A label naming no namespace is unresolved only when its own check says
+  // so; otherwise Applications of that name list the object and it doesn't
+  // say which.
+  const evidence = manager.via ?? manager.direct
+  const unresolved = (ref: ResourceRef) => activeManagerClaims(evidence).some(c => c.check === 'unresolved' && resourceRefKey(c.manager) === resourceRefKey(ref))
+  const several = managerCandidates(manager).length > 1
+  const lead = manager.lead ? gitOpsOwnerFromRef(manager.lead) : null
+  const direct = !several ? choices.find(c => c.owner && lead && c.owner.name === lead.name && c.owner.namespace === lead.namespace)?.owner ?? null : null
+  const menu = Boolean(onOpen) && several && choices.some(c => c.owner)
+  // The manager's own status, shown only when it is confirmed to manage this
+  // resource: beside a list alone, Synced reads as this resource's state.
+  const statusLabel = lead && status && !several && manager.state === 'agree' ? gitOpsStatusLabel(status) : null
+  const chipClass = clsx(
+    'inline-flex min-w-0 items-center gap-1 rounded border border-theme-border bg-theme-elevated px-1.5 py-0.5 text-[11px] text-theme-text-secondary',
+    (menu || direct && onOpen) && 'hover:border-accent hover:text-accent transition-colors',
+  )
+  const content = (
+    <>
+      <GitBranch className="h-3 w-3 shrink-0" />
+      {presentation.warning && <StatusDot tone="degraded" size="xs" />}
+      <span className="shrink-0 text-theme-text-tertiary">{presentation.prefix}</span>
+      <span className="truncate max-w-[180px]">{presentation.label}</span>
+      {presentation.via && <span className="shrink-0 text-theme-text-tertiary">via {presentation.via}</span>}
+      {statusLabel && <><span className="mx-0.5 text-theme-text-disabled">·</span><StatusDot tone={gitOpsStatusTone(status!)} size="xs" /><span>{statusLabel}</span></>}
+    </>
+  )
+  const tooltip = `${presentation.tooltip}${statusLabel ? ` ${statusLabel}${status?.message ? `: ${status.message}` : ''}.` : ''}`
+  const chip = menu ? (
+    <button type="button" aria-haspopup="menu" aria-expanded={open} onClick={() => setOpen(v => !v)} className={chipClass}>{content}</button>
+  ) : direct && onOpen ? (
+    <button type="button" onClick={() => onOpen(direct)} className={chipClass}>{content}</button>
+  ) : (
+    // Focusable, so keyboard users reach the tooltip that explains it.
+    <span tabIndex={0} className={chipClass}>{content}</span>
+  )
+  return (
+    <div ref={ref} className={clsx('relative inline-flex min-w-0', variant === 'block' && 'mt-1')}>
+      <Tooltip content={tooltip} delay={500} position="bottom">{chip}</Tooltip>
+      {menu && shouldRender && (
+        <div
+          role="menu"
+          inert={!open}
+          className={clsx(
+            'absolute left-0 top-full z-50 mt-1 min-w-[220px] origin-top-left rounded-lg border border-theme-border bg-theme-surface py-1 shadow-theme-lg',
+            TRANSITION_MENU,
+            isOpen ? 'opacity-100 translate-y-0 scale-100' : 'opacity-0 -translate-y-1 scale-[0.97]',
+            !open && 'pointer-events-none',
+          )}
+          style={overlayTransitionStyle(isOpen, 'menu')}
+        >
+          {choices.map(c => (
+            <button
+              key={`${c.ref.group}/${c.ref.kind}/${c.ref.namespace}/${c.ref.name}`}
+              type="button"
+              role="menuitem"
+              disabled={!c.owner}
+              onClick={() => {
+                if (!c.owner) return
+                setOpen(false)
+                onOpen?.(c.owner)
+              }}
+              className={clsx(
+                'flex w-full flex-col items-start px-3 py-1.5 text-left text-xs transition-colors',
+                c.owner ? 'text-theme-text-secondary hover:bg-theme-hover hover:text-theme-text-primary' : 'cursor-default text-theme-text-tertiary',
+              )}
+            >
+              <span className="truncate">{managerRefLabel(c.ref)}</span>
+              <span className="text-[11px] text-theme-text-tertiary">{choiceRole(c)}{c.owner ? '' : !c.ref.namespace ? unresolved(c.ref) ? ` · Radar found no ${c.ref.kind} of this name listing it; it may be managed from another cluster` : ` · its label doesn't say which ${c.ref.kind} of this name` : !c.found ? ' · Radar found no such manager you can view' : ''}</span>
+            </button>
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
+
+function choiceRole(c: Pick<ManagerChoice, 'listed' | 'claimed' | 'found'>): string {
+  if (c.listed && c.claimed) return 'Its status lists this, and the metadata names it'
+  if (c.listed) return 'Its status lists this'
+  return 'This metadata names it'
+}
+
 export function HelmManagedByChip({
   owner,
+  manager,
   onOpen,
   source,
   variant = 'inline',
 }: {
   owner: HelmOwnerRef
+  manager?: ManagerAnswer
   onOpen?: (ref: HelmOwnerRef) => void
   source?: string | null
   variant?: 'inline' | 'block'
@@ -113,6 +265,7 @@ export function HelmManagedByChip({
       <span>
         Managed by Helm release <TooltipCode>{label}</TooltipCode>.
       </span>
+      {manager && <span>{managerChipPresentation(manager)?.tooltip}</span>}
       {source && (
         <span>
           Inferred from <TooltipCode>{source}</TooltipCode>.
@@ -141,7 +294,7 @@ export function HelmManagedByChip({
   )
 }
 
-function gitOpsOwnerKindLabel(owner: GitOpsOwnerRef): string {
+export function gitOpsOwnerKindLabel(owner: GitOpsOwnerRef): string {
   if (owner.tool === 'argocd') return 'Application'
   if (owner.kind === 'helmreleases') return 'HelmRelease'
   if (owner.kind === 'kustomizations') return 'Kustomization'

package/src/components/shared/ResourceActionsBar.identity.test.tsx

@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest'
+import { renderToString } from 'react-dom/server'
+import { ResourceActionsBar } from './ResourceActionsBar'
+
+const noop = () => {}
+
+function actions(kind: string, apiVersion: string) {
+  return renderToString(
+    <ResourceActionsBar
+      resource={{ kind, name: 'example', namespace: 'test' }}
+      data={{ apiVersion, metadata: { name: 'example', namespace: 'test' } }}
+      onFluxReconcile={noop}
+      onFluxSuspend={noop}
+      onFluxResume={noop}
+      onArgoSync={noop}
+      onArgoRefresh={noop}
+      onArgoSuspend={noop}
+      onArgoResume={noop}
+      canPortForward
+      renderPortForward={() => <button>Port forward</button>}
+    />,
+  )
+}
+
+describe('resource actions use the loaded API group', () => {
+  it.each(['app.k8s.io/v1beta1', 'notargoproj.io/v1alpha1', ''])('does not offer Argo actions for Application in %s', (apiVersion) => {
+    const html = actions('applications', apiVersion)
+    expect(html).not.toContain('>Sync<')
+    expect(html).not.toContain('>Refresh<')
+    expect(html).not.toContain('Enable Auto-Sync')
+  })
+
+  it('retains Argo actions for its exact Application group', () => {
+    const html = actions('applications', 'argoproj.io/v1alpha1')
+    expect(html).toContain('>Sync<')
+    expect(html).toContain('>Refresh<')
+    expect(html).toContain('Enable Auto-Sync')
+  })
+
+  it.each(['serving.knative.dev/v1', 'vendor.serving.knative.dev/v1', 'vendor.io/v1', ''])('does not port-forward a non-core Service in %s', (apiVersion) => {
+    expect(actions('services', apiVersion)).not.toContain('Port forward')
+  })
+
+  it('retains port forwarding for core Service', () => {
+    expect(actions('services', 'v1')).toContain('Port forward')
+  })
+  it.each([
+    ['gitrepositories', 'source.toolkit.fluxcd.io'],
+    ['ocirepositories', 'source.toolkit.fluxcd.io'],
+    ['helmrepositories', 'source.toolkit.fluxcd.io'],
+    ['kustomizations', 'kustomize.toolkit.fluxcd.io'],
+    ['helmreleases', 'helm.toolkit.fluxcd.io'],
+    ['alerts', 'notification.toolkit.fluxcd.io'],
+  ])('only offers Flux actions for %s in its exact group', (kind, group) => {
+    expect(actions(kind, `${group}/v1`)).toContain('>Reconcile<')
+    for (const apiVersion of ['', 'vendor.io/v1', `foreign.${group}/v1`, 'argoproj.io/v1alpha1']) {
+      const html = actions(kind, apiVersion)
+      expect(html).not.toContain('>Reconcile<')
+      expect(html).not.toContain('>Suspend<')
+      expect(html).not.toContain('>Resume<')
+    }
+  })
+
+})

package/src/components/shared/ResourceActionsBar.tsx

@@ -1,4 +1,5 @@
 import { getNodeLifecycle } from '../../utils/node-lifecycle'
+import { resourceRefKey } from '../../utils/resource-refs'
 import { useEffect, useState, useRef, useId } from 'react'
 import {
   RefreshCw,
@@ -21,7 +22,7 @@ import { createTwoFilesPatch } from 'diff'
 import { clsx } from 'clsx'
 import { classifyDiffLine } from './UnifiedDiff'
 import { Tooltip } from '../ui/Tooltip'
-import { ForceDeleteConfirmDialog, type CascadeDependent } from '../ui/ForceDeleteConfirmDialog'
+import { ForceDeleteConfirmDialog, type CascadeDependent, type CascadeDetail } from '../ui/ForceDeleteConfirmDialog'
 import { ConfirmDialog } from '../ui/ConfirmDialog'
 import { AlertBanner } from '../ui/drawer-components'
 import { DialogPortal } from '../ui/DialogPortal'
@@ -32,6 +33,9 @@ import { getDefaultContainerName, getExecContainerNames } from '../resources/res
 import { SetImageDialog, type SetImageOwnership } from './SetImageDialog'
 import { DrainPlanDialog, DEFAULT_DRAIN_DIALOG_OPTIONS, type DrainDialogOptions, type DrainPlan } from './DrainPlanDialog'
 import type { WorkloadImageInventory, WorkloadImageUpdate } from '../../types/core'
+import { getGitOpsTool } from '../gitops/detail-helpers'
+import { apiVersionToGroup } from '../../utils/navigation'
+import { isApiGroup } from '../resources/resource-utils-cnpg'
 import { isArgoRolloutResource } from '../../utils/workload-rollout'
 import { isCoreBatchJob } from '../../utils/api-resources'
 import { formatRelativeAgeTime } from '../../utils/format'
@@ -40,6 +44,8 @@ import { formatRelativeAgeTime } from '../../utils/format'
 // ACTIONS BAR - Interactive buttons that change based on resource kind
 // ============================================================================
 
+const FLUX_ACTION_KINDS = new Set(['gitrepositories', 'ocirepositories', 'helmrepositories', 'kustomizations', 'helmreleases', 'alerts'])
+
 interface ResourceActionsBarProps {
   resource: SelectedResource
   leadingActions?: React.ReactNode
@@ -80,6 +86,8 @@ interface ResourceActionsBarProps {
   isDeleting?: boolean
   cascadeDependents?: CascadeDependent[]
   cascadeLoading?: boolean
+  onDeletePreviewOpenChange?: (open: boolean) => void
+  cascadeDetail?: CascadeDetail
   cascadeRootResolved?: boolean
   cascadePreviewFailed?: boolean
 
@@ -163,7 +171,7 @@ export function ResourceActionsBar({
   canExec, canViewLogs, canPortForward,
   onOpenTerminal, onOpenLogs: openLogs, onOpenWorkloadLogs: openWorkloadLogs, onCopyCommand,
   renderPortForward,
-  onDelete, isDeleting, cascadeDependents, cascadeLoading, cascadeRootResolved, cascadePreviewFailed,
+  onDelete, isDeleting, onDeletePreviewOpenChange, cascadeDetail, cascadeDependents, cascadeLoading, cascadeRootResolved, cascadePreviewFailed,
   onRestart, isRestarting,
   onLoadImages, onSetImages, isSettingImages, imageOwnership,
   revisions: revisionsList, revisionsLoading, revisionsError, onRollback, isRollingBack,
@@ -187,6 +195,7 @@ export function ResourceActionsBar({
   onPlanDrain, onPlanDrainReset, drainPlan, isPlanningDrain, drainPlanError, drainPlanUpgrade,
 }: ResourceActionsBarProps) {
   const kind = resource.kind.toLowerCase()
+  const isFluxAction = FLUX_ACTION_KINDS.has(kind) && getGitOpsTool(kind, apiVersionToGroup(data?.apiVersion)) === 'flux'
   const coreBatchJob = isCoreBatchJob(kind, resource.group)
   const supportsWorkloadActions = ['deployments', 'statefulsets', 'daemonsets'].includes(kind) ||
     (kind === 'rollouts' && isArgoRolloutResource(data))
@@ -199,6 +208,14 @@ export function ResourceActionsBar({
 
   // Delete confirmation state
   const [showDeleteConfirm, setShowDeleteConfirm] = useState(false)
+  const deleteMounted = useRef(true)
+  useEffect(() => {
+    deleteMounted.current = true
+    return () => { deleteMounted.current = false }
+  }, [])
+  const currentDeleteTarget = useRef({ key: resourceRefKey(resource), uid: data?.metadata?.uid })
+  currentDeleteTarget.current = { key: resourceRefKey(resource), uid: data?.metadata?.uid }
+  useEffect(() => { onDeletePreviewOpenChange?.(showDeleteConfirm) }, [showDeleteConfirm, onDeletePreviewOpenChange])
 
   // Node operation confirmation state
   const [showCordonConfirm, setShowCordonConfirm] = useState(false)
@@ -234,12 +251,13 @@ export function ResourceActionsBar({
   const hasMultipleRevisions = (revisionsList?.length ?? 0) > 1
 
   function handleDeleteConfirm(force: boolean) {
+    const target = currentDeleteTarget.current
+    setShowDeleteConfirm(false)
     onDelete?.(
       { kind: resource.kind, group: resource.group, namespace: resource.namespace, name: resource.name, force },
       {
         onSuccess: () => {
-          setShowDeleteConfirm(false)
-          onClose?.()
+          if (deleteMounted.current && currentDeleteTarget.current.key === target.key && currentDeleteTarget.current.uid === target.uid) onClose?.()
         },
       }
     )
@@ -406,7 +424,7 @@ export function ResourceActionsBar({
       )}
 
       {/* Service actions */}
-      {kind === 'services' && !data?.apiVersion?.includes('serving.knative.dev') && canPortForward && resource.namespace && resource.name && renderPortForward && (
+      {kind === 'services' && data?.apiVersion === 'v1' && canPortForward && resource.namespace && resource.name && renderPortForward && (
         renderPortForward({
           type: 'service',
           namespace: resource.namespace,
@@ -516,7 +534,7 @@ export function ResourceActionsBar({
       )}
 
       {/* FluxCD actions */}
-      {['gitrepositories', 'ocirepositories', 'helmrepositories', 'kustomizations', 'helmreleases', 'alerts'].includes(kind) && (
+      {isFluxAction && (
         <FluxActions
           resource={resource}
           data={data}
@@ -532,7 +550,7 @@ export function ResourceActionsBar({
       )}
 
       {/* ArgoCD actions */}
-      {kind === 'applications' && (
+      {kind === 'applications' && isApiGroup(data?.apiVersion, 'argoproj.io') && (
         <ArgoActions
           resource={resource}
           data={data}
@@ -667,12 +685,14 @@ export function ResourceActionsBar({
       )}
 
       {onDelete && !((kind === 'node' || kind === 'nodes') && data?.metadata?.deletionTimestamp) && (
-        <Tooltip content="Delete resource">
+        <Tooltip content={isDeleting ? 'Deleting resource' : 'Delete resource'}>
           <button
+            aria-label={isDeleting ? 'Deleting resource' : 'Delete resource'}
+            disabled={isDeleting}
             onClick={() => setShowDeleteConfirm(true)}
             className="p-1.5 text-theme-text-secondary border border-theme-border-light rounded-lg hover:text-red-400 hover:border-red-400/50 hover:bg-red-500/10 transition-colors"
           >
-            <Trash2 className="w-3.5 h-3.5" />
+            {isDeleting ? <RefreshCw className="w-3.5 h-3.5 animate-spin" /> : <Trash2 className="w-3.5 h-3.5" />}
           </button>
         </Tooltip>
       )}
@@ -684,9 +704,11 @@ export function ResourceActionsBar({
         onClose={() => setShowDeleteConfirm(false)}
         onConfirm={handleDeleteConfirm}
         resourceName={resource.name}
+        resourceData={data}
         resourceKind={displayKindName(resource.kind, data?.kind)}
         namespaceName={resource.namespace}
         isLoading={isDeleting ?? false}
+        cascadeDetail={cascadeDetail}
         cascadeDependents={cascadeDependents}
         cascadeLoading={cascadeLoading}
         cascadeRootResolved={cascadeRootResolved}

package/src/components/shared/ResourceRendererDispatch.test.tsx

@@ -1087,3 +1087,52 @@ it('uses RayJob native detail only for the supported exact API', () => {
     if (apiVersion !== 'ray.io/v1') { expect(html).toContain('native-fallback'); expect(getResourceStatus('rayjobs', data)).toBeNull() }
   }
 })
+
+describe('API group identity', () => {
+  it.each([
+    ['applications', 'app.k8s.io/v1beta1', 'Application'],
+    ['applications', 'notargoproj.io/v1alpha1', 'Application'],
+    ['services', 'vendor.serving.knative.dev/v1', 'Service'],
+    ['ingresses', 'vendor.networking.internal.knative.dev/v1alpha1', 'Ingress'],
+    ['certificates', 'vendor.networking.internal.knative.dev/v1alpha1', 'Certificate'],
+    ['gateways', 'vendor.networking.istio.io/v1', 'Gateway'],
+  ])('keeps %s in %s generic', (plural, apiVersion, kind) => {
+    const data = { apiVersion, kind, metadata: { name: 'foreign', namespace: 'test' }, spec: { vendorSetting: 'custom-value' }, status: { phase: 'VendorReady' } }
+    expect(renderKind(plural, data, 'test')).toContain('custom-value')
+    expect(getResourceStatus(plural, data)?.text).toBe('VendorReady')
+  })
+
+  it('retains Argo CD status for its exact Application group', () => {
+    const data = { apiVersion: 'argoproj.io/v1alpha1', kind: 'Application', metadata: { name: 'real' }, status: { sync: { status: 'Synced' }, health: { status: 'Healthy' } } }
+    expect(renderKind('applications', data)).toContain('Synced')
+    expect(getResourceStatus('applications', data)?.text).toBe('Healthy')
+  })
+
+  it('retains Knative Service status and core Service presentation', () => {
+    expect(getResourceStatus('services', { apiVersion: 'serving.knative.dev/v1', status: { conditions: [{ type: 'Ready', status: 'True' }] } })?.text).toBe('Ready')
+    expect(renderKind('services', { apiVersion: 'v1', metadata: { name: 'core' }, spec: { type: 'ClusterIP', clusterIP: '10.0.0.1' } })).toContain('10.0.0.1')
+  })
+})
+
+describe('Flux kind collisions', () => {
+  it.each([
+    ['gitrepositories', 'source.toolkit.fluxcd.io'],
+    ['ocirepositories', 'source.toolkit.fluxcd.io'],
+    ['helmrepositories', 'source.toolkit.fluxcd.io'],
+    ['kustomizations', 'kustomize.toolkit.fluxcd.io'],
+    ['helmreleases', 'helm.toolkit.fluxcd.io'],
+    ['alerts', 'notification.toolkit.fluxcd.io'],
+  ])('keeps foreign %s generic and preserves its real Flux renderer', (kind, group) => {
+    const resource = {
+      apiVersion: `${group}/v1`, metadata: { name: 'example', namespace: 'test' },
+      spec: { vendorSetting: 'custom-value' }, status: { phase: 'VendorReady' },
+    }
+    expect(renderKind(kind, resource, 'test')).not.toContain('custom-value')
+    expect(getResourceStatus(kind, resource)?.text).not.toBe('VendorReady')
+    for (const apiVersion of ['vendor.io/v1', `foreign.${group}/v1`, 'argoproj.io/v1alpha1']) {
+      const foreign = { ...resource, apiVersion }
+      expect(renderKind(kind, foreign, 'test')).toContain('custom-value')
+      expect(getResourceStatus(kind, foreign)?.text).toBe('VendorReady')
+    }
+  })
+})