diff --git a/src/renderer/src/components/orca-cloud/use-cloud-workspace-record.test.ts b/src/renderer/src/components/orca-cloud/use-cloud-workspace-record.test.ts index c2282762f17..cf99e2e3c02 100644 --- a/src/renderer/src/components/orca-cloud/use-cloud-workspace-record.test.ts +++ b/src/renderer/src/components/orca-cloud/use-cloud-workspace-record.test.ts @@ -10,6 +10,8 @@ import { useCloudWorkspaceRecord } from './use-cloud-workspace-record' +const T0 = 1_700_000_000_000 + const bridge = { localWorkspaces: vi.fn(async () => [{ worktreeId: 'w', sandboxId: 'sbx' }]), environmentBindings: vi.fn(async () => ({})), @@ -17,24 +19,19 @@ const bridge = { } beforeEach(() => { + vi.useFakeTimers({ now: T0, toFake: ['Date'] }) resetCloudWorkspaceRecordsForTests() vi.clearAllMocks() Object.assign(window, { api: { cloudWorkspaces: bridge } }) }) afterEach(() => { + vi.useRealTimers() Object.assign(window, { api: undefined }) }) -async function settle(): Promise { - await act(async () => { - await new Promise((resolve) => setTimeout(resolve, 0)) - }) -} - describe('useCloudWorkspaceRecord', () => { it('a menu opened after row hover has the record on its first render', async () => { - prefetchCloudWorkspaceRecord('w', null) - await settle() + await prefetchCloudWorkspaceRecord('w', null) const { result } = renderHook(() => useCloudWorkspaceRecord('w', null)) expect(result.current.loaded).toBe(true) expect(result.current.workspace?.id).toBe('sbx') @@ -43,21 +40,20 @@ describe('useCloudWorkspaceRecord', () => { it('says not loaded until the first answer, then updates in place', async () => { const { result } = renderHook(() => useCloudWorkspaceRecord('w', null)) expect(result.current.loaded).toBe(false) - await settle() + await act(() => prefetchCloudWorkspaceRecord('w', null)) expect(result.current.loaded).toBe(true) expect(result.current.workspace?.id).toBe('sbx') }) it('hovering again while fresh asks nothing; a stale record is refreshed', async () => { - prefetchCloudWorkspaceRecord('w', null, 1_000) - prefetchCloudWorkspaceRecord('w', null, 1_000) - await settle() + await Promise.all([ + prefetchCloudWorkspaceRecord('w', null, T0), + prefetchCloudWorkspaceRecord('w', null, T0) + ]) expect(bridge.get).toHaveBeenCalledOnce() - prefetchCloudWorkspaceRecord('w', null, Date.now() + 1) - await settle() + await prefetchCloudWorkspaceRecord('w', null, T0 + 1) expect(bridge.get).toHaveBeenCalledOnce() - prefetchCloudWorkspaceRecord('w', null, Date.now() + RECORD_FRESH_MS) - await settle() + await prefetchCloudWorkspaceRecord('w', null, T0 + RECORD_FRESH_MS) expect(bridge.get).toHaveBeenCalledTimes(2) }) }) diff --git a/src/renderer/src/components/orca-cloud/use-cloud-workspace-record.ts b/src/renderer/src/components/orca-cloud/use-cloud-workspace-record.ts index 10728831883..fd632223ccd 100644 --- a/src/renderer/src/components/orca-cloud/use-cloud-workspace-record.ts +++ b/src/renderer/src/components/orca-cloud/use-cloud-workspace-record.ts @@ -49,16 +49,18 @@ function fetchRecord(worktreeId: string, hostId: string | null | undefined): Pro return run } -/** Loads the record unless a fresh one is known; for row hover, before any menu opens. */ +/** Loads the record unless a fresh one is known; for row hover, before any menu opens. Resolves + * when that load (or the one already running) is done. */ export function prefetchCloudWorkspaceRecord( worktreeId: string, hostId: string | null | undefined, now = Date.now() -): void { +): Promise { const known = records.get(key(worktreeId, hostId)) if (!known || now - known.at >= RECORD_FRESH_MS) { - void fetchRecord(worktreeId, hostId) + return fetchRecord(worktreeId, hostId) } + return Promise.resolve() } /** @@ -77,7 +79,7 @@ export function useCloudWorkspaceRecord( () => records.get(key(worktreeId, hostId)) ) useEffect(() => { - prefetchCloudWorkspaceRecord(worktreeId, hostId) + void prefetchCloudWorkspaceRecord(worktreeId, hostId) }, [worktreeId, hostId]) const reload = useCallback(() => void fetchRecord(worktreeId, hostId), [worktreeId, hostId]) return { workspace: entry?.workspace ?? null, loaded: entry !== undefined, reload } diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx index 4de7a1e3159..61ca8bf80ce 100644 --- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx +++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx @@ -110,7 +110,7 @@ export default function WorktreeContextMenuView({ model }: { model: WorktreeCont onPointerEnter={ isCloud ? () => - prefetchCloudWorkspaceRecord( + void prefetchCloudWorkspaceRecord( worktree.id, getWorktreeExecutionHostId(worktree, repo ?? undefined) )