@skyhook-io/k8s-ui 1.8.1 → 1.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyhook-io/k8s-ui",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/skyhook-io/radar",

package/src/components/applications/AppTooltips.tsx

@@ -1,4 +1,4 @@
-import { provenanceSource, HEALTH_META, type AppWorkload } from '../../utils/applications'
+import { provenanceSource, HEALTH_META, appSourceLabel, isDeclaredAppSource, APP_IDENTITY_ANNOTATION, type AppWorkload } from '../../utils/applications'
 import { midTruncate } from '../../utils/format'
 
 // Structured tooltip content for the application chips. Both render a short
@@ -105,26 +105,53 @@ export function CategoryTooltip({
   )
 }
 
-// AppIdentityTooltip — why these instances are grouped. One line per distinct
-// evidence in the ProvenanceTooltip idiom (signals as inline-code, long repo
-// refs mid-truncated), plus a small flag when the grouping is heuristic-only.
-// No member list — the env pills next to this chip already show the instances.
+// AppIdentityTooltip — why these instances are grouped, and (in the fleet view)
+// whether the grouping folds across clusters + how to make it. A clear
+// source-driven headline, the per-evidence detail lines, and — when `fleet` and
+// the identity isn't a declared cross-cluster origin — the canonical "how to
+// fold" answer, so the question and its answer share one surface.
+//
+// `source`/`portable` come from the row's identity; absent (an older host that
+// doesn't pass them) the headline degrades to the evidence lines. `fleet` gates
+// the cross-cluster "how to fold" line — single-cluster (OSS) has no clusters to
+// fold across, so it shows only the grouping evidence.
 export function AppIdentityTooltip({
   members,
+  source,
+  portable,
+  fleet,
 }: {
   identityKey?: string
   members: { name: string; env: string; confidence: string; evidence: string }[]
+  source?: string
+  portable?: boolean
+  fleet?: boolean
 }) {
   const evidences = Array.from(new Set(members.map((m) => m.evidence).filter(Boolean)))
   const heuristicOnly = members.every((m) => m.confidence !== 'high')
+  // The wire `portable` flag is authoritative; fall back to deriving it from the
+  // source when an older host doesn't pass it.
+  const folds = portable ?? isDeclaredAppSource(source)
   return (
-    <div className="max-w-xs space-y-1">
+    <div className="max-w-xs space-y-1.5">
+      {source && <div className="text-xs font-medium text-theme-text-primary">Grouped by {appSourceLabel(source)}.</div>}
       {evidences.map((e, i) => (
-        <div key={i} className="text-xs text-theme-text-primary">
+        <div key={i} className="text-xs text-theme-text-secondary">
           <EvidenceLine evidence={e} />
         </div>
       ))}
-      {heuristicOnly && (
+      {fleet && folds && (
+        <div className="text-[10px] uppercase tracking-wide text-theme-text-tertiary">folds across clusters</div>
+      )}
+      {fleet && source !== undefined && !folds && (
+        <div className="space-y-1 border-t border-theme-border pt-1.5">
+          <div className="text-[11px] leading-snug text-theme-text-secondary">
+            Shown per-cluster — a name can't prove two clusters run the same app. To fold it across clusters, set the same{' '}
+            <code className="inline-code">{APP_IDENTITY_ANNOTATION}</code> on its workloads in each cluster, or deploy it via Argo CD / Flux with the environment in the source path.
+          </div>
+        </div>
+      )}
+      {!fleet && heuristicOnly && !source && (
         <div className={`text-[10px] uppercase tracking-wide ${HEALTH_META.degraded.text}`}>heuristic · medium confidence</div>
       )}
     </div>

package/src/components/applications/ApplicationDetail.tsx

@@ -93,6 +93,13 @@ export type ApplicationDetailProps = {
   /** Env tokens the cluster proved (the list derives the same set) — keeps a
    *  ungrouped app's Environment fact consistent between list and detail. */
   discoveredEnvs?: ReadonlySet<string>
+  /** Which instance in `identityInstances` is active, by its `appKey`. Defaults
+   *  to `app.key` — correct for the OSS case, where each instance IS a distinct
+   *  app row keyed the same way. A host that keys instances on something other
+   *  than the app key (e.g. the Cloud fleet keys per cluster, while `app.key`
+   *  must stay the logical app key for provenance) passes the active instance's
+   *  key here so the switcher marks it. */
+  activeInstanceKey?: string
 } & SelectionProps
 
 function ContextFact({ label, children }: { label: string; children: ReactNode }) {
@@ -132,7 +139,7 @@ function compareDefinedVersions(a: string | undefined, b: string | undefined): n
   return compareVersions(a, b) ?? 0
 }
 
-export function ApplicationDetail({ app, onBack, renderWorkload, topology, topologyLoading, onNavigateToResource, identityInstances, onSwitchInstance, discoveredEnvs, selectedWorkloadKey, onSelectWorkload }: ApplicationDetailProps) {
+export function ApplicationDetail({ app, onBack, renderWorkload, topology, topologyLoading, onNavigateToResource, identityInstances, onSwitchInstance, discoveredEnvs, activeInstanceKey, selectedWorkloadKey, onSelectWorkload }: ApplicationDetailProps) {
   // Stable order regardless of API ordering: rail rows and the per-workload
   // color assignment both follow this array, so an order flap between
   // refetches must not reshuffle rows or reassign a workload's hue.
@@ -286,7 +293,7 @@ export function ApplicationDetail({ app, onBack, renderWorkload, topology, topol
           // pills for a handful; a picker beyond that (scales to ~any count).
           <div className="flex min-w-0 items-center gap-1.5">
             <span className="text-[10px] uppercase tracking-wide text-theme-text-tertiary">Environment</span>
-            <EnvSwitcher identityKey={app.identity?.key ?? ''} instances={identityInstances} activeKey={app.key} onSwitch={onSwitchInstance} />
+            <EnvSwitcher identityKey={app.identity?.key ?? ''} instances={identityInstances} activeKey={activeInstanceKey ?? app.key} onSwitch={onSwitchInstance} />
           </div>
         ) : env ? (
           <ContextFact label="Environment">