@skyhook-io/k8s-ui 1.8.10 → 1.8.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (168) hide show
  1. package/package.json +7 -6
  2. package/src/assets/gitops/argocd.png +0 -0
  3. package/src/assets/gitops/flux.svg +7 -0
  4. package/src/components/applications/AppChips.tsx +10 -0
  5. package/src/components/applications/ApplicationDetail.test.tsx +697 -0
  6. package/src/components/applications/ApplicationDetail.tsx +3269 -474
  7. package/src/components/applications/ApplicationsView.tsx +62 -10
  8. package/src/components/applications/applications-view.test.tsx +47 -0
  9. package/src/components/applications/index.ts +1 -1
  10. package/src/components/audit/AuditAlerts.tsx +14 -10
  11. package/src/components/checks/ChecksView.tsx +2 -3
  12. package/src/components/checks/severity.ts +14 -10
  13. package/src/components/cluster-switcher/ClusterSwitcher.tsx +2 -2
  14. package/src/components/compare/CompareResourcePicker.tsx +2 -2
  15. package/src/components/gitops/GitOpsDetailLayout.tsx +13 -3
  16. package/src/components/gitops/GitOpsGraphFilterRail.tsx +2 -1
  17. package/src/components/gitops/GitOpsTableView.tsx +13 -6
  18. package/src/components/gitops/ManagedResourcesList.tsx +8 -11
  19. package/src/components/gitops/SyncCountdown.tsx +26 -17
  20. package/src/components/gitops/SyncOptionsDialog.test.ts +48 -0
  21. package/src/components/gitops/SyncOptionsDialog.tsx +190 -46
  22. package/src/components/gitops/insights/ArgoResourceDiff.tsx +172 -0
  23. package/src/components/gitops/insights/GitOpsInsightViews.tsx +474 -121
  24. package/src/components/gitops/insights/index.ts +1 -0
  25. package/src/components/gitops/insights/insights-helpers.test.ts +102 -1
  26. package/src/components/gitops/insights/insights-helpers.ts +74 -1
  27. package/src/components/gitops/tree/GitOpsTreeGraph.tsx +10 -2
  28. package/src/components/issues/IssuesView.tsx +91 -52
  29. package/src/components/issues/ResourceIssuesSection.test.tsx +39 -6
  30. package/src/components/issues/ResourceIssuesSection.tsx +46 -144
  31. package/src/components/issues/index.ts +3 -0
  32. package/src/components/issues/issue-timing.ts +53 -0
  33. package/src/components/issues/issues.test.ts +102 -1
  34. package/src/components/issues/severity.ts +3 -0
  35. package/src/components/logs/LogCore.tsx +14 -4
  36. package/src/components/logs/WorkloadLogsViewer.tsx +31 -6
  37. package/src/components/logs/useLogStream.ts +8 -1
  38. package/src/components/namespace-switcher/NamespacePicker.tsx +86 -107
  39. package/src/components/resources/ResourcesSidebar.test.tsx +71 -0
  40. package/src/components/resources/ResourcesSidebar.tsx +46 -46
  41. package/src/components/resources/ResourcesView.selected-kind.test.ts +143 -0
  42. package/src/components/resources/ResourcesView.tsx +233 -51
  43. package/src/components/resources/renderers/AWSMachineRenderer.tsx +3 -2
  44. package/src/components/resources/renderers/AWSManagedClusterRenderer.tsx +3 -2
  45. package/src/components/resources/renderers/AWSManagedControlPlaneRenderer.tsx +3 -2
  46. package/src/components/resources/renderers/AWSManagedMachinePoolRenderer.tsx +3 -2
  47. package/src/components/resources/renderers/AzureMachineRenderer.tsx +3 -2
  48. package/src/components/resources/renderers/AzureManagedControlPlaneRenderer.tsx +3 -2
  49. package/src/components/resources/renderers/AzureManagedMachinePoolRenderer.tsx +3 -2
  50. package/src/components/resources/renderers/CAPIClusterRenderer.tsx +3 -2
  51. package/src/components/resources/renderers/CAPIKubeadmControlPlaneRenderer.tsx +3 -2
  52. package/src/components/resources/renderers/CAPIMachineDeploymentRenderer.tsx +3 -2
  53. package/src/components/resources/renderers/CAPIMachineHealthCheckRenderer.tsx +3 -2
  54. package/src/components/resources/renderers/CAPIMachinePoolRenderer.tsx +3 -2
  55. package/src/components/resources/renderers/CAPIMachineRenderer.tsx +3 -2
  56. package/src/components/resources/renderers/CAPIMachineSetRenderer.tsx +3 -2
  57. package/src/components/resources/renderers/CertificateRenderer.tsx +3 -2
  58. package/src/components/resources/renderers/CertificateRequestRenderer.tsx +3 -2
  59. package/src/components/resources/renderers/ClusterComplianceReportRenderer.tsx +2 -2
  60. package/src/components/resources/renderers/CompositeRenderer.tsx +3 -2
  61. package/src/components/resources/renderers/CronWorkflowRenderer.tsx +99 -0
  62. package/src/components/resources/renderers/ExternalSecretRenderer.tsx +3 -2
  63. package/src/components/resources/renderers/GCPMachineRenderer.tsx +3 -2
  64. package/src/components/resources/renderers/GCPManagedControlPlaneRenderer.tsx +3 -2
  65. package/src/components/resources/renderers/GCPManagedMachinePoolRenderer.tsx +3 -2
  66. package/src/components/resources/renderers/GRPCRouteRenderer.tsx +7 -3
  67. package/src/components/resources/renderers/GatewayClassRenderer.tsx +3 -2
  68. package/src/components/resources/renderers/HTTPRouteRenderer.tsx +7 -3
  69. package/src/components/resources/renderers/JobRenderer.tsx +3 -1
  70. package/src/components/resources/renderers/KarpenterEC2NodeClassRenderer.tsx +3 -2
  71. package/src/components/resources/renderers/KarpenterNodeClaimRenderer.tsx +3 -2
  72. package/src/components/resources/renderers/KarpenterNodePoolRenderer.tsx +3 -2
  73. package/src/components/resources/renderers/KedaScaledJobRenderer.tsx +3 -2
  74. package/src/components/resources/renderers/KedaScaledObjectRenderer.tsx +3 -2
  75. package/src/components/resources/renderers/ManagedResourceRenderer.tsx +3 -2
  76. package/src/components/resources/renderers/PVCRenderer.tsx +3 -2
  77. package/src/components/resources/renderers/PrometheusRuleRenderer.tsx +2 -2
  78. package/src/components/resources/renderers/SbomReportRenderer.tsx +2 -2
  79. package/src/components/resources/renderers/SealedSecretRenderer.tsx +3 -2
  80. package/src/components/resources/renderers/SecretRenderer.tsx +2 -0
  81. package/src/components/resources/renderers/SecretStoreRenderer.tsx +3 -2
  82. package/src/components/resources/renderers/ServiceRenderer.tsx +58 -40
  83. package/src/components/resources/renderers/SimpleRouteRenderer.tsx +7 -3
  84. package/src/components/resources/renderers/VulnerabilityReportRenderer.tsx +2 -2
  85. package/src/components/resources/renderers/WorkflowRenderer.test.tsx +43 -0
  86. package/src/components/resources/renderers/WorkflowRenderer.tsx +60 -78
  87. package/src/components/resources/renderers/index.ts +1 -0
  88. package/src/components/resources/resource-utils-argo.test.ts +18 -1
  89. package/src/components/resources/resource-utils-argo.ts +8 -0
  90. package/src/components/resources/resource-utils-capi.ts +1 -1
  91. package/src/components/resources/resource-utils.ts +31 -0
  92. package/src/components/shared/DetailShell.tsx +2 -2
  93. package/src/components/shared/ResourceActionsBar.tsx +142 -111
  94. package/src/components/shared/ResourceRendererDispatch.tsx +33 -4
  95. package/src/components/shared/UnifiedDiff.tsx +51 -0
  96. package/src/components/shared/index.ts +1 -0
  97. package/src/components/timeline/TimelineList.tsx +375 -354
  98. package/src/components/timeline/TimelineStrip.test.tsx +194 -0
  99. package/src/components/timeline/TimelineStrip.tsx +836 -0
  100. package/src/components/timeline/TimelineSwimlanes.test.tsx +1028 -0
  101. package/src/components/timeline/TimelineSwimlanes.tsx +2498 -593
  102. package/src/components/timeline/TimelineToolbar.test.tsx +320 -0
  103. package/src/components/timeline/TimelineToolbar.tsx +759 -0
  104. package/src/components/timeline/TimelineToolbarState.test.tsx +88 -0
  105. package/src/components/timeline/index.ts +23 -0
  106. package/src/components/timeline/scrubber-math.test.ts +235 -0
  107. package/src/components/timeline/scrubber-math.ts +249 -0
  108. package/src/components/timeline/shared.test.tsx +219 -0
  109. package/src/components/timeline/shared.tsx +232 -447
  110. package/src/components/timeline/timeline-filters.test.ts +196 -0
  111. package/src/components/timeline/timeline-filters.ts +180 -0
  112. package/src/components/timeline/timeline-lane-sort.test.ts +97 -0
  113. package/src/components/timeline/timeline-lane-sort.ts +77 -0
  114. package/src/components/timeline/timeline-live.test.ts +131 -0
  115. package/src/components/timeline/timeline-live.ts +77 -0
  116. package/src/components/topology/GroupNode.tsx +9 -2
  117. package/src/components/topology/K8sResourceNode.test.ts +11 -0
  118. package/src/components/topology/K8sResourceNode.tsx +387 -243
  119. package/src/components/topology/TopologyBreadcrumb.tsx +30 -0
  120. package/src/components/topology/TopologyControls.tsx +3 -1
  121. package/src/components/topology/TopologyFilterSidebar.tsx +9 -0
  122. package/src/components/topology/TopologyGraph.tsx +149 -90
  123. package/src/components/topology/TopologyOverlayBar.tsx +30 -0
  124. package/src/components/topology/TopologySearch.tsx +25 -17
  125. package/src/components/topology/index.ts +2 -0
  126. package/src/components/topology/layout.ts +10 -2
  127. package/src/components/topology/topology.css +0 -92
  128. package/src/components/ui/Badge.tsx +6 -1
  129. package/src/components/ui/CodeViewer.tsx +2 -2
  130. package/src/components/ui/Collapse.tsx +59 -0
  131. package/src/components/ui/ConfirmDialog.tsx +7 -3
  132. package/src/components/ui/DialogPortal.tsx +31 -9
  133. package/src/components/ui/Input.tsx +24 -0
  134. package/src/components/ui/MultiSelectPicker.test.tsx +101 -0
  135. package/src/components/ui/MultiSelectPicker.tsx +167 -0
  136. package/src/components/ui/PaneLoader.tsx +10 -2
  137. package/src/components/ui/ResourceBar.tsx +68 -25
  138. package/src/components/ui/SearchBox.tsx +18 -4
  139. package/src/components/ui/SearchPillInput.tsx +2 -2
  140. package/src/components/ui/SelectMenu.tsx +81 -0
  141. package/src/components/ui/drawer-components.tsx +48 -32
  142. package/src/components/ui/index.ts +6 -0
  143. package/src/components/ui/severity-tone.ts +11 -4
  144. package/src/components/workload/ResourceDetailDrawer.tsx +6 -2
  145. package/src/components/workload/WorkloadView.tsx +2706 -475
  146. package/src/components/workload/index.ts +1 -1
  147. package/src/theme/tailwind-theme.css +1 -0
  148. package/src/theme/variables.css +2 -1
  149. package/src/types/core.ts +57 -4
  150. package/src/types/gitops-insights.ts +69 -1
  151. package/src/types/gitops.ts +3 -3
  152. package/src/utils/application-history.test.ts +538 -0
  153. package/src/utils/application-history.ts +257 -0
  154. package/src/utils/application-topology.test.ts +198 -0
  155. package/src/utils/application-topology.ts +261 -0
  156. package/src/utils/applications.test.ts +201 -1
  157. package/src/utils/applications.ts +1182 -393
  158. package/src/utils/index.ts +3 -0
  159. package/src/utils/navigation.test.ts +32 -1
  160. package/src/utils/navigation.ts +70 -0
  161. package/src/utils/resource-hierarchy.test.ts +1024 -1
  162. package/src/utils/resource-hierarchy.ts +925 -267
  163. package/src/utils/resource-icons.ts +2 -0
  164. package/src/utils/topology-neighborhood.test.ts +202 -1
  165. package/src/utils/topology-neighborhood.ts +194 -13
  166. package/src/utils/workflow-execution.test.ts +556 -0
  167. package/src/utils/workflow-execution.ts +814 -0
  168. package/src/utils/workload-colors.ts +2 -3
