From 9d0d82e10c2e27ac1c377e274ba5a37fe402173c Mon Sep 17 00:00:00 2001 From: Jamie Asefa <13409617+j-asefa@users.noreply.github.com> Date: Sat, 21 Nov 2026 22:13:35 +0000 Subject: [PATCH 1/3] Keep routine approval refreshes from shifting the Feed --- scripts/approval-reader-browser-smoke.mjs | 5 +++-- src/client/Approvals.tsx | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/approval-reader-browser-smoke.mjs b/scripts/approval-reader-browser-smoke.mjs index 32c26336..8dd66ff2 100644 --- a/scripts/approval-reader-browser-smoke.mjs +++ b/scripts/approval-reader-browser-smoke.mjs @@ -95,10 +95,11 @@ try { "Notifications must not cancel and restart a slow approval read", ); assert.equal(aborted, 0); + await expect(page.getByText("Loading approval updates…")).toHaveCount(0); held.shift()(); await expect.poll(() => requests.length).toBe(before + 2); holdNext = true; - await page.evaluate(() => window.refresh()); + await page.evaluate(() => window.run("stalled")); await expect.poll(() => held.length).toBe(1); const stalledReads = requests.length; const beforeRetryAbort = aborted; @@ -113,7 +114,7 @@ try { ).toHaveCount(0); status = 503; holdNext = true; - await page.evaluate(() => window.refresh()); + await page.evaluate(() => window.run("manual-failure")); await expect.poll(() => held.length).toBe(1); await page .getByRole("button", { name: "Retry connection", exact: true }) diff --git a/src/client/Approvals.tsx b/src/client/Approvals.tsx index 0bf20741..d3199e00 100644 --- a/src/client/Approvals.tsx +++ b/src/client/Approvals.tsx @@ -294,7 +294,7 @@ export function Approvals({ {notice}

)} - {(readPending || !!failure) && ( + {((readPending && snapshot?.key !== readKey) || !!failure) && (

Date: Sat, 21 Nov 2026 22:50:35 +0000 Subject: [PATCH 2/3] Expose retry for stalled background approval reads --- scripts/approval-reader-browser-smoke.mjs | 4 ++-- src/client/Approvals.tsx | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/approval-reader-browser-smoke.mjs b/scripts/approval-reader-browser-smoke.mjs index 8dd66ff2..951b7542 100644 --- a/scripts/approval-reader-browser-smoke.mjs +++ b/scripts/approval-reader-browser-smoke.mjs @@ -99,7 +99,7 @@ try { held.shift()(); await expect.poll(() => requests.length).toBe(before + 2); holdNext = true; - await page.evaluate(() => window.run("stalled")); + await page.evaluate(() => window.refresh()); await expect.poll(() => held.length).toBe(1); const stalledReads = requests.length; const beforeRetryAbort = aborted; @@ -114,7 +114,7 @@ try { ).toHaveCount(0); status = 503; holdNext = true; - await page.evaluate(() => window.run("manual-failure")); + await page.evaluate(() => window.refresh()); await expect.poll(() => held.length).toBe(1); await page .getByRole("button", { name: "Retry connection", exact: true }) diff --git a/src/client/Approvals.tsx b/src/client/Approvals.tsx index d3199e00..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 && snapshot?.key !== readKey) || !!failure) && ( + {((readPending && (!refreshing || slowRefreshKey === readKey)) || + !!failure) && (

Date: Sat, 21 Nov 2026 23:37:33 +0000 Subject: [PATCH 3/3] Control the browser clock when checking the slow refresh threshold --- scripts/approval-reader-browser-smoke.mjs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/approval-reader-browser-smoke.mjs b/scripts/approval-reader-browser-smoke.mjs index 951b7542..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,7 +98,12 @@ try { "Notifications must not cancel and restart a slow approval read", ); assert.equal(aborted, 0); - await expect(page.getByText("Loading approval updates…")).toHaveCount(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;