Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(control-ui): r1-m1 ignore stale governed event pages

Josuéebd412479565
diff --git a/control-ui/components/GovernedTraceSurface/GovernedEventExplorer/index.tsx b/control-ui/components/GovernedTraceSurface/GovernedEventExplorer/index.tsx
index 47a186e3b..58f21189c 100644
--- a/control-ui/components/GovernedTraceSurface/GovernedEventExplorer/index.tsx
+++ b/control-ui/components/GovernedTraceSurface/GovernedEventExplorer/index.tsx
@@ -1,6 +1,6 @@
'use client'
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
import { DataTable, TableViewport } from '@clerum/frontend-components'
import { TableHeaderRow } from '@components/TableHeaderRow'
import type { TableHeaderColumn } from '@components/TableHeaderRow/types'
@@ -41,6 +41,7 @@ export function GovernedEventExplorer({ family, subtitle, title }: GovernedEvent
const [loadingMore, setLoadingMore] = useState(false)
const [openFilterId, setOpenFilterId] = useState<string | null>(null)
const [order, setOrder] = useState<'oldest' | 'latest'>('latest')
+ const loadMoreGeneration = useRef(0)
const columns = useMemo<TableHeaderColumn[]>(
() =>
@@ -53,7 +54,11 @@ export function GovernedEventExplorer({ family, subtitle, title }: GovernedEvent
...(column.key === 'occurred'
? {
activeDirection: order === 'latest' ? ('desc' as const) : ('asc' as const),
- onSort: () => setOrder(current => (current === 'latest' ? 'oldest' : 'latest')),
+ onSort: () => {
+ loadMoreGeneration.current += 1
+ setLoadingMore(false)
+ setOrder(current => (current === 'latest' ? 'oldest' : 'latest'))
+ },
sortLabel: column.label,
}
: {}),
@@ -72,6 +77,8 @@ export function GovernedEventExplorer({ family, subtitle, title }: GovernedEvent
)
useEffect(() => {
+ loadMoreGeneration.current += 1
+ setLoadingMore(false)
setPage(null)
setEvents([])
setError(null)
@@ -97,11 +104,15 @@ export function GovernedEventExplorer({ family, subtitle, title }: GovernedEvent
.finally(() => {
if (!controller.signal.aborted) setLoading(false)
})
- return () => controller.abort()
+ return () => {
+ controller.abort()
+ loadMoreGeneration.current += 1
+ }
}, [apiQuery, boundaryEpoch, family, order, stateKey])
async function loadMore() {
if (!apiQuery || !page?.nextCursor) return
+ const generation = ++loadMoreGeneration.current
setLoadingMore(true)
setError(null)
try {
@@ -111,12 +122,15 @@ export function GovernedEventExplorer({ family, subtitle, title }: GovernedEvent
families: [family],
order,
})
+ if (generation !== loadMoreGeneration.current) return
setPage(next)
setEvents(current => [...current, ...next.events])
} catch (readError) {
- setError(readError instanceof Error ? readError.message : 'Unable to load more events.')
+ if (generation === loadMoreGeneration.current) {
+ setError(readError instanceof Error ? readError.message : 'Unable to load more events.')
+ }
} finally {
- setLoadingMore(false)
+ if (generation === loadMoreGeneration.current) setLoadingMore(false)
}
}
diff --git a/control-ui/components/__tests__/GovernedTraceExploration.test.tsx b/control-ui/components/__tests__/GovernedTraceExploration.test.tsx
index 9f8df8609..dc4cc46d5 100644
--- a/control-ui/components/__tests__/GovernedTraceExploration.test.tsx
+++ b/control-ui/components/__tests__/GovernedTraceExploration.test.tsx
@@ -42,6 +42,16 @@ vi.mock('../GovernedTraceSurface/InfrastructureOperationalSnapshot', () => ({
const mockGetEvents = vi.mocked(getGovernedTraceEvents)
+function deferred<T>() {
+ let resolve!: (value: T) => void
+ let reject!: (error: unknown) => void
+ const promise = new Promise<T>((res, rej) => {
+ resolve = res
+ reject = rej
+ })
+ return { promise, reject, resolve }
+}
+
const BASE_EVENT = {
streamSequence: '40',
schemaVersion: 1,
@@ -302,4 +312,94 @@ describe('GovernedEventExplorer', () => {
)
expect(screen.queryByText('Service or resource-level change')).not.toBeInTheDocument()
})
+
+ it('ignores stale load-more results after the governed event order changes', async () => {
+ const stalePage = deferred<Awaited<ReturnType<typeof getGovernedTraceEvents>>>()
+ mockGetEvents.mockImplementation((_path, query) => {
+ if (query.cursor === 'old-cursor') return stalePage.promise
+ if (query.cursor === 'new-cursor') {
+ return Promise.resolve({
+ events: [
+ {
+ ...ADMIN_EVENT,
+ eventId: 'oldest-more',
+ targetRef: 'new-order-more',
+ },
+ ],
+ nextCursor: null,
+ capturedHighWatermark: '43',
+ })
+ }
+ if (query.order === 'oldest') {
+ return Promise.resolve({
+ events: [
+ {
+ ...ADMIN_EVENT,
+ eventId: 'oldest-base',
+ targetRef: 'new-order-base',
+ },
+ ],
+ nextCursor: 'new-cursor',
+ capturedHighWatermark: '42',
+ })
+ }
+ return Promise.resolve({
+ events: [
+ {
+ ...ADMIN_EVENT,
+ eventId: 'latest-base',
+ targetRef: 'old-order-base',
+ },
+ ],
+ nextCursor: 'old-cursor',
+ capturedHighWatermark: '41',
+ })
+ })
+
+ render(
+ <GovernedEventExplorer
+ family="administrative"
+ subtitle="Administrative changes"
+ title="Administrative"
+ />
+ )
+
+ await screen.findByText(content => content.includes('old-order-base'))
+ fireEvent.click(screen.getByRole('button', { name: 'Load more' }))
+ fireEvent.click(screen.getByRole('button', { name: 'Sort by Occurred ascending' }))
+
+ await screen.findByText(content => content.includes('new-order-base'))
+ stalePage.resolve({
+ events: [
+ {
+ ...ADMIN_EVENT,
+ eventId: 'stale-more',
+ targetRef: 'stale-old-order-row',
+ },
+ ],
+ nextCursor: 'stale-cursor',
+ capturedHighWatermark: '41',
+ })
+
+ await waitFor(() => {
+ expect(
+ screen.queryByText(content => content.includes('stale-old-order-row'))
+ ).not.toBeInTheDocument()
+ })
+
+ fireEvent.click(screen.getByRole('button', { name: 'Load more' }))
+
+ await waitFor(() => {
+ expect(mockGetEvents).toHaveBeenLastCalledWith(
+ '/api/v1/admin/tracing/events',
+ expect.objectContaining({
+ cursor: 'new-cursor',
+ order: 'oldest',
+ })
+ )
+ })
+ expect(
+ await screen.findByText(content => content.includes('new-order-more'))
+ ).toBeInTheDocument()
+ })
})