@@ -1,25 +1,32 @@
1
- import { useState, useMemo, useEffect } from 'react'
2
- import { useRefreshAnimation } from '../../hooks/useRefreshAnimation'
1
+ import { useState, useMemo, useEffect, useCallback, useRef } from 'react'
3
2
  import { PaneLoader } from '../ui/PaneLoader'
4
- import { SearchBox } from '../ui/SearchBox'
3
+ import { Tooltip } from '../ui/Tooltip'
5
4
  import {
6
5
  AlertCircle,
7
6
  CheckCircle,
8
7
  Clock,
9
8
  RefreshCw,
10
9
  ChevronRight,
11
- Filter,
12
10
  Plus,
13
11
  Trash2,
14
- List,
15
- GanttChart,
16
12
  Shield,
13
+ X,
17
14
  } from 'lucide-react'
18
15
  import { clsx } from 'clsx'
19
16
  import { DiffViewer, DiffBadge } from './DiffViewer'
17
+ import { TimelineToolbar } from './TimelineToolbar'
18
+ import {
19
+ matchesActivityFilter,
20
+ matchesTimelineSearch,
21
+ mergeKindOptions,
22
+ describeActiveFilters,
23
+ TIMELINE_RESOURCE_KINDS,
24
+ type ActivityTypeFilter,
25
+ type ActivityFilterKey,
26
+ } from './timeline-filters'
20
27
  import type { TimelineEvent, TimeRange } from '../../types'
21
- import { isChangeEvent, isK8sEvent, isHistoricalEvent, isOperation } from '../../types'
22
- import { getOperationColor, getHealthBadgeColor, SEVERITY_BADGE } from '../../utils/badge-colors'
28
+ import { isChangeEvent, isHistoricalEvent } from '../../types'
29
+ import { getHealthBadgeColor, SEVERITY_BADGE } from '../../utils/badge-colors'
23
30
  import { ResourceRefBadge } from '../ui/drawer-components'
24
31
  import type { NavigateToResource } from '../../utils/navigation'
25
32
  import { kindToPlural, refToSelectedResource, apiVersionToGroup } from '../../utils/navigation'
@@ -39,13 +46,13 @@ function formatResourceAge(createdAt: string): string {
39
46
  return `${months}mo`
40
47
  }
41
48
 
42
- export type ActivityTypeFilter = 'all' | 'changes' | 'k8s_events' | 'warnings' | 'unhealthy'
49
+ export type { ActivityTypeFilter, ActivityFilterKey }
43
50
 
