diff --git a/scripts/approval-reader-browser-smoke.mjs b/scripts/approval-reader-browser-smoke.mjs index 32c26336..82c77a73 100644 --- a/scripts/approval-reader-browser-smoke.mjs +++ b/scripts/approval-reader-browser-smoke.mjs @@ -79,6 +79,9 @@ try { await page.goto("http://127.0.0.1:" + server.address().port); await expect.poll(() => requests.length).toBe(1); await page.waitForTimeout(100); + const now = new Date(); + await page.clock.install({ time: now }); + await page.clock.pauseAt(new Date(now.getTime() + 1000)); const before = requests.length; holdNext = true; await page.evaluate(() => window.refresh()); @@ -95,6 +98,12 @@ try { "Notifications must not cancel and restart a slow approval read", ); assert.equal(aborted, 0); + const loading = page.getByText("Loading approval updates…"); + await page.clock.runFor(1999); + await expect(loading).toHaveCount(0); + await page.clock.runFor(1); + await expect(loading).toBeVisible(); + await page.clock.resume(); held.shift()(); await expect.poll(() => requests.length).toBe(before + 2); holdNext = true; diff --git a/src/client/Approvals.tsx b/src/client/Approvals.tsx index 0bf20741..d39fe2b7 100644 --- a/src/client/Approvals.tsx +++ b/src/client/Approvals.tsx @@ -77,6 +77,16 @@ export function Approvals({ failure, busy: readPending, } = useCollectionRead(readKey); + const refreshing = readPending && snapshot?.key === readKey; + const [slowRefreshKey, setSlowRefreshKey] = useState(); + useEffect(() => { + if (!refreshing) return; + const timer = setTimeout(() => setSlowRefreshKey(readKey), 2000); + return () => { + clearTimeout(timer); + setSlowRefreshKey(undefined); + }; + }, [refreshing, readKey]); const rateLimited = isRateLimited(failure); const readError = rateLimited ? "" : failureMessage; const [selected, setSelected] = useState(null); @@ -294,7 +304,8 @@ export function Approvals({ {notice}

)} - {(readPending || !!failure) && ( + {((readPending && (!refreshing || slowRefreshKey === readKey)) || + !!failure) && (