Skip to content

Commit 77efcaf

Browse files
committed
fix(gui): abort stale usage requests on range change and unmount
Review finding (PR #99): the lint refactor dropped the previous cancelled guard, so an in-flight /api/usage response for an old range could overwrite the newer range's data/loading state (or set state after unmount). The effect now owns an AbortController: the cleanup aborts the pending fetch, and aborted requests never touch state.
1 parent a0257db commit 77efcaf

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

‎gui/src/pages/Usage.tsx‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,24 +191,32 @@ export default function Usage({ apiBase }: { apiBase: string }) {
191191
const [hoverDay, setHoverDay] = useState<number | null>(null);
192192
const [hoverCell, setHoverCell] = useState<{ wi: number; di: number; x: number; y: number } | null>(null);
193193

194-
const fetchUsage = useCallback(async (nextRange: Range) => {
194+
const fetchUsage = useCallback(async (nextRange: Range, signal: AbortSignal) => {
195195
setLoading(true);
196196
try {
197-
const res = await fetch(`${apiBase}/api/usage?range=${nextRange}`);
197+
const res = await fetch(`${apiBase}/api/usage?range=${nextRange}`, { signal });
198198
if (!res.ok) throw new Error("fetch failed");
199-
setData(await res.json() as UsageResponse);
199+
const json = await res.json() as UsageResponse;
200+
if (signal.aborted) return;
201+
setData(json);
200202
} catch {
203+
// A stale request (range/apiBase changed, or unmount) must not overwrite newer state.
204+
if (signal.aborted) return;
201205
setData(null);
202206
} finally {
203-
setLoading(false);
207+
if (!signal.aborted) setLoading(false);
204208
}
205209
}, [apiBase]);
206210

207211
useEffect(() => {
212+
const controller = new AbortController();
208213
const timeout = window.setTimeout(() => {
209-
void fetchUsage(range);
214+
void fetchUsage(range, controller.signal);
210215
}, 0);
211-
return () => window.clearTimeout(timeout);
216+
return () => {
217+
window.clearTimeout(timeout);
218+
controller.abort();
219+
};
212220
}, [fetchUsage, range]);
213221

214222
const heatmap = useMemo(() => buildHeatmap(data?.days ?? []), [data?.days]);

0 commit comments

Comments
 (0)