diff --git a/job-tracker-ui/src/components/Correspondence.tsx b/job-tracker-ui/src/components/Correspondence.tsx index e96b596c..014977af 100644 --- a/job-tracker-ui/src/components/Correspondence.tsx +++ b/job-tracker-ui/src/components/Correspondence.tsx @@ -147,6 +147,7 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j const [gmailQuery, setGmailQuery] = useState(""); const [gmailMatches, setGmailMatches] = useState(null); const [gmailMatchesLoading, setGmailMatchesLoading] = useState(false); + const gmailMatchRequest = useRef(0); const [linkedThreadRefresh, setLinkedThreadRefresh] = useState(null); const [linkedThreadRefreshLoading, setLinkedThreadRefreshLoading] = useState(false); const [importingMessageId, setImportingMessageId] = useState(null); @@ -204,6 +205,11 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j }, []); const loadGmailMatches = useCallback(async (queryOverride?: string) => { + const session = gmailOAuth.current; + if (!session.active || session.jobId !== jobId) return; + const generation = session.generation; + const request = ++gmailMatchRequest.current; + const active = () => session.active && session.jobId === jobId && session.generation === generation && gmailMatchRequest.current === request; try { setGmailMatchesLoading(true); const res = await api.get("/gmail/job-candidates", { @@ -213,13 +219,13 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j maxResultsPerQuery: 6, }, }); - setGmailMatches(res.data); + if (active()) setGmailMatches(res.data); } catch (error: any) { - toast(getApiErrorMessage(error, t("correspondenceLoadSuggestionsFailed")), "error"); + if (active()) toast(getApiErrorMessage(error, startupTranslation.current("correspondenceLoadSuggestionsFailed")), "error"); } finally { - setGmailMatchesLoading(false); + if (active()) setGmailMatchesLoading(false); } - }, [jobId, t, toast]); + }, [jobId, toast]); const loadAvailableJobs = useCallback(async (query?: string) => { try { @@ -275,10 +281,11 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j }, [gmailQuery, gmailStatus?.connected, importOpen, importTab, jobId, linkedThreadIds.length, load, loadGmailMatches, loadGmailStatus, t, toast]); useEffect(() => { + const requests = messageRequest; setMessages([]); setMessagesError(null); void load().catch(() => undefined); - return () => { ++messageRequest.current; }; + return () => { ++requests.current; }; }, [load]); useEffect(() => { diff --git a/job-tracker-ui/src/correspondence-gmail-import.test.tsx b/job-tracker-ui/src/correspondence-gmail-import.test.tsx index cdbd6deb..e056d1d8 100644 --- a/job-tracker-ui/src/correspondence-gmail-import.test.tsx +++ b/job-tracker-ui/src/correspondence-gmail-import.test.tsx @@ -8,6 +8,7 @@ import { I18nProvider } from "./i18n/I18nProvider"; import Correspondence from "./components/Correspondence"; import { api } from "./api"; import { translations } from "./i18n/translations"; +import type { GmailJobMatchesResponse } from "./types"; jest.setTimeout(15000); @@ -49,6 +50,13 @@ function renderDialog() { return render(dialog()); } +function deferred() { + let resolve!: (value: T) => void; + let reject!: (reason: unknown) => void; + const promise = new Promise((yes, no) => { resolve = yes; reject = no; }); + return { promise, resolve, reject }; +} + async function oauthMessage(data: unknown, source: Window | null, origin = gmailCallbackOrigin) { await act(async () => { window.dispatchEvent(new MessageEvent("message", { data, source, origin })); @@ -438,6 +446,65 @@ describe("correspondence Gmail import", () => { }); }); + test.each(['older-first', 'newer-first'])("candidate results retain the newest query when requests finish %s", async order => { + const first = deferred(); + const second = deferred(); + const original = mockedApi.get.getMockImplementation()!; + const sample = (await original('/gmail/job-candidates', undefined) as { data: GmailJobMatchesResponse }).data; + const result = (subject: string) => ({ data: { ...sample, threads: [{ ...sample.threads[0], subject }] } }); + mockedApi.get.mockImplementation((url: any, config?: any) => url === '/gmail/job-candidates' + ? config?.params?.queryOverride ? second.promise : first.promise + : original(url, config)); + renderDialog(); + fireEvent.click(await screen.findByRole('button', { name: /import email/i })); + fireEvent.click(await screen.findByRole('tab', { name: /^google$/i })); + const search = await screen.findByLabelText(/search gmail/i); + fireEvent.change(search, { target: { value: 'latest query' } }); + await waitFor(() => expect(mockedApi.get).toHaveBeenCalledWith('/gmail/job-candidates', expect.objectContaining({ params: expect.objectContaining({ queryOverride: 'latest query' }) }))); + if (order === 'older-first') { + await act(async () => { first.resolve(result('Obsolete query result')); }); + expect(screen.getByRole('button', { name: /^search$/i })).toBeDisabled(); + expect(screen.queryByText('Obsolete query result')).not.toBeInTheDocument(); + await act(async () => { second.resolve(result('Latest query result')); }); + } else { + await act(async () => { second.resolve(result('Latest query result')); }); + await screen.findByText('Latest query result'); + await act(async () => { first.resolve(result('Obsolete query result')); }); + } + expect(await screen.findByText('Latest query result')).toBeInTheDocument(); + expect(screen.queryByText('Obsolete query result')).not.toBeInTheDocument(); + }); + + test('candidate failure follows the current locale without a language-triggered Gmail read', async () => { + const read = deferred(); + const original = mockedApi.get.getMockImplementation()!; + mockedApi.get.mockImplementation((url: any, config?: any) => url === '/gmail/job-candidates' ? read.promise : original(url, config)); + renderDialog(); + fireEvent.click(await screen.findByRole('button', { name: /import email/i })); + fireEvent.click(await screen.findByRole('tab', { name: /^google$/i })); + await screen.findByLabelText(/search gmail/i); + const reads = mockedApi.get.mock.calls.length; + await act(async () => { window.dispatchEvent(new StorageEvent('storage', { key: 'uiLanguage', newValue: 'nb' })); }); + expect(mockedApi.get).toHaveBeenCalledTimes(reads); + await act(async () => { read.reject(new Error('synthetic offline failure')); }); + expect(await screen.findByText(translations.nb.correspondenceLoadSuggestionsFailed)).toBeInTheDocument(); + expect(screen.queryByText(translations.en.correspondenceLoadSuggestionsFailed)).not.toBeInTheDocument(); + }); + + test('a candidate failure after leaving the job cannot notify the next job', async () => { + const read = deferred(); + const original = mockedApi.get.getMockImplementation()!; + mockedApi.get.mockImplementation((url: any, config?: any) => url === '/gmail/job-candidates' && config?.params?.jobApplicationId === 42 + ? read.promise : original(url, config)); + const view = renderDialog(); + fireEvent.click(await screen.findByRole('button', { name: /import email/i })); + fireEvent.click(await screen.findByRole('tab', { name: /^google$/i })); + await screen.findByLabelText(/search gmail/i); + view.rerender(dialog(77)); + await act(async () => { read.reject(new Error('obsolete job failure')); }); + expect(screen.queryByText(translations.en.correspondenceLoadSuggestionsFailed)).not.toBeInTheDocument(); + }); + test("ignores an unsolicited Gmail success without status, candidate reads or feedback", async () => { gmailConnected = false; renderDialog();