diff --git a/job-tracker-ui/src/components/Correspondence.tsx b/job-tracker-ui/src/components/Correspondence.tsx index 014977af..d6d02e23 100644 --- a/job-tracker-ui/src/components/Correspondence.tsx +++ b/job-tracker-ui/src/components/Correspondence.tsx @@ -171,6 +171,8 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j session.jobId = jobId; manualSavingRef.current = false; setManualSaving(false); + setLinkedThreadRefresh(null); + setLinkedThreadRefreshLoading(false); return () => { session.active = false; session.generation += 1; session.starting = false; session.attempt = null; }; }, [jobId]); @@ -246,39 +248,48 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j const refreshLinkedThreads = useCallback(async (mode: "auto" | "manual" = "manual") => { if (!gmailStatus?.connected || linkedThreadIds.length === 0) return null; + const session = gmailOAuth.current; + if (!session.active || session.jobId !== jobId) return null; + const generation = session.generation; + const active = () => session.active && session.jobId === jobId && session.generation === generation; try { setLinkedThreadRefreshLoading(true); const res = await api.post("/gmail/refresh-linked-threads", { jobApplicationId: jobId }); + if (!active()) return null; setLinkedThreadRefresh(res.data); await load(); + if (!active()) return null; await loadGmailStatus(); + if (!active()) return null; if (importOpen && importTab === 1) { await loadGmailMatches(gmailQuery); } + if (!active()) return null; + const translate = startupTranslation.current; if (mode === "manual") { if (res.data.imported > 0) { - toast(t(res.data.imported === 1 ? "correspondenceImportedNewMessage" : "correspondenceImportedNewMessages", { count: res.data.imported }), "success"); + toast(translate(res.data.imported === 1 ? "correspondenceImportedNewMessage" : "correspondenceImportedNewMessages", { count: res.data.imported }), "success"); } else if (res.data.hasLinkedThreads) { - toast(t("correspondenceLinkedThreadsCurrent"), "success"); + toast(translate("correspondenceLinkedThreadsCurrent"), "success"); } else { - toast(t("correspondenceNoLinkedThreadsForJob"), "success"); + toast(translate("correspondenceNoLinkedThreadsForJob"), "success"); } } else if (res.data.imported > 0) { - toast(t(res.data.imported === 1 ? "correspondenceLinkedImportedMessage" : "correspondenceLinkedImportedMessages", { count: res.data.imported }), "success"); + toast(translate(res.data.imported === 1 ? "correspondenceLinkedImportedMessage" : "correspondenceLinkedImportedMessages", { count: res.data.imported }), "success"); } return res.data; } catch (error: any) { - if (mode === "manual") { - toast(getApiErrorMessage(error, t("correspondenceRefreshLinkedFailed")), "error"); + if (active() && mode === "manual") { + toast(getApiErrorMessage(error, startupTranslation.current("correspondenceRefreshLinkedFailed")), "error"); } return null; } finally { - setLinkedThreadRefreshLoading(false); + if (active()) setLinkedThreadRefreshLoading(false); } - }, [gmailQuery, gmailStatus?.connected, importOpen, importTab, jobId, linkedThreadIds.length, load, loadGmailMatches, loadGmailStatus, t, toast]); + }, [gmailQuery, gmailStatus?.connected, importOpen, importTab, jobId, linkedThreadIds.length, load, loadGmailMatches, loadGmailStatus, toast]); useEffect(() => { const requests = messageRequest; diff --git a/job-tracker-ui/src/correspondence-gmail-import.test.tsx b/job-tracker-ui/src/correspondence-gmail-import.test.tsx index e056d1d8..dd24c5f9 100644 --- a/job-tracker-ui/src/correspondence-gmail-import.test.tsx +++ b/job-tracker-ui/src/correspondence-gmail-import.test.tsx @@ -29,16 +29,16 @@ const originalWindowOpen = window.open; const gmailCallbackOrigin = "http://localhost:3000"; const gmailAuthorizationUrl = `https://accounts.google.com/o/oauth2/v2/auth?client_id=test-client&redirect_uri=${encodeURIComponent(`${gmailCallbackOrigin}/api/gmail/oauth/callback`)}&response_type=code&state=opaque-test-state`; -function dialog(jobId = 42) { +function dialog(jobId = 42, showCorrespondence = true) { return ( - + /> :
Another workflow
}
@@ -350,6 +350,52 @@ describe("correspondence Gmail import", () => { expect((await screen.findAllByText(/thread thread-1/i)).length).toBeGreaterThan(0); }); + describe('linked refresh completion lifetime', () => { + const refreshed = { jobApplicationId: 42, threadsChecked: 1, imported: 0, skipped: 1, hasLinkedThreads: true, threads: [], refreshedAt: '2026-11-16T12:00:00Z' }; + beforeEach(() => { + correspondenceMessages = [{ id: 700, jobApplicationId: 42, from: 'Company', content: 'Synthetic linked note', channel: 'Email', date: '2026-11-16T12:00:00Z', externalThreadId: 'thread-1' }]; + }); + + test('an automatic refresh finishing after leaving cannot start follow-up reads', async () => { + const write = deferred(); + mockedApi.post.mockImplementation(() => write.promise); + const view = renderDialog(); + await waitFor(() => expect(mockedApi.post).toHaveBeenCalledWith('/gmail/refresh-linked-threads', { jobApplicationId: 42 })); + view.rerender(dialog(42, false)); + const reads = mockedApi.get.mock.calls.length; + await act(async () => { write.resolve({ data: { ...refreshed, imported: 1 } }); }); + expect(mockedApi.get).toHaveBeenCalledTimes(reads); + expect(screen.queryByRole('alert')).not.toBeInTheDocument(); + }); + + test.each(['leave', 'language'] as const)('manual refresh feedback respects a %s boundary', async boundary => { + const write = deferred(); + let refreshes = 0; + const original = mockedApi.post.getMockImplementation()!; + mockedApi.post.mockImplementation((url: any, body?: any) => url === '/gmail/refresh-linked-threads' + ? ++refreshes === 1 ? Promise.resolve({ data: refreshed }) as any : write.promise + : original(url, body)); + const view = renderDialog(); + fireEvent.click(await screen.findByRole('button', { name: /import email/i })); + fireEvent.click(await screen.findByRole('tab', { name: /^google$/i })); + const refresh = await screen.findByRole('button', { name: translations.en.correspondenceRefreshLinkedThreads }); + await waitFor(() => expect(refresh).toBeEnabled()); + fireEvent.click(refresh); + await waitFor(() => expect(refreshes).toBe(2)); + if (boundary === 'leave') { + view.rerender(dialog(42, false)); + await act(async () => { write.reject(new Error('obsolete refresh failure')); }); + expect(screen.queryByText(translations.en.correspondenceRefreshLinkedFailed)).not.toBeInTheDocument(); + } else { + await act(async () => { window.dispatchEvent(new StorageEvent('storage', { key: 'uiLanguage', newValue: 'nb' })); }); + await act(async () => { write.resolve({ data: refreshed }); }); + expect(await screen.findByText(translations.nb.correspondenceLinkedThreadsCurrent)).toBeInTheDocument(); + expect(screen.queryByText(translations.en.correspondenceLinkedThreadsCurrent)).not.toBeInTheDocument(); + expect(refreshes).toBe(2); + } + }); + }); + test("lets the user unlink a linked Gmail thread", async () => { correspondenceMessages = [ {