44
51
  export interface TimelineListProps {
45
52
  events: TimelineEvent[]
46
53
  isLoading: boolean
47
54
  onRefresh?: () => void
48
- onQueryChange?: (params: { timeRange: TimeRange; kind?: string }) => void
55
+ onQueryChange?: (params: { timeRange: TimeRange; kinds: string[] }) => void
49
56
  hasLimitedAccess?: boolean
50
57
  namespaces?: string[]
51
58
  onViewChange?: (view: 'list' | 'swimlane') => void
@@ -53,11 +60,48 @@ export interface TimelineListProps {
53
60
  onResourceClick?: NavigateToResource
54
61
  initialFilter?: ActivityTypeFilter
55
62
  initialTimeRange?: TimeRange
63
+ // Time-range dropdown options. Defaults to the standard set; a retained host
64
+ // can pass a deeper set (e.g. adds 7d/30d) without changing OSS behavior.
65
+ rangeOptions?: { value: TimeRange; label: string }[]
66
+ // Hide the built-in time-range dropdown when an external control (the
67
+ // retained-mode scrubber) owns the range instead.
68
+ hideRangeSelector?: boolean
56
69
  // Controlled "show deleted" toggle. When omitted the component manages it
57
70
  // internally; the host passes it to share one toggle across list + swimlane
58
71
  // and to drive server-side delete filtering.
59
72
  showDeleted?: boolean
60
73
  onShowDeletedChange?: (showDeleted: boolean) => void
74
+ // Controlled filter state. When omitted each is managed internally; the host
75
+ // passes them to share one set of filters across list + swimlane so they
76
+ // survive the view switch. Existing hosts that pass nothing are unaffected.
77
+ search?: string
78
+ onSearchChange?: (value: string) => void
79
+ activityFilter?: ActivityFilterKey[]
80
+ onActivityFilterChange?: (keys: ActivityFilterKey[]) => void
81
+ kindFilter?: string[]
82
+ onKindFilterChange?: (kinds: string[]) => void
83
+ // Reports the time span of the rows currently visible in the list's
84
+ // scrollport (null when nothing is visible). A host scrubber renders it as
85
+ // the lens, so scrolling the list moves the lens across the strip.
86
+ onVisibleWindowChange?: (window: { fromMs: number; toMs: number } | null) => void
87
+ // On mount/switch, scroll the list so the row nearest this time sits at the
88
+ // top — carries the swimlane's view window over when switching to list view.
89
+ scrollToMs?: number
90
+ // Strip the toolbar (search / filters / range / view toggle) for an embedded
91
+ // list where those controls are overkill — e.g. the workload detail. Default false.
92
+ compact?: boolean
93
+ // Externally-controlled selection for bidirectional sync with a swimlane: the
94
+ // matching card is highlighted and scrolled into view; a card click reports up.
95
+ selectedEventId?: string | null
96
+ onSelectEvent?: (id: string | null) => void
97
+ // The server-side fetch cap the events were limited to (e.g. 2000). When the
98
+ // returned set reaches it, the list surfaces an end-of-list note so the drop of
99
+ // older events isn't silent. Omit when the source isn't capped (e.g. compact).
100
+ truncatedAt?: number
101
+ // Hosts that filter a capped source after fetching must report truncation
102
+ // explicitly because the visible row count no longer reflects the source cap.
103
+ isTruncated?: boolean
104
+ truncationMessage?: string
61
105
  }
62
106
 
63
107
  const TIME_RANGES: { value: TimeRange; label: string }[] = [
@@ -69,41 +113,43 @@ const TIME_RANGES: { value: TimeRange; label: string }[] = [
69
113
  { value: 'all', label: 'All' },
70
114
  ]
71
115
 
72
- const RESOURCE_KINDS = [
73
- 'Deployment',
74
- 'Pod',
75
- 'Service',
76
- 'ConfigMap',
77
- 'Ingress',
78
- 'Gateway',
79
- 'HTTPRoute',
80
- 'GRPCRoute',
81
- 'TCPRoute',
82
- 'TLSRoute',
83
- 'ReplicaSet',
84
- 'DaemonSet',
85
- 'StatefulSet',
86
- ]
87
-
88
- export function TimelineList({ events, isLoading, onRefresh, onQueryChange, hasLimitedAccess, namespaces, onViewChange, currentView = 'list', onResourceClick, initialFilter, initialTimeRange, showDeleted: showDeletedProp, onShowDeletedChange }: TimelineListProps) {
89
- const [searchTerm, setSearchTerm] = useState('')
90
- const [activityTypeFilter, setActivityTypeFilter] = useState<ActivityTypeFilter>(initialFilter ?? 'all')
116
+ export function TimelineList({ events, isLoading, onRefresh, onQueryChange, hasLimitedAccess, namespaces, onViewChange, currentView = 'list', onResourceClick, initialFilter, initialTimeRange, rangeOptions = TIME_RANGES, hideRangeSelector = false, showDeleted: showDeletedProp, onShowDeletedChange, search: searchProp, onSearchChange, activityFilter: activityFilterProp, onActivityFilterChange, kindFilter: kindFilterProp, onKindFilterChange, onVisibleWindowChange, scrollToMs, compact = false, selectedEventId, onSelectEvent, truncatedAt, isTruncated, truncationMessage }: TimelineListProps) {
117
+ const [searchInternal, setSearchInternal] = useState('')
118
+ const searchTerm = searchProp ?? searchInternal
119
+ const setSearchTerm = onSearchChange ?? setSearchInternal
120
+ const [activityFilterInternal, setActivityFilterInternal] = useState<ActivityFilterKey[]>(
121
+ initialFilter && initialFilter !== 'all' ? [initialFilter] : [],
122
+ )
123
+ const activityTypeFilter = activityFilterProp ?? activityFilterInternal
124
+ const setActivityTypeFilter = onActivityFilterChange ?? setActivityFilterInternal
91
125
  const [timeRange, setTimeRange] = useState<TimeRange>(initialTimeRange ?? '1h')
92
- const [kindFilter, setKindFilter] = useState<string>('')
126
+ const [kindFilterInternal, setKindFilterInternal] = useState<string[]>([])
127
+ const kindFilter = kindFilterProp ?? kindFilterInternal
128
+ const setKindFilter = onKindFilterChange ?? setKindFilterInternal
93
129
  const [showDeletedInternal, setShowDeletedInternal] = useState(true)
94
130
  const showDeleted = showDeletedProp ?? showDeletedInternal
95
131
  const setShowDeleted = onShowDeletedChange ?? setShowDeletedInternal
96
132
  const [expandedItem, setExpandedItem] = useState<string | null>(null)
97
133
 
134
+ // Clear every content filter at once. Each setter already resolves to the
135
+ // controlled callback or the internal state setter, so this works in both
136
+ // host-driven and standalone modes.
137
+ const clearAllFilters = useCallback(() => {
138
+ setSearchTerm('')
139
+ setActivityTypeFilter([])
140
+ setKindFilter([])
141
+ setShowDeleted(true)
142
+ }, [setSearchTerm, setActivityTypeFilter, setKindFilter, setShowDeleted])
143
+
98
144
  useEffect(() => {
99
- onQueryChange?.({ timeRange, kind: kindFilter || undefined })
145
+ onQueryChange?.({ timeRange, kinds: kindFilter })
100
146
  }, [timeRange, kindFilter, onQueryChange])
101
147
 
102
148
  // Kind filter options: seed with common kinds, then accumulate every kind seen
103
149
  // in the data so CRDs the cluster actually emits become filterable. The set only
104
150
  // grows — selecting a kind narrows the server query to it, so deriving options
105
151
  // from the current events alone would collapse the dropdown to that one kind.
106
- const [seenKinds, setSeenKinds] = useState<Set<string>>(() => new Set(RESOURCE_KINDS))
152
+ const [seenKinds, setSeenKinds] = useState<Set<string>>(() => new Set(TIMELINE_RESOURCE_KINDS))
107
153
  useEffect(() => {
108
154
  if (!events?.length) return
109
155
  setSeenKinds((prev) => {
@@ -119,52 +165,19 @@ export function TimelineList({ events, isLoading, onRefresh, onQueryChange, hasL
119
165
  }, [events])
120
166
  // Common kinds keep their curated order (most-used first); kinds discovered in
121
167
  // the data that aren't in the seed (CRDs) are appended alphabetically.
122
- const kindOptions = useMemo(() => {
123
- const seeded = new Set<string>(RESOURCE_KINDS)
124
- const extra = [...seenKinds].filter((k) => !seeded.has(k)).sort()
125
- return [...RESOURCE_KINDS, ...extra]
126
- }, [seenKinds])
127
-
128
-
129
- const [handleRefresh, isRefreshAnimating] = useRefreshAnimation(onRefresh ?? (() => {}))
168
+ const kindOptions = useMemo(() => mergeKindOptions(seenKinds), [seenKinds])
130
169
 
131
- // Filter activity
170
+ // Filter activity through the shared predicates so list + swimlane can't drift.
132
171
  const filteredActivity = useMemo(() => {
133
172
  if (!events) return []
134
-
135
173
  return events.filter((item) => {
136
- // Filter by activity type
137
- if (activityTypeFilter === 'changes' && !isChangeEvent(item)) return false
138
- if (activityTypeFilter === 'k8s_events' && !isK8sEvent(item)) return false
139
- if (activityTypeFilter === 'warnings') {
140
- // Warnings filter: only K8s Warning events (matches home page count)
141
- if (item.eventType !== 'Warning') return false
142
- }
143
- if (activityTypeFilter === 'unhealthy') {
144
- // Unhealthy filter: only changes with unhealthy/degraded health state (no K8s events)
145
- const isUnhealthyChange = isChangeEvent(item) && (item.healthState === 'unhealthy' || item.healthState === 'degraded')
146
- if (!isUnhealthyChange) return false
147
- }
174
+ if (!matchesActivityFilter(item, activityTypeFilter)) return false
175
+ if (kindFilter.length > 0 && !kindFilter.includes(item.kind)) return false
148
176
  if (!showDeleted && item.eventType === 'delete') return false
149
-
150
- // Filter by search term
151
- if (searchTerm) {
152
- const term = searchTerm.toLowerCase()
153
- const matchesName = item.name.toLowerCase().includes(term)
154
- const matchesKind = item.kind.toLowerCase().includes(term)
155
- const matchesNamespace = item.namespace?.toLowerCase().includes(term)
156
- const matchesReason = item.reason?.toLowerCase().includes(term)
157
- const matchesMessage = item.message?.toLowerCase().includes(term)
158
- const matchesSummary = item.diff?.summary?.toLowerCase().includes(term)
159
-
160
- if (!matchesName && !matchesKind && !matchesNamespace && !matchesReason && !matchesMessage && !matchesSummary) {
161
- return false
162
- }
163
- }
164
-
177
+ if (!matchesTimelineSearch(item, searchTerm)) return false
165
178
  return true
166
179
  })
167
- }, [events, activityTypeFilter, searchTerm, showDeleted])
180
+ }, [events, activityTypeFilter, kindFilter, searchTerm, showDeleted])
168
181
 
169
182
  // Aggregated event group type
170
183
  type AggregatedItem = {
@@ -241,6 +254,34 @@ export function TimelineList({ events, isLoading, onRefresh, onQueryChange, hasL
241
254
 
242
255
  // Group activity by time period
243
256
  const groupedActivity = useMemo(() => {
257
+ // Compact (single-subject embed): a resource's events are often all old, so
258
+ // the relative buckets below collapse into one meaningless "Older". Group by
259
+ // calendar date instead.
260
+ if (compact) {
261
+ const nowDate = new Date()
262
+ const todayKey = nowDate.toDateString()
263
+ const yKey = new Date(nowDate.getTime() - 86_400_000).toDateString()
264
+ const byDay = new Map<string, TimelineEvent[]>()
265
+ for (const item of filteredActivity) {
266
+ const key = new Date(item.timestamp).toDateString()
267
+ const arr = byDay.get(key)
268
+ if (arr) arr.push(item)
269
+ else byDay.set(key, [item])
270
+ }
271
+ return [...byDay.entries()]
272
+ .sort((a, b) => (new Date(b[0]).getTime() || 0) - (new Date(a[0]).getTime() || 0))
273
+ .map(([key, items]) => {
274
+ const d = new Date(key)
275
+ const label = isNaN(d.getTime()) ? 'Unknown date'
276
+ : key === todayKey ? 'Today'
277
+ : key === yKey ? 'Yesterday'
278
+ : d.getFullYear() === nowDate.getFullYear()
279
+ ? d.toLocaleDateString(undefined, { weekday: 'short', month: 'short', day: 'numeric' })
280
+ : d.toLocaleDateString(undefined, { month: 'short', day: 'numeric', year: 'numeric' })
281
+ return { label, items: aggregateEvents(items) }
282
+ })
283
+ }
284
+
244
285
  const groups: { label: string; items: AggregatedItem[] }[] = []
245
286
  const now = Date.now()
246
287
 
@@ -276,180 +317,144 @@ export function TimelineList({ events, isLoading, onRefresh, onQueryChange, hasL
276
317
  if (older.length > 0) groups.push({ label: 'Older', items: aggregateEvents(older) })
277
318
 
278
319
  return groups
279
- }, [filteredActivity])
280
-
281
- // Count stats
282
- const stats = useMemo(() => {
283
- if (!events) return { total: 0, changes: 0, warnings: 0, unhealthy: 0, deleted: 0 }
284
- return {
285
- total: events.length,
286
- changes: events.filter((e) => isChangeEvent(e)).length,
287
- warnings: events.filter((e) => e.eventType === 'Warning').length,
288
- unhealthy: events.filter((e) => isChangeEvent(e) && (e.healthState === 'unhealthy' || e.healthState === 'degraded')).length,
289
- deleted: events.filter((e) => e.eventType === 'delete').length,
320
+ }, [filteredActivity, compact])
321
+
322
+ // Visible-window reporting: rows carry their time span in data attributes;
323
+ // on scroll (rAF-throttled) and whenever the row set changes, the span of
324
+ // rows intersecting the scrollport is reported so a host scrubber can show
325
+ // it as the lens. DOM-measured, so it runs only in effects/handlers —
326
+ // SSR-safe by construction.
327
+ const scrollRef = useRef<HTMLDivElement | null>(null)
328
+ const visibleWindowRaf = useRef<number | null>(null)
329
+ const reportVisibleWindow = useCallback(() => {
330
+ const container = scrollRef.current
331
+ if (!container || !onVisibleWindowChange) return
332
+ const containerRect = container.getBoundingClientRect()
333
+ let fromMs = Infinity
334
+ let toMs = -Infinity
335
+ for (const row of container.querySelectorAll<HTMLElement>('[data-ts-from]')) {
336
+ const rect = row.getBoundingClientRect()
337
+ if (rect.bottom < containerRect.top || rect.top > containerRect.bottom) continue
338
+ const from = Number(row.dataset.tsFrom)
339
+ const to = Number(row.dataset.tsTo)
340
+ if (Number.isFinite(from) && from < fromMs) fromMs = from
341
+ if (Number.isFinite(to) && to > toMs) toMs = to
290
342
  }
291
- }, [events])
343
+ onVisibleWindowChange(fromMs <= toMs ? { fromMs, toMs } : null)
344
+ }, [onVisibleWindowChange])
345
+ const handleListScroll = useCallback(() => {
346
+ if (visibleWindowRaf.current != null) return
347
+ visibleWindowRaf.current = requestAnimationFrame(() => {
348
+ visibleWindowRaf.current = null
349
+ reportVisibleWindow()
350
+ })
351
+ }, [reportVisibleWindow])
352
+ useEffect(() => {
353
+ reportVisibleWindow()
354
+ return () => {
355
+ if (visibleWindowRaf.current != null) cancelAnimationFrame(visibleWindowRaf.current)
356
+ }
357
+ }, [reportVisibleWindow, groupedActivity])
292
358
 
293
- return (
294
- <div className="flex flex-col h-full w-full">
295
- {/* Toolbar */}
296
- <div className="flex items-center gap-4 px-4 py-3 border-b border-theme-border bg-theme-surface/50 flex-wrap">
297
- {/* Search */}
298
- <SearchBox value={searchTerm} onChange={setSearchTerm} scope="timeline" shortcutId="timeline-list-search" className="flex-1 min-w-[200px] max-w-md" />
299
-
300
- {/* Activity type filter */}
301
- <div className="flex items-center gap-1 bg-theme-elevated rounded-lg p-1">
302
- <FilterButton
303
- active={activityTypeFilter === 'all'}
304
- onClick={() => setActivityTypeFilter('all')}
305
- icon={<Filter className="w-3 h-3" />}
306
- label="All"
307
- tooltip="Show all activity: resource changes and K8s events"
308
- />
309
- <FilterButton
310
- active={activityTypeFilter === 'changes'}
311
- onClick={() => setActivityTypeFilter('changes')}
312
- icon={<RefreshCw className="w-3 h-3" />}
313
- label="Changes"
314
- count={stats.changes}
315
- color="blue"
316
- tooltip="Resource mutations: creates, updates, deletes detected by watching K8s API"
317
- />
318
- <FilterButton
319
- active={activityTypeFilter === 'warnings'}
320
- onClick={() => setActivityTypeFilter('warnings')}
321
- icon={<AlertCircle className="w-3 h-3" />}
322
- label="Warning Events"
323
- count={stats.warnings}
324
- color="amber"
325
- tooltip="Native Kubernetes Warning events (e.g., ImagePullBackOff, FailedScheduling)"
326
- />
327
- <FilterButton
328
- active={activityTypeFilter === 'unhealthy'}
329
- onClick={() => setActivityTypeFilter('unhealthy')}
330
- icon={<AlertCircle className="w-3 h-3" />}
331
- label="Unhealthy"
332
- count={stats.unhealthy}
333
- color="red"
334
- tooltip="Resource changes with unhealthy or degraded health state"
335
- />
336
- <FilterButton
337
- active={activityTypeFilter === 'k8s_events'}
338
- onClick={() => setActivityTypeFilter('k8s_events')}
339
- icon={<CheckCircle className="w-3 h-3" />}
340
- label="K8s Events"
341
- tooltip="All native Kubernetes events (Normal + Warning types)"
342
- />
343
- </div>
359
+ // Carry the swimlane's view window into the list: once rows exist, scroll so
360
+ // the row nearest `scrollToMs` sits at the top. Applied once per `scrollToMs`
361
+ // (a fresh view switch), so it never fights the user's own scrolling after.
362
+ const scrolledToRef = useRef<number | null>(null)
363
+ useEffect(() => {
364
+ if (scrollToMs == null || scrolledToRef.current === scrollToMs) return
365
+ const container = scrollRef.current
366
+ if (!container) return
367
+ const rows = container.querySelectorAll<HTMLElement>('[data-ts-from]')
368
+ if (rows.length === 0) return
369
+ let best: HTMLElement | null = null
370
+ let bestDelta = Infinity
371
+ for (const row of rows) {
372
+ const delta = Math.abs(Number(row.dataset.tsFrom) - scrollToMs)
373
+ if (delta < bestDelta) { bestDelta = delta; best = row }
374
+ }
375
+ if (best) {
376
+ container.scrollTop += best.getBoundingClientRect().top - container.getBoundingClientRect().top
377
+ scrolledToRef.current = scrollToMs
378
+ // A jump that lands where the list already sits emits no scroll event, so
379
+ // the host's lens would keep showing the pre-jump window without this.
380
+ reportVisibleWindow()
381
+ }
382
+ }, [scrollToMs, groupedActivity, reportVisibleWindow])
344
383
 
345
- <button
346
- type="button"
347
- onClick={() => setShowDeleted(!showDeleted)}
348
- title="Show or hide resources that were deleted, including Pods that no longer exist"
349
- className={clsx(
350
- 'px-3 py-1.5 text-sm rounded-md transition-colors flex items-center gap-2 bg-theme-elevated',
351
- showDeleted ? 'text-theme-text-primary' : 'text-theme-text-secondary hover:text-theme-text-primary'
352
- )}
353
- >
354
- <Trash2 className="w-3 h-3" />
355
- Deleted
356
- {stats.deleted > 0 && (
357
- <span className="text-xs px-1.5 rounded bg-theme-hover/50">
358
- {stats.deleted}
359
- </span>
360
- )}
361
- </button>
362
-
363
- {/* Kind filter */}
364
- <select
365
- value={kindFilter}
366
- onChange={(e) => setKindFilter(e.target.value)}
367
- className="appearance-none bg-theme-elevated text-theme-text-primary text-sm rounded-lg px-3 py-2 border border-theme-border-light focus:outline-none focus:ring-2 focus:ring-blue-500"
368
- >
369
- <option value="">All Kinds</option>
370
- {kindOptions.map((kind) => (
371
- <option key={kind} value={kind}>
372
- {kind}
373
- </option>
374
- ))}
375
- </select>
376
-
377
- {/* Time range */}
378
- <select
379
- value={timeRange}
380
- onChange={(e) => setTimeRange(e.target.value as TimeRange)}
381
- className="appearance-none bg-theme-elevated text-theme-text-primary text-sm rounded-lg px-3 py-2 border border-theme-border-light focus:outline-none focus:ring-2 focus:ring-blue-500"
382
- >
383
- {TIME_RANGES.map((range) => (
384
- <option key={range.value} value={range.value}>
385
- {range.label}
386
- </option>
387
- ))}
388
- </select>
389
-
390
- {/* View toggle */}
391
- {onViewChange && (
392
- <div className="flex items-center gap-1 bg-theme-elevated rounded-lg p-1">
393
- <button
394
- onClick={() => onViewChange('list')}
395
- className={clsx(
396
- 'p-2 rounded-md transition-colors',
397
- currentView === 'list' ? 'bg-theme-hover text-theme-text-primary' : 'text-theme-text-secondary hover:text-theme-text-primary'
398
- )}
399
- title="List view"
400
- >
401
- <List className="w-4 h-4" />
402
- </button>
403
- <button
404
- onClick={() => onViewChange('swimlane')}
405
- className={clsx(
406
- 'p-2 rounded-md transition-colors',
407
- currentView === 'swimlane' ? 'bg-theme-hover text-theme-text-primary' : 'text-theme-text-secondary hover:text-theme-text-primary'
408
- )}
409
- title="Swimlane view"
410
- >
411
- <GanttChart className="w-4 h-4" />
412
- </button>
413
- </div>
414
- )}
384
+ // Bidirectional sync: when the selection changes externally (a swimlane marker
385
+ // click), scroll the matching card into view. Re-runs on groupedActivity so a
386
+ // selection made before the rows exist still lands once they render.
387
+ useEffect(() => {
388
+ if (!selectedEventId) return
389
+ const container = scrollRef.current
390
+ const card = container?.querySelector<HTMLElement>(`[data-event-id="${CSS.escape(selectedEventId)}"]`)
391
+ card?.scrollIntoView({ behavior: 'smooth', block: 'center' })
392
+ }, [selectedEventId, groupedActivity])
415
393
 
416
- {/* Refresh */}
417
- {onRefresh && (
418
- <button
419
- onClick={handleRefresh}
420
- disabled={isRefreshAnimating}
421
- className="p-2 text-theme-text-secondary hover:text-theme-text-primary hover:bg-theme-elevated rounded-lg disabled:opacity-50"
422
- title="Refresh"
423
- >
424
- <RefreshCw className={clsx('w-4 h-4', isRefreshAnimating && 'animate-spin')} />
425
- </button>
426
- )}
427
- </div>
394
+ return (
395
+ <div className="flex flex-col h-full w-full">
396
+ {!compact && (
397
+ <TimelineToolbar
398
+ search={searchTerm}
399
+ onSearchChange={setSearchTerm}
400
+ searchShortcutId="timeline-list-search"
401
+ activityFilter={activityTypeFilter}
402
+ onActivityFilterChange={setActivityTypeFilter}
403
+ events={events}
404
+ showDeleted={showDeleted}
405
+ onShowDeletedChange={setShowDeleted}
406
+ kindFilter={kindFilter}
407
+ onKindFilterChange={setKindFilter}
408
+ kindOptions={kindOptions}
409
+ rangeOptions={hideRangeSelector ? undefined : rangeOptions}
410
+ timeRange={hideRangeSelector ? undefined : timeRange}
411
+ onTimeRangeChange={hideRangeSelector ? undefined : setTimeRange}
412
+ counts={{ events: filteredActivity.length }}
413
+ view={currentView}
414
+ onViewChange={onViewChange}
415
+ onRefresh={onRefresh}
416
+ />
417
+ )}
428
418
 
429
419
  {/* Timeline content */}
430
- <div className="flex-1 overflow-auto">
420
+ <div className="flex-1 overflow-auto" ref={scrollRef} onScroll={onVisibleWindowChange ? handleListScroll : undefined}>
431
421
  {isLoading ? (
432
422
  <PaneLoader label="Loading timeline…" className="h-full" />
433
423
  ) : filteredActivity.length === 0 ? (
434
424
  <div className="flex flex-col items-center justify-center h-full text-theme-text-tertiary">
435
425
  <Clock className="w-12 h-12 mb-4 opacity-50" />
436
- <p className="text-lg">No activity found</p>
437
- <p className="text-sm mt-2">
438
- {searchTerm || activityTypeFilter !== 'all' || kindFilter
439
- ? 'Try adjusting your filters'
440
- : 'Activity will appear here when cluster changes occur'}
441
- </p>
442
- {hasLimitedAccess && !searchTerm && activityTypeFilter === 'all' && !kindFilter && (
443
- <p className="flex items-center gap-1 text-sm mt-2 text-amber-400/80">
444
- <Shield className="w-3.5 h-3.5" />
445
- Some resource types are not monitored due to RBAC restrictions
446
- </p>
447
- )}
448
- {namespaces && namespaces.length > 0 && (
449
- <p className="text-sm mt-2 text-theme-text-secondary">
450
- Filtering by namespace: <span className="font-medium text-theme-text-primary">{namespaces.length === 1 ? namespaces[0] : `${namespaces.length} namespaces`}</span>
451
- </p>
452
- )}
426
+ {(() => {
427
+ const activeFilters = describeActiveFilters({ search: searchTerm, activityFilter: activityTypeFilter, kindFilter, showDeleted })
428
+ return (
429
+ <>
430
+ <p className="text-lg">No activity found</p>
431
+ <p className="text-sm mt-2">
432
+ {activeFilters || 'Activity will appear here when cluster changes occur'}
433
+ </p>
434
+ {activeFilters && (
435
+ <button
436
+ type="button"
437
+ onClick={clearAllFilters}
438
+ className="mt-4 flex items-center gap-2 px-3 py-1.5 text-sm bg-theme-elevated border border-theme-border rounded-lg text-theme-text-secondary hover:bg-theme-hover hover:text-theme-text-primary transition-colors"
439
+ >
440
+ <X className="w-3.5 h-3.5" />
441
+ Clear filters
442
+ </button>
443
+ )}
444
+ {hasLimitedAccess && !activeFilters && (
445
+ <p className="flex items-center gap-1 text-sm mt-2 text-amber-400/80">
446
+ <Shield className="w-3.5 h-3.5" />
447
+ Some resource types are not monitored due to RBAC restrictions
448
+ </p>
449
+ )}
450
+ {namespaces && namespaces.length > 0 && (
451
+ <p className="text-sm mt-2 text-theme-text-secondary">
452
+ Filtering by namespace: <span className="font-medium text-theme-text-primary">{namespaces.length === 1 ? namespaces[0] : `${namespaces.length} namespaces`}</span>
453
+ </p>
454
+ )}
455
+ </>
456
+ )
457
+ })()}
453
458
  </div>
454
459
  ) : (
455
460
  <div className="p-4 space-y-6">
@@ -468,29 +473,53 @@ export function TimelineList({ events, isLoading, onRefresh, onQueryChange, hasL
468
473
  <div className="space-y-2 ml-6 border-l-2 border-theme-border pl-4">
469
474
  {group.items.map((aggItem) => (
470
475
  aggItem.type === 'aggregated' ? (
471
- <AggregatedActivityCard
476
+ <div
472
477
  key={`agg-${aggItem.first.id}-${aggItem.last.id}`}
473
- first={aggItem.first}
474
- last={aggItem.last}
475
- count={aggItem.count}
476
- reason={aggItem.reason}
477
- expanded={expandedItem === aggItem.first.id}
478
- onToggle={() => setExpandedItem(expandedItem === aggItem.first.id ? null : aggItem.first.id)}
479
- onResourceClick={onResourceClick}
480
- />
478
+ data-event-id={aggItem.first.id}
479
+ data-ts-from={new Date(aggItem.first.timestamp).getTime()}
480
+ data-ts-to={new Date(aggItem.last.timestamp).getTime()}
481
+ >
482
+ <AggregatedActivityCard
483
+ first={aggItem.first}
484
+ last={aggItem.last}
485
+ count={aggItem.count}
486
+ reason={aggItem.reason}
487
+ expanded={expandedItem === aggItem.first.id}
488
+ onToggle={() => setExpandedItem(expandedItem === aggItem.first.id ? null : aggItem.first.id)}
489
+ onResourceClick={onResourceClick}
490
+ compact={compact}
491
+ selected={selectedEventId === aggItem.first.id}
492
+ onSelect={() => onSelectEvent?.(selectedEventId === aggItem.first.id ? null : aggItem.first.id)}
493
+ />
494
+ </div>
481
495
  ) : (
482
- <ActivityCard
496
+ <div
483
497
  key={aggItem.item.id}
484
- item={aggItem.item}
485
- expanded={expandedItem === aggItem.item.id}
486
- onToggle={() => setExpandedItem(expandedItem === aggItem.item.id ? null : aggItem.item.id)}
487
- onResourceClick={onResourceClick}
488
- />
498
+ data-event-id={aggItem.item.id}
499
+ data-ts-from={new Date(aggItem.item.timestamp).getTime()}
500
+ data-ts-to={new Date(aggItem.item.timestamp).getTime()}
501
+ >
502
+ <ActivityCard
503
+ item={aggItem.item}
504
+ expanded={expandedItem === aggItem.item.id}
505
+ onToggle={() => setExpandedItem(expandedItem === aggItem.item.id ? null : aggItem.item.id)}
506
+ onResourceClick={onResourceClick}
507
+ compact={compact}
508
+ selected={selectedEventId === aggItem.item.id}
509
+ onSelect={() => onSelectEvent?.(selectedEventId === aggItem.item.id ? null : aggItem.item.id)}
510
+ />
511
+ </div>
489
512
  )
490
513
  ))}
491
514
  </div>
492
515
  </div>
493
516
  ))}
517
+ {truncatedAt != null && (isTruncated ?? events.length >= truncatedAt) && (
518
+ <div className="flex items-center justify-center gap-2 py-4 text-sm text-theme-text-tertiary">
519
+ <Clock className="h-4 w-4 opacity-50" />
520
+ <span>{truncationMessage ?? `Showing the newest ${truncatedAt.toLocaleString()} events in this range — narrow the query to see older ones`}</span>
521
+ </div>
522
+ )}
494
523
  </div>
495
524
  )}
496
525
  </div>
@@ -498,92 +527,43 @@ export function TimelineList({ events, isLoading, onRefresh, onQueryChange, hasL
498
527
  )
499
528
  }
500
529
 
501
- interface FilterButtonProps {
502
- active: boolean
503
- onClick: () => void
504
- icon: React.ReactNode
505
- label: string
506
- count?: number
507
- color?: 'blue' | 'amber' | 'green' | 'red'
508
- tooltip?: string
509
- }
510
-
511
- function FilterButton({ active, onClick, icon, label, count, color, tooltip }: FilterButtonProps) {
512
- const colorClasses = {
513
- blue: SEVERITY_BADGE.info,
514
- amber: SEVERITY_BADGE.warning,
515
- green: SEVERITY_BADGE.success,
516
- red: SEVERITY_BADGE.error,
517
- }
518
-
519
- return (
520
- <button
521
- onClick={onClick}
522
- title={tooltip}
523
- className={clsx(
524
- 'px-3 py-1.5 text-sm rounded-md transition-colors flex items-center gap-2',
525
- active ? (color ? colorClasses[color] : 'bg-theme-hover text-theme-text-primary') : 'text-theme-text-secondary hover:text-theme-text-primary'
526
- )}
527
- >
528
- {icon}
529
- {label}
530
- {count !== undefined && count > 0 && (
531
- <span
532
- className={clsx(
533
- 'text-xs px-1.5 rounded',
534
- color ? `bg-${color}-500/30` : 'bg-theme-hover/50'
535
- )}
536
- >
537
- {count}
538
- </span>
539
- )}
540
- </button>
541
- )
542
- }
543
-
544
530
  interface ActivityCardProps {
545
531
  item: TimelineEvent
546
532
  expanded: boolean
547
533
  onToggle: () => void
548
534
  onResourceClick?: NavigateToResource
535
+ compact?: boolean
536
+ selected?: boolean
537
+ onSelect?: () => void
549
538
  }
550
539
 
551
- function ActivityCard({ item, expanded, onToggle, onResourceClick }: ActivityCardProps) {
540
+ function ActivityCard({ item, expanded, onToggle, onResourceClick, compact, selected, onSelect }: ActivityCardProps) {
552
541
  const isChange = isChangeEvent(item)
553
542
  const isHistorical = isHistoricalEvent(item)
554
543
  const isWarning = item.eventType === 'Warning'
555
- const time = formatTime(item.timestamp)
544
+ const time = formatTime(item.timestamp, compact)
556
545
 
557
546
  // Only expandable if there's a diff to show
558
547
  const hasExpandableContent = isChange && !!item.diff
559
548
 
560
- // Determine card styling based on type
561
- const getCardStyle = () => {
562
- if (isChange) {
563
- switch (item.eventType) {
564
- case 'add':
565
- return 'bg-green-500/5 border-green-500/30 hover:border-green-500/50'
566
- case 'delete':
567
- return 'bg-red-500/5 border-red-500/30 hover:border-red-500/50'
568
- case 'update':
569
- return 'bg-blue-500/5 border-blue-500/30 hover:border-blue-500/50'
570
- default:
571
- return 'bg-theme-surface/50 border-theme-border hover:border-theme-border-light'
572
- }
573
- }
574
- if (isWarning) {
575
- return 'bg-amber-500/5 border-amber-500/30 hover:border-amber-500/50'
576
- }
577
- return 'bg-theme-surface/50 border-theme-border hover:border-theme-border-light'
578
- }
549
+ // Color budget: a change's operation is carried by the icon SHAPE, not
550
+ // by card/text hue — a routine delete must not read as an alarming red failure;
551
+ // the swimlane paints it a neutral blue ▼ and the list matches. Color is
552
+ // reserved for status: only a Warning tints the card (amber); the per-event
553
+ // health badge below carries any unhealthy state.
554
+ const getCardStyle = () =>
555
+ isWarning
556
+ ? 'bg-amber-500/5 border-amber-500/30 hover:border-amber-500/50'
557
+ : 'bg-theme-surface/50 border-theme-border hover:border-theme-border-light'
579
558
 
580
559
  const getIcon = () => {
581
560
  if (isChange) {
561
+ // One activity hue (info-blue); Plus/Trash2/RefreshCw distinguish add/delete/update.
582
562
  switch (item.eventType) {
583
563
  case 'add':
584
- return <Plus className="w-4 h-4 text-green-400" />
564
+ return <Plus className="w-4 h-4 text-blue-400" />
585
565
  case 'delete':
586
- return <Trash2 className="w-4 h-4 text-red-400" />
566
+ return <Trash2 className="w-4 h-4 text-blue-400" />
587
567
  case 'update':
588
568
  return <RefreshCw className="w-4 h-4 text-blue-400" />
589
569
  default:
@@ -593,13 +573,18 @@ function ActivityCard({ item, expanded, onToggle, onResourceClick }: ActivityCar
593
573
  if (isWarning) {
594
574
  return <AlertCircle className="w-4 h-4 text-amber-400" />
595
575
  }
596
- return <CheckCircle className="w-4 h-4 text-green-400" />
576
+ return <CheckCircle className="w-4 h-4 text-theme-text-secondary" />
597
577
  }
598
578
 
599
579
  return (
600
580
  <div
601
- className={clsx('rounded-lg border transition-all', getCardStyle(), hasExpandableContent && 'cursor-pointer')}
602
- onClick={hasExpandableContent ? onToggle : undefined}
581
+ className={clsx(
582
+ 'rounded-lg border transition-all',
583
+ (hasExpandableContent || onSelect) && 'cursor-pointer',
584
+ getCardStyle(),
585
+ selected && 'ring-2 ring-skyhook-500/60 ring-offset-1 ring-offset-theme-base',
586
+ )}
587
+ onClick={() => { if (onSelect) { onSelect() } else if (hasExpandableContent) { onToggle() } }}
603
588
  >
604
589
  <div className="p-3">
605
590
  {/* Header row */}
@@ -619,7 +604,7 @@ function ActivityCard({ item, expanded, onToggle, onResourceClick }: ActivityCar
619
604
  className="flex items-center gap-2 hover:bg-theme-elevated/50 rounded px-1 -ml-1 transition-colors group"
620
605
  >
621
606
  <span className="badge-sm bg-theme-elevated text-theme-text-secondary group-hover:bg-theme-hover">
622
- {item.kind}
607
+ {item.kind || 'Event'}
623
608
  </span>
624
609
  <span className="text-sm font-medium text-theme-text-primary truncate group-hover:text-blue-300">{item.name}</span>
625
610
  </button>
@@ -641,9 +626,11 @@ function ActivityCard({ item, expanded, onToggle, onResourceClick }: ActivityCar
641
626
  </span>
642
627
  )}
643
628
  {item.createdAt && (
644
- <span className="text-xs text-theme-text-quaternary" title={`Created: ${new Date(item.createdAt).toLocaleString()}`}>
645
- • {formatResourceAge(item.createdAt)} old
646
- </span>
629
+ <Tooltip content={`Created: ${new Date(item.createdAt).toLocaleString()}`}>
630
+ <span className="text-xs text-theme-text-quaternary">
631
+ • {formatResourceAge(item.createdAt)} old
632
+ </span>
633
+ </Tooltip>
647
634
  )}
648
635
  </div>
649
636
 
@@ -651,7 +638,7 @@ function ActivityCard({ item, expanded, onToggle, onResourceClick }: ActivityCar
651
638
  <div className="mt-1 flex items-center gap-2 flex-wrap">
652
639
  {isChange ? (
653
640
  <>
654
- <span className={clsx('text-sm font-medium', isOperation(item.eventType) && getOperationColor(item.eventType))}>
641
+ <span className="text-sm font-medium text-theme-text-primary">
655
642
  {isHistorical && item.reason ? item.reason : item.eventType}
656
643
  </span>
657
644
  {item.diff && <DiffBadge diff={item.diff} />}
@@ -661,7 +648,7 @@ function ActivityCard({ item, expanded, onToggle, onResourceClick }: ActivityCar
661
648
  </span>
662
649
  )}
663
650
  {isHistorical && item.message && (
664
- <span className="text-sm text-theme-text-secondary">
651
+ <span className="min-w-0 flex-1 break-words text-sm text-theme-text-secondary">
665
652
  {item.message}
666
653
  </span>
667
654
  )}
@@ -671,7 +658,7 @@ function ActivityCard({ item, expanded, onToggle, onResourceClick }: ActivityCar
671
658
  <span className={clsx('text-sm font-medium', isWarning ? 'text-amber-700 dark:text-amber-300' : 'text-theme-text-secondary')}>
672
659
  {item.reason}
673
660
  </span>
674
- <span className="text-sm text-theme-text-secondary">
661
+ <span className="min-w-0 flex-1 break-words text-sm text-theme-text-secondary">
675
662
  {item.message}
676
663
  </span>
677
664
  </>
@@ -687,11 +674,17 @@ function ActivityCard({ item, expanded, onToggle, onResourceClick }: ActivityCar
687
674
  )}
688
675
  </div>
689
676
 
690
- {/* Expand indicator - only show if there's content to expand */}
677
+ {/* Expand toggle — its own control so a select-click on the card body
678
+ doesn't also flip the diff open/closed. */}
691
679
  {hasExpandableContent && (
692
- <ChevronRight
693
- className={clsx('w-4 h-4 text-theme-text-disabled transition-transform shrink-0', expanded && 'rotate-90')}
694
- />
680
+ <button
681
+ type="button"
682
+ onClick={(e) => { e.stopPropagation(); onToggle() }}
683
+ aria-label={expanded ? 'Collapse changes' : 'Expand changes'}
684
+ className="shrink-0 rounded p-0.5 text-theme-text-disabled hover:bg-theme-elevated hover:text-theme-text-secondary"
685
+ >
686
+ <ChevronRight className={clsx('w-4 h-4 transition-transform', expanded && 'rotate-90')} />
687
+ </button>
695
688
  )}
696
689
  </div>
697
690
 
@@ -716,26 +709,44 @@ interface AggregatedActivityCardProps {
716
709
  expanded: boolean
717
710
  onToggle: () => void
718
711
  onResourceClick?: NavigateToResource
712
+ compact?: boolean
713
+ selected?: boolean
714
+ onSelect?: () => void
719
715
  }
720
716
 
721
- function AggregatedActivityCard({ first, last, count, reason, expanded, onToggle, onResourceClick }: AggregatedActivityCardProps) {
717
+ function AggregatedActivityCard({ first, last, count, reason, expanded, onToggle, onResourceClick, compact, selected, onSelect }: AggregatedActivityCardProps) {
722
718
  const isWarning = first.eventType === 'Warning'
723
- const firstTime = formatTime(first.timestamp)
724
- const lastTime = formatTime(last.timestamp)
725
-
726
- // Card styling - warning/unhealthy style for aggregated events
719
+ const isUnhealthy = !isWarning && first.healthState === 'unhealthy'
720
+ const firstTime = formatTime(first.timestamp, compact)
721
+ const lastTime = formatTime(last.timestamp, compact)
722
+
723
+ // Same color budget as a single ActivityCard: a Warning tints amber and
724
+ // a genuinely unhealthy aggregate goes red; everything else stays neutral with
725
+ // the blue activity accent, so a cluster of routine repeats doesn't read as an
726
+ // alarm.
727
727
  const cardStyle = isWarning
728
728
  ? 'bg-amber-500/5 border-amber-500/30 hover:border-amber-500/50'
729
- : 'bg-red-500/5 border-red-500/30 hover:border-red-500/50'
730
-
731
- // Dot color based on severity
732
- const dotColor = isWarning ? 'bg-amber-500' : 'bg-red-500'
733
- const textColor = isWarning ? 'text-amber-400' : 'text-red-400'
729
+ : isUnhealthy
730
+ ? 'bg-red-500/5 border-red-500/30 hover:border-red-500/50'
731
+ : 'bg-theme-surface/50 border-theme-border hover:border-theme-border-light'
732
+
733
+ const dotColor = isWarning ? 'bg-amber-500' : isUnhealthy ? 'bg-red-500' : 'bg-blue-500'
734
+ const lineColor = isWarning ? 'bg-amber-500/40' : isUnhealthy ? 'bg-red-500/40' : 'bg-blue-500/40'
735
+ const textColor = isWarning ? 'text-amber-400' : isUnhealthy ? 'text-red-400' : 'text-theme-text-secondary'
736
+ const countBadge = isWarning
737
+ ? SEVERITY_BADGE.warning
738
+ : isUnhealthy
739
+ ? SEVERITY_BADGE.error
740
+ : 'bg-theme-elevated text-theme-text-secondary'
734
741
 
735
742
  return (
736
743
  <div
737
- className={clsx('rounded-lg border transition-all cursor-pointer', cardStyle)}
738
- onClick={onToggle}
744
+ className={clsx(
745
+ 'rounded-lg border transition-all cursor-pointer',
746
+ cardStyle,
747
+ selected && 'ring-2 ring-skyhook-500/60 ring-offset-1 ring-offset-theme-base',
748
+ )}
749
+ onClick={() => { if (onSelect) { onSelect() } else { onToggle() } }}
739
750
  >
740
751
  <div className="p-3">
741
752
  {/* Header row */}
@@ -743,11 +754,15 @@ function AggregatedActivityCard({ first, last, count, reason, expanded, onToggle
743
754
  {/* Aggregation visualization: first dot - line - last dot */}
744
755
  <div className="flex flex-col items-center shrink-0 mt-0.5">
745
756
  {/* First occurrence dot */}
746
- <div className={clsx('w-2.5 h-2.5 rounded-full', dotColor)} title={`First: ${firstTime}`} />
757
+ <Tooltip content={`First: ${firstTime}`}>
758
+ <div className={clsx('w-2.5 h-2.5 rounded-full', dotColor)} />
759
+ </Tooltip>
747
760
  {/* Connecting line */}
748
- <div className={clsx('w-0.5 h-4 my-0.5', isWarning ? 'bg-amber-500/40' : 'bg-red-500/40')} />
761
+ <div className={clsx('w-0.5 h-4 my-0.5', lineColor)} />
749
762
  {/* Last occurrence dot */}
750
- <div className={clsx('w-2.5 h-2.5 rounded-full', dotColor)} title={`Last: ${lastTime}`} />
763
+ <Tooltip content={`Last: ${lastTime}`}>
764
+ <div className={clsx('w-2.5 h-2.5 rounded-full', dotColor)} />
765
+ </Tooltip>
751
766
  </div>
752
767
 
753
768
  {/* Content */}
@@ -762,7 +777,7 @@ function AggregatedActivityCard({ first, last, count, reason, expanded, onToggle
762
777
  className="flex items-center gap-2 hover:bg-theme-elevated/50 rounded px-1 -ml-1 transition-colors group"
763
778
  >
764
779
  <span className="badge-sm bg-theme-elevated text-theme-text-secondary group-hover:bg-theme-hover">
765
- {first.kind}
780
+ {first.kind || 'Event'}
766
781
  </span>
767
782
  <span className="text-sm font-medium text-theme-text-primary truncate group-hover:text-blue-300">{first.name}</span>
768
783
  </button>
@@ -774,10 +789,7 @@ function AggregatedActivityCard({ first, last, count, reason, expanded, onToggle
774
789
  <span className={clsx('text-sm font-medium', textColor)}>
775
790
  {reason}
776
791
  </span>
777
- <span className={clsx(
778
- 'badge-sm',
779
- isWarning ? SEVERITY_BADGE.warning : SEVERITY_BADGE.error
780
- )}>
792
+ <span className={clsx('badge-sm', countBadge)}>
781
793
  x{count}
782
794
  </span>
783
795
  <span className="text-xs text-theme-text-tertiary">
@@ -786,10 +798,15 @@ function AggregatedActivityCard({ first, last, count, reason, expanded, onToggle
786
798
  </div>
787
799
  </div>
788
800
 
789
- {/* Expand indicator */}
790
- <ChevronRight
791
- className={clsx('w-4 h-4 text-theme-text-disabled transition-transform shrink-0', expanded && 'rotate-90')}
792
- />
801
+ {/* Expand toggle — its own control, separate from the card select-click. */}
802
+ <button
803
+ type="button"
804
+ onClick={(e) => { e.stopPropagation(); onToggle() }}
805
+ aria-label={expanded ? 'Collapse occurrences' : 'Expand occurrences'}
806
+ className="shrink-0 rounded p-0.5 text-theme-text-disabled hover:bg-theme-elevated hover:text-theme-text-secondary"
807
+ >
808
+ <ChevronRight className={clsx('w-4 h-4 transition-transform', expanded && 'rotate-90')} />
809
+ </button>
793
810
  </div>
794
811
 
795
812
  {/* Expanded details */}
@@ -833,9 +850,13 @@ function AggregatedActivityCard({ first, last, count, reason, expanded, onToggle
833
850
  )
834
851
  }
835
852
 
836
- function formatTime(timestamp: string): string {
853
+ function formatTime(timestamp: string, compact = false): string {
837
854
  if (!timestamp) return '-'
838
855
  const date = new Date(timestamp)
856
+ if (isNaN(date.getTime())) return '-'
857
+ // Compact (date-grouped) rows show the clock time — the group header carries
858
+ // the date, and "5m ago" / a bare date is useless for a batch of same-day events.
859
+ if (compact) return date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' })
839
860
  const now = new Date()
840
861
  const diffMs = now.getTime() - date.getTime()
841
862
  const diffMins = Math.floor(diffMs / 60000)