diff --git a/ui/src/hooks/useAnnouncement.test.tsx b/ui/src/hooks/useAnnouncement.test.tsx index 673e9a8f536..93002ae2cdd 100644 --- a/ui/src/hooks/useAnnouncement.test.tsx +++ b/ui/src/hooks/useAnnouncement.test.tsx @@ -5,6 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { useAnnouncement } from "./useAnnouncement"; import { announcementPreview } from "@/lib/announcement-preview"; import { announcementStoragePrefix } from "@/lib/announcement-dismissals"; +import { isIntentionalAbortReason } from "@/lib/intentional-abort"; const api = vi.hoisted(() => ({ current: vi.fn(), dismiss: vi.fn() })); vi.mock("@/api/announcements", () => ({ announcementsApi: api })); @@ -138,6 +139,29 @@ describe("announcement lifecycle", () => { await settle(); expect(container.textContent).toBe("after-return"); }); + it("aborts with an intentional reason when the tab is hidden, a card is dismissed, or the hook unmounts", async () => { + api.current.mockReturnValue(new Promise(() => {})); + await render(); + const hidden = api.current.mock.calls[0][0] as AbortSignal; + await visibility("hidden"); + expect(hidden.aborted).toBe(true); + expect(isIntentionalAbortReason(hidden.reason)).toBe(true); + + await visibility("visible"); + const dismissed = api.current.mock.calls[1][0] as AbortSignal; + api.dismiss.mockReturnValue(new Promise(() => {})); + await act(async () => observed.dismiss(announcementPreview.id)); + expect(dismissed.aborted).toBe(true); + expect(isIntentionalAbortReason(dismissed.reason)).toBe(true); + + const write = api.dismiss.mock.calls[0][2] as AbortSignal; + await visibility("hidden"); await visibility("visible"); + const unmounted = api.current.mock.calls[2][0] as AbortSignal; + await act(async () => root.unmount()); + root = createRoot(container); + expect(isIntentionalAbortReason(unmounted.reason)).toBe(true); + expect(isIntentionalAbortReason(write.reason)).toBe(true); + }); it("keeps failed writes pending and retries on reconnect", async () => { api.dismiss.mockRejectedValueOnce(new Error("offline")); await render(); await settle(); diff --git a/ui/src/hooks/useAnnouncement.ts b/ui/src/hooks/useAnnouncement.ts index 78e0457bead..cfe7ddf25b6 100644 --- a/ui/src/hooks/useAnnouncement.ts +++ b/ui/src/hooks/useAnnouncement.ts @@ -2,6 +2,7 @@ import { useCallback, useEffect, useRef, useState } from "react"; import { announcementIdSchema, type Announcement } from "@paperclipai/shared"; import { announcementsApi } from "@/api/announcements"; import { announcementStoragePrefix, readAnnouncementDismissals, saveAnnouncementDismissal } from "@/lib/announcement-dismissals"; +import { intentionalAbortReason } from "@/lib/intentional-abort"; export const ANNOUNCEMENT_SETTLE_MS = 3000; interface Options { @@ -61,7 +62,7 @@ export function useAnnouncement(options: Options) { function suspend() { generation++; clearTimeout(settleTimer); - fetchController?.abort(); + fetchController?.abort(intentionalAbortReason()); fetchController = null; setState(null); } @@ -112,7 +113,7 @@ export function useAnnouncement(options: Options) { setState(null); // Invalidate any response that started before this dismissal. generation++; - fetchController?.abort(); + fetchController?.abort(intentionalAbortReason()); try { channel?.postMessage(id); } catch { /* Storage events are the fallback. */ } void sync(id, savedLocally); }; @@ -126,8 +127,8 @@ export function useAnnouncement(options: Options) { disposed = true; generation++; clearTimeout(settleTimer); - fetchController?.abort(); - for (const controller of writes.values()) controller.abort(); + fetchController?.abort(intentionalAbortReason()); + for (const controller of writes.values()) controller.abort(intentionalAbortReason()); channel?.close(); document.removeEventListener("visibilitychange", onVisibility); window.removeEventListener("online", onOnline);