From 1f8595792a50edda9cdb70c4fc29cb4990c50efe Mon Sep 17 00:00:00 2001 From: cesnimda Date: Mon, 16 Nov 2026 23:05:14 +0100 Subject: [PATCH] fix(mail): scope link management completions to the current job --- .../src/components/Correspondence.tsx | 37 ++++-- .../src/correspondence-gmail-import.test.tsx | 111 ++++++++++++++++++ 2 files changed, 140 insertions(+), 8 deletions(-) diff --git a/job-tracker-ui/src/components/Correspondence.tsx b/job-tracker-ui/src/components/Correspondence.tsx index ae20da9f..373415ad 100644 --- a/job-tracker-ui/src/components/Correspondence.tsx +++ b/job-tracker-ui/src/components/Correspondence.tsx @@ -175,6 +175,7 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j setLinkedThreadRefreshLoading(false); setImportingMessageId(null); setImportingThreadId(null); + setManageSaving(false); return () => { session.active = false; session.generation += 1; session.starting = false; session.attempt = null; }; }, [jobId]); @@ -446,14 +447,19 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j }; const disconnectGmail = async () => { + const session = gmailOAuth.current; + const generation = session.generation; + const active = () => session.active && session.jobId === jobId && session.generation === generation; + if (!active()) return; try { await api.delete("/gmail/connection"); + if (!active()) return; setGmailStatus({ connected: false }); setGmailMatches(null); setLinkedThreadRefresh(null); - toast(t("googleUnlinked"), "success"); + toast(startupTranslation.current("googleUnlinked"), "success"); } catch (error) { - toast(getApiErrorMessage(error, t("correspondenceDisconnectFailed")), "error"); + if (active()) toast(getApiErrorMessage(error, startupTranslation.current("correspondenceDisconnectFailed")), "error"); } }; @@ -530,6 +536,10 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j const unlinkThread = async () => { if (!manageThreadId) return; + const session = gmailOAuth.current; + const generation = session.generation; + const active = () => session.active && session.jobId === jobId && session.generation === generation; + if (!active()) return; setManageSaving(true); try { const res = await api.post("/gmail/unlink-thread", { @@ -538,19 +548,26 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j note: manageNote.trim() || null, nextDecision: "review", }); + if (!active()) return; await load(); + if (!active()) return; await loadGmailMatches(gmailQuery); + if (!active()) return; setManageThreadId(null); - toast(t(res.data.removedMessages === 1 ? "correspondenceUnlinkedMessage" : "correspondenceUnlinkedMessages", { count: res.data.removedMessages }), "success"); + toast(startupTranslation.current(res.data.removedMessages === 1 ? "correspondenceUnlinkedMessage" : "correspondenceUnlinkedMessages", { count: res.data.removedMessages }), "success"); } catch (error: any) { - toast(getApiErrorMessage(error, t("correspondenceUnlinkThreadFailed")), "error"); + if (active()) toast(getApiErrorMessage(error, startupTranslation.current("correspondenceUnlinkThreadFailed")), "error"); } finally { - setManageSaving(false); + if (active()) setManageSaving(false); } }; const relinkThread = async () => { if (!manageThreadId || manageTargetJobId <= 0 || manageTargetJobId === jobId) return; + const session = gmailOAuth.current; + const generation = session.generation; + const active = () => session.active && session.jobId === jobId && session.generation === generation; + if (!active()) return; setManageSaving(true); try { const res = await api.post("/gmail/relink-thread", { @@ -559,15 +576,19 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j removeFromOtherJobs: true, note: manageNote.trim() || null, }); + if (!active()) return; await load(); + if (!active()) return; await loadGmailMatches(gmailQuery); + if (!active()) return; setManageThreadId(null); const targetJob = availableJobs.find((item) => item.id === manageTargetJobId); - toast(t("correspondenceMovedThread", { job: targetJob?.companyName || targetJob?.jobTitle || t("correspondenceJobNumber", { id: res.data.jobApplicationId }) }), "success"); + const translate = startupTranslation.current; + toast(translate("correspondenceMovedThread", { job: targetJob?.companyName || targetJob?.jobTitle || translate("correspondenceJobNumber", { id: res.data.jobApplicationId }) }), "success"); } catch (error: any) { - toast(getApiErrorMessage(error, t("correspondenceMoveThreadFailed")), "error"); + if (active()) toast(getApiErrorMessage(error, startupTranslation.current("correspondenceMoveThreadFailed")), "error"); } finally { - setManageSaving(false); + if (active()) setManageSaving(false); } }; diff --git a/job-tracker-ui/src/correspondence-gmail-import.test.tsx b/job-tracker-ui/src/correspondence-gmail-import.test.tsx index 1cab6992..a13e9ccc 100644 --- a/job-tracker-ui/src/correspondence-gmail-import.test.tsx +++ b/job-tracker-ui/src/correspondence-gmail-import.test.tsx @@ -476,6 +476,117 @@ describe("correspondence Gmail import", () => { expect(await screen.findByText(/no messages yet/i)).toBeInTheDocument(); }); + describe("Gmail link management lifetime", () => { + const actions = ["unlink", "relink", "disconnect"] as const; + type Action = typeof actions[number]; + const result = { data: { removedMessages: 1, jobApplicationId: 77 } }; + function feedback(action: Action, outcome: "resolve" | "reject", language: "en" | "nb") { + const strings = translations[language]; + if (action === "disconnect") return strings[outcome === "resolve" ? "googleUnlinked" : "correspondenceDisconnectFailed"]; + if (action === "unlink") return outcome === "resolve" ? strings.correspondenceUnlinkedMessage.replace("{count}", "1") : strings.correspondenceUnlinkThreadFailed; + return outcome === "resolve" ? strings.correspondenceMovedThread.replace("{job}", "Beta") : strings.correspondenceMoveThreadFailed; + } + async function beginManagement(action: Action, pending: { promise: Promise }) { + gmailConnected = action === "disconnect"; + correspondenceMessages = action === "disconnect" ? [] : [{ id: 700, jobApplicationId: 42, from: "Company", content: "Recorded correspondence", externalThreadId: "thread-1" }]; + if (action === "disconnect") mockedApi.delete.mockReturnValueOnce(pending.promise); + else { + const original = mockedApi.post.getMockImplementation()!; + mockedApi.post.mockImplementation((url: any, body?: any) => url === `/gmail/${action}-thread` ? pending.promise : original(url, body)); + } + const view = renderDialog(); + if (action === "disconnect") { + fireEvent.click(await screen.findByRole("button", { name: translations.en.correspondenceImportEmail })); + fireEvent.click(await screen.findByRole("tab", { name: /^google$/i })); + fireEvent.click(await screen.findByRole("button", { name: translations.en.correspondenceDisconnect })); + expect(mockedApi.delete).toHaveBeenCalledWith("/gmail/connection"); + } else { + fireEvent.click(await screen.findByRole("button", { name: /manage thread-1/i })); + fireEvent.change(screen.getByLabelText(translations.en.correspondenceReviewNote), { target: { value: " scoped reason " } }); + if (action === "relink") { + fireEvent.mouseDown(screen.getByRole("combobox", { name: translations.en.correspondenceMoveToJob })); + fireEvent.click(await screen.findByRole("option", { name: /beta.*platform engineer/i })); + } + fireEvent.click(screen.getByRole("button", { name: translations.en[action === "unlink" ? "correspondenceUnlinkFromJob" : "correspondenceMoveThread"] })); + expect(mockedApi.post).toHaveBeenCalledWith(`/gmail/${action}-thread`, action === "unlink" + ? { jobApplicationId: 42, threadId: "thread-1", note: "scoped reason", nextDecision: "review" } + : { jobApplicationId: 77, threadId: "thread-1", removeFromOtherJobs: true, note: "scoped reason" }); + } + return view; + } + + test.each(actions)("%s completion uses the current language for success and preserves its payload", async action => { + const pending = deferred(); await beginManagement(action, pending); + await act(async () => window.dispatchEvent(new StorageEvent("storage", { key: "uiLanguage", newValue: "nb" }))); + correspondenceMessages = []; + await act(async () => pending.resolve(result)); + expect(await screen.findByText(feedback(action, "resolve", "nb"))).toBeVisible(); + expect(screen.queryByText(feedback(action, "resolve", "en"))).not.toBeInTheDocument(); + if (action === "disconnect") expect(screen.getByRole("button", { name: translations.nb.correspondenceConnectGmail })).toBeEnabled(); + else expect(mockedApi.get.mock.calls.filter(([url]) => url === "/correspondence/42")).toHaveLength(2); + }); + + test.each(actions)("%s failure uses the current language and retains current action recovery", async action => { + const pending = deferred(); await beginManagement(action, pending); + await act(async () => window.dispatchEvent(new StorageEvent("storage", { key: "uiLanguage", newValue: "nb" }))); + await act(async () => pending.reject(new Error("synthetic management failure"))); + expect(await screen.findByText(feedback(action, "reject", "nb"))).toBeVisible(); + expect(screen.queryByText(feedback(action, "reject", "en"))).not.toBeInTheDocument(); + expect(screen.getByRole("button", { name: translations.nb[action === "disconnect" ? "correspondenceDisconnect" : "close"] })).toBeEnabled(); + }); + + describe.each(actions)("%s stale mutation", action => { + test.each([ + ["unmount", "resolve"], ["unmount", "reject"], ["job change", "resolve"], ["job change", "reject"], + ] as const)("ignores %s / %s without reads or feedback", async (departure, outcome) => { + const pending = deferred(); const view = await beginManagement(action, pending); + await act(async () => view.rerender(dialog(77, departure !== "unmount"))); + const reads = [...mockedApi.get.mock.calls]; + await act(async () => outcome === "resolve" ? pending.resolve(result) : pending.reject(new Error("obsolete management failure"))); + expect(mockedApi.get.mock.calls).toEqual(reads); + expect(screen.queryByText(feedback(action, "resolve", "en"))).not.toBeInTheDocument(); + expect(screen.queryByText(feedback(action, "reject", "en"))).not.toBeInTheDocument(); + }); + }); + + describe.each(["unlink", "relink"] as const)("%s follow-up lifetime", action => { + test("a changed job recovers its management controls while the previous write remains pending", async () => { + const pending = deferred(); const view = await beginManagement(action, pending); + await act(async () => view.rerender(dialog(77))); + expect(screen.getByRole("button", { name: translations.en.close })).toBeEnabled(); + await act(async () => pending.resolve(result)); + }); + + test.each([ + ["/correspondence/42", "resolve"], ["/correspondence/42", "reject"], + ["/gmail/job-candidates", "resolve"], ["/gmail/job-candidates", "reject"], + ] as const)("ignores a late %s / %s after unmount", async (url, outcome) => { + const mutation = deferred(); const refresh = deferred(); + const view = await beginManagement(action, mutation); + const original = mockedApi.get.getMockImplementation()!; + mockedApi.get.mockImplementation((requested: any, config?: any) => requested === url ? refresh.promise : original(requested, config)); + await act(async () => mutation.resolve(result)); + await waitFor(() => expect(mockedApi.get.mock.calls.filter(([requested]) => requested === url)).toHaveLength(url === "/correspondence/42" ? 2 : 1)); + await act(async () => view.rerender(dialog(42, false))); + const reads = [...mockedApi.get.mock.calls]; + await act(async () => outcome === "resolve" ? refresh.resolve({ data: [] }) : refresh.reject(new Error("obsolete management read"))); + expect(mockedApi.get.mock.calls).toEqual(reads); + expect(screen.queryByText(feedback(action, "resolve", "en"))).not.toBeInTheDocument(); + expect(screen.queryByText(feedback(action, "reject", "en"))).not.toBeInTheDocument(); + }); + }); + + test("closing thread management preserves its record and makes no mutation", async () => { + gmailConnected = false; + correspondenceMessages = [{ id: 700, jobApplicationId: 42, from: "Company", content: "Recorded correspondence", externalThreadId: "thread-1" }]; + renderDialog(); + fireEvent.click(await screen.findByRole("button", { name: /manage thread-1/i })); + fireEvent.click(screen.getByRole("button", { name: translations.en.close })); + expect(screen.getByText("Recorded correspondence")).toBeInTheDocument(); + expect(mockedApi.post).not.toHaveBeenCalled(); expect(mockedApi.delete).not.toHaveBeenCalled(); + }); + }); + describe("confirmed correspondence deletion lifetime", () => { async function requestDeletion() { correspondenceMessages = [{ id: 700, jobApplicationId: 42, from: "Company", content: "Recorded correspondence" }];