Skip to content

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

TypeScript

fix(control-ui): r6-h2 reload only changed previews

Josué9cbf1b9cf05d
diff --git a/control-ui/components/GfsBrowser.tsx b/control-ui/components/GfsBrowser.tsx
index 68fcd8ea1..d689022ce 100644
--- a/control-ui/components/GfsBrowser.tsx
+++ b/control-ui/components/GfsBrowser.tsx
@@ -82,6 +82,7 @@ type OpenPreviewState =
mimeType: string
rid: string
version: number
+ reloadVersion: number
unavailable: boolean
}
| {
@@ -91,6 +92,7 @@ type OpenPreviewState =
fileName: string
rid: string
version: number
+ reloadVersion: number
unavailable: boolean
}
| {
@@ -101,6 +103,7 @@ type OpenPreviewState =
mimeType: string
rid: string
version: number
+ reloadVersion: number
unavailable: boolean
}
@@ -400,7 +403,6 @@ export function GfsBrowser(): React.JSX.Element {
OpenPreviewState,
{ kind: 'video' }
> | null>(null)
- const [previewReloadVersion, setPreviewReloadVersion] = useState(0)
const previewRefreshGenerationRef = useRef(0)
const scheduleEntityChangeRecoveryRef = useRef<(() => void) | null>(null)
const openPreviewsRef = useRef<OpenPreviewState[]>([])
@@ -746,10 +748,23 @@ export function GfsBrowser(): React.JSX.Element {
const previews = openPreviewsRef.current
if (previews.length > 0) {
const generation = ++previewRefreshGenerationRef.current
- setImagePreview(preview => (preview ? { ...preview, unavailable: true } : preview))
- setMarkdownPreview(preview => (preview ? { ...preview, unavailable: true } : preview))
- setVideoPreview(preview => (preview ? { ...preview, unavailable: true } : preview))
- setPreviewReloadVersion(version => version + 1)
+ const markUnavailable = (preview: OpenPreviewState) => {
+ setImagePreview(current =>
+ current?.gfsUri === preview.gfsUri && !current.unavailable
+ ? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
+ : current
+ )
+ setMarkdownPreview(current =>
+ current?.gfsUri === preview.gfsUri && !current.unavailable
+ ? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
+ : current
+ )
+ setVideoPreview(current =>
+ current?.gfsUri === preview.gfsUri && !current.unavailable
+ ? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
+ : current
+ )
+ }
void Promise.all<ResolvedPreviewUpdate | null>(
previews.map(async preview => {
try {
@@ -761,28 +776,80 @@ export function GfsBrowser(): React.JSX.Element {
bytes: number
version: number
rid: string
+ resourceId: string
+ gfsUri: string
+ }
+ if (generation !== previewRefreshGenerationRef.current) return null
+ if (resolved.kind !== 'file') {
+ markUnavailable(preview)
+ return null
}
- if (resolved.kind !== 'file') return null
const imageMimeType = gfsImagePreviewMimeType(resolved.name)
const videoMimeType = gfsVideoPreviewMimeType(resolved.name)
- const shared = {
- gfsUri: preview.gfsUri,
- byteLength: resolved.bytes,
- fileName: resolved.name,
- rid: resolved.rid,
- version: resolved.version,
- unavailable: false,
- }
+ let candidate: ResolvedPreviewUpdate | null = null
if (preview.kind === 'image') {
- return imageMimeType ? { ...shared, kind: 'image', mimeType: imageMimeType } : null
+ candidate = imageMimeType
+ ? {
+ kind: 'image',
+ gfsUri: resolved.gfsUri,
+ byteLength: resolved.bytes,
+ fileName: resolved.name,
+ rid: resolved.rid,
+ version: resolved.version,
+ mimeType: imageMimeType,
+ reloadVersion: preview.reloadVersion + 1,
+ unavailable: false,
+ }
+ : null
+ } else if (preview.kind === 'video') {
+ candidate = videoMimeType
+ ? {
+ kind: 'video',
+ gfsUri: resolved.gfsUri,
+ byteLength: resolved.bytes,
+ fileName: resolved.name,
+ rid: resolved.rid,
+ version: resolved.version,
+ mimeType: videoMimeType,
+ reloadVersion: preview.reloadVersion + 1,
+ unavailable: false,
+ }
+ : null
+ } else {
+ candidate = isGfsMarkdownPreviewFile(resolved.name)
+ ? {
+ kind: 'markdown',
+ gfsUri: resolved.gfsUri,
+ byteLength: resolved.bytes,
+ fileName: resolved.name,
+ rid: resolved.rid,
+ version: resolved.version,
+ reloadVersion: preview.reloadVersion + 1,
+ unavailable: false,
+ }
+ : null
}
- if (preview.kind === 'video') {
- return videoMimeType ? { ...shared, kind: 'video', mimeType: videoMimeType } : null
+ if (!candidate) {
+ markUnavailable(preview)
+ return null
}
- return isGfsMarkdownPreviewFile(resolved.name)
- ? { ...shared, kind: 'markdown' }
- : null
+ if (candidate.version < preview.version) return null
+ const candidateMimeType = 'mimeType' in candidate ? candidate.mimeType : undefined
+ const currentMimeType = 'mimeType' in preview ? preview.mimeType : undefined
+ const unchanged =
+ !preview.unavailable &&
+ candidate.kind === preview.kind &&
+ candidate.gfsUri === preview.gfsUri &&
+ candidate.rid === preview.rid &&
+ candidate.fileName === preview.fileName &&
+ candidate.byteLength === preview.byteLength &&
+ candidate.version === preview.version &&
+ candidateMimeType === currentMimeType
+ return unchanged ? null : candidate
} catch (error) {
+ if (generation !== previewRefreshGenerationRef.current) return null
+ const status = entityChangeErrorStatus(error)
+ if (status === 403 || status === 404) markUnavailable(preview)
if (isTransientEntityChangeRefetchError(error)) scheduleRecovery()
return null
}
@@ -793,13 +860,18 @@ export function GfsBrowser(): React.JSX.Element {
if (!update) continue
if (update.kind === 'image') {
setImagePreview(current => (current?.gfsUri === update.gfsUri ? update : current))
+ setMarkdownPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
+ setVideoPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
} else if (update.kind === 'video') {
setVideoPreview(current => (current?.gfsUri === update.gfsUri ? update : current))
+ setImagePreview(current => (current?.gfsUri === update.gfsUri ? null : current))
+ setMarkdownPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
} else {
setMarkdownPreview(current => (current?.gfsUri === update.gfsUri ? update : current))
+ setImagePreview(current => (current?.gfsUri === update.gfsUri ? null : current))
+ setVideoPreview(current => (current?.gfsUri === update.gfsUri ? null : current))
}
}
- setPreviewReloadVersion(version => version + 1)
})
}
const visibleCrumb = currentCrumbRef.current
@@ -980,6 +1052,7 @@ export function GfsBrowser(): React.JSX.Element {
mimeType,
rid: child.rid,
version: child.version,
+ reloadVersion: 0,
unavailable: false,
})
return true
@@ -992,6 +1065,7 @@ export function GfsBrowser(): React.JSX.Element {
fileName: child.name,
rid: child.rid,
version: child.version,
+ reloadVersion: 0,
unavailable: false,
})
return true
@@ -1006,6 +1080,7 @@ export function GfsBrowser(): React.JSX.Element {
mimeType: videoMimeType,
rid: child.rid,
version: child.version,
+ reloadVersion: 0,
unavailable: false,
})
return true
@@ -2361,7 +2436,7 @@ export function GfsBrowser(): React.JSX.Element {
{imagePreview ? (
<GfsImagePreview
- key={previewReloadVersion}
+ key={`${imagePreview.gfsUri}:${imagePreview.reloadVersion}`}
byteLength={imagePreview.byteLength}
fileName={imagePreview.fileName}
mimeType={imagePreview.mimeType}
@@ -2373,7 +2448,7 @@ export function GfsBrowser(): React.JSX.Element {
{markdownPreview ? (
<GfsMarkdownPreview
- key={previewReloadVersion}
+ key={`${markdownPreview.gfsUri}:${markdownPreview.reloadVersion}`}
byteLength={markdownPreview.byteLength}
fileName={markdownPreview.fileName}
rid={markdownPreview.rid}
@@ -2384,7 +2459,7 @@ export function GfsBrowser(): React.JSX.Element {
{videoPreview ? (
<GfsVideoPreview
- key={previewReloadVersion}
+ key={`${videoPreview.gfsUri}:${videoPreview.reloadVersion}`}
byteLength={videoPreview.byteLength}
fileName={videoPreview.fileName}
mimeType={videoPreview.mimeType}
diff --git a/control-ui/components/__tests__/GfsBrowser.test.tsx b/control-ui/components/__tests__/GfsBrowser.test.tsx
index 14f98284b..7c52d927f 100644
--- a/control-ui/components/__tests__/GfsBrowser.test.tsx
+++ b/control-ui/components/__tests__/GfsBrowser.test.tsx
@@ -750,8 +750,8 @@ describe('GfsBrowser', () => {
resourceId: 'id-12',
rid: 'r12',
name: 'avatar.PNG',
- bytes: 4,
- version: 2,
+ bytes: 0,
+ version: 0,
}
}
return { items: [], nextCursor: null }
@@ -761,18 +761,145 @@ describe('GfsBrowser', () => {
streamControllers[0]!.enqueue(new TextEncoder().encode(`${producerFrame}\n`))
})
- const unavailableDialog = await screen.findByRole('dialog', { name: 'File unavailable' })
- expect(within(unavailableDialog).queryByRole('img')).toBeNull()
- await screen.findByText('remote-folder')
- const recoveredDialog = await screen.findByRole('dialog', { name: 'avatar.PNG' })
+ await waitFor(() => {
+ expect(treeFailureUsed).toBe(true)
+ expect(previewFailureUsed).toBe(true)
+ })
+ expect(screen.getByRole('dialog', { name: 'avatar.PNG' })).toBe(originalDialog)
expect(
- await within(recoveredDialog).findByRole('img', { name: 'Preview of avatar.PNG' })
+ await within(originalDialog).findByRole('img', { name: 'Preview of avatar.PNG' })
).toBeTruthy()
+ expect(mockGfsFetchFileBlob).toHaveBeenCalledTimes(1)
+ await screen.findByText('remote-folder')
+ expect(mockGfsFetchFileBlob).toHaveBeenCalledTimes(1)
expect(treeFailureUsed).toBe(true)
expect(previewFailureUsed).toBe(true)
expect(mockApiGet).toHaveBeenCalledWith('/api/v1/gfs/resolve', { uri: 'gfs://main/r12' })
})
+ it.each(['avatar.PNG', 'notes.md', 'demo.mp4'])(
+ 'does not reload an unchanged open %s preview after a scope invalidation',
+ async fileName => {
+ const rootId = '11111111-1111-1111-1111-111111111111'
+ const fileResourceId = '22222222-2222-2222-2222-222222222222'
+ const fileRid = fileResourceId.replace(/-/g, '')
+ const file = {
+ ...child(fileName, 'file', 12, 2),
+ resourceId: fileResourceId,
+ rid: fileRid,
+ gfsUri: `gfs://main/${fileRid}`,
+ }
+ let resolvedFile = toResolveView({
+ resourceId: file.resourceId,
+ drive: 'main',
+ name: fileName,
+ kind: 'file',
+ pathCache: `/${fileName}`,
+ bytes: file.bytes,
+ version: file.version,
+ updatedAt: '2026-09-28T00:00:00.000Z',
+ })
+ const streamControllers: ReadableStreamDefaultController<Uint8Array>[] = []
+ mockApiGet.mockImplementation(async (path: string, query?: Record<string, string>) => {
+ if (path === '/api/v1/gfs/tree') {
+ return { rootResourceId: rootId, items: [file], nextCursor: null }
+ }
+ if (path === `/api/v1/gfs/resources/${rootId}/children`) {
+ return { items: [file], nextCursor: null }
+ }
+ if (path === '/api/v1/gfs/resolve' && query?.uri === file.gfsUri) return resolvedFile
+ if (path === '/api/v1/gfs/resolve') {
+ return resolvedFolderView(rootId, 'main', '/', 1)
+ }
+ return { items: [], nextCursor: null }
+ })
+ mockGfsFetchFileBlob.mockResolvedValue(
+ new Blob(['# unchanged preview\n\nbody'], { type: 'text/plain' })
+ )
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async (_input: RequestInfo | URL, init?: RequestInit) => {
+ const body = new ReadableStream<Uint8Array>({
+ start(controller) {
+ streamControllers.push(controller)
+ init?.signal?.addEventListener('abort', () => controller.close(), { once: true })
+ },
+ })
+ return new Response(body, {
+ status: 200,
+ headers: { 'content-type': 'application/x-ndjson' },
+ })
+ })
+ )
+
+ renderBrowser()
+ await waitFor(() => expect(streamControllers).toHaveLength(1))
+ fireEvent.click(await screen.findByRole('button', { name: fileName }))
+ const dialog = await screen.findByRole('dialog', { name: fileName })
+ if (fileName.endsWith('.PNG')) {
+ await within(dialog).findByRole('img', { name: `Preview of ${fileName}` })
+ } else if (fileName.endsWith('.md')) {
+ await within(dialog).findByRole('heading', { name: 'unchanged preview' })
+ } else {
+ await within(dialog).findByLabelText(`Video preview of ${fileName}`)
+ }
+ expect(mockGfsFetchFileBlob).toHaveBeenCalledTimes(1)
+
+ const frame = await controlApiProducerFrame(['authorization'])
+ await act(async () => {
+ streamControllers[0]!.enqueue(new TextEncoder().encode(`${frame}\n`))
+ })
+ await waitFor(() =>
+ expect(mockApiGet).toHaveBeenCalledWith('/api/v1/gfs/resolve', { uri: file.gfsUri })
+ )
+ expect(screen.getByRole('dialog', { name: fileName })).toBe(dialog)
+ expect(mockGfsFetchFileBlob).toHaveBeenCalledTimes(1)
+ if (fileName.endsWith('.PNG')) {
+ expect(within(dialog).getByRole('img', { name: `Preview of ${fileName}` })).toBeVisible()
+ } else if (fileName.endsWith('.md')) {
+ expect(within(dialog).getByRole('heading', { name: 'unchanged preview' })).toBeVisible()
+ } else {
+ expect(within(dialog).getByLabelText(`Video preview of ${fileName}`)).toBeVisible()
+ }
+
+ resolvedFile = toResolveView({
+ resourceId: file.resourceId,
+ drive: 'main',
+ name: fileName,
+ kind: 'file',
+ pathCache: `/${fileName}`,
+ bytes: file.bytes + 1,
+ version: file.version + 1,
+ updatedAt: '2026-09-28T00:00:01.000Z',
+ })
+ const changedFrame = await controlApiProducerFrame(['authorization'])
+ await act(async () => {
+ streamControllers.at(-1)!.enqueue(new TextEncoder().encode(`${changedFrame}\n`))
+ })
+ await waitFor(() => {
+ expect(
+ mockApiGet.mock.calls.filter(
+ ([path, query]) => path === '/api/v1/gfs/resolve' && query?.uri === file.gfsUri
+ )
+ ).toHaveLength(2)
+ })
+ await waitFor(() => expect(mockGfsFetchFileBlob).toHaveBeenCalledTimes(2))
+ const refreshedDialog = screen.getByRole('dialog', { name: fileName })
+ expect(refreshedDialog).not.toBe(dialog)
+ if (fileName.endsWith('.PNG')) {
+ expect(
+ within(refreshedDialog).getByRole('img', { name: `Preview of ${fileName}` })
+ ).toBeVisible()
+ } else if (fileName.endsWith('.md')) {
+ expect(
+ within(refreshedDialog).getByRole('heading', { name: 'unchanged preview' })
+ ).toBeVisible()
+ } else {
+ expect(within(refreshedDialog).getByLabelText(`Video preview of ${fileName}`)).toBeVisible()
+ }
+ }
+ )
+
it('rebuilds the open directory breadcrumbs after a remote move', async () => {
const rootId = '11111111-1111-1111-1111-111111111111'
const oldParent = listedFolder(
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 72af91309..55d17d3ac 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.661",
+ "version": "0.1.662",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.661",
+ "version": "0.1.662",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/control-ui/package.json b/control-ui/package.json
index ea503d970..e75746e40 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.661",
+ "version": "0.1.662",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",