fix(mail): discard stale message and thread import completions

This commit is contained in:
cesnimda
2026-11-16 22:41:53 +01:00
parent 8f9cf70d13
commit 2043f99259
2 changed files with 71 additions and 7 deletions
@@ -173,6 +173,8 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j
setManualSaving(false);
setLinkedThreadRefresh(null);
setLinkedThreadRefreshLoading(false);
setImportingMessageId(null);
setImportingThreadId(null);
return () => { session.active = false; session.generation += 1; session.starting = false; session.attempt = null; };
}, [jobId]);
@@ -467,34 +469,49 @@ export default function Correspondence({ jobId, jobContext }: { jobId: number; j
};
const importGmailMessage = async (messageId: string) => {
const session = gmailOAuth.current;
const generation = session.generation;
const active = () => session.active && session.jobId === jobId && session.generation === generation;
if (!active()) return;
try {
setImportingMessageId(messageId);
const res = await api.post<GmailImportMessageResult>("/gmail/import", { jobApplicationId: jobId, messageId });
if (!active()) return;
await load();
if (!active()) return;
await loadGmailMatches(gmailQuery);
if (!active()) return;
if (res.data.imported > 0) {
toast(t("correspondenceImportEmail"), "success");
toast(startupTranslation.current("correspondenceImportEmail"), "success");
} else {
toast(t("correspondenceAlreadyLinkedToJob"), "success");
toast(startupTranslation.current("correspondenceAlreadyLinkedToJob"), "success");
}
} catch (error: any) {
toast(getApiErrorMessage(error, t("correspondenceImportGmailFailed")), "error");
if (active()) toast(getApiErrorMessage(error, startupTranslation.current("correspondenceImportGmailFailed")), "error");
} finally {
setImportingMessageId(null);
if (active()) setImportingMessageId(null);
}
};
const importGmailThread = async (threadId: string, messageIds: string[]) => {
const session = gmailOAuth.current;
const generation = session.generation;
const active = () => session.active && session.jobId === jobId && session.generation === generation;
if (!active()) return;
try {
setImportingThreadId(threadId);
const res = await api.post<GmailImportThreadResult>("/gmail/import-thread", { jobApplicationId: jobId, threadId, messageIds });
if (!active()) return;
await load();
if (!active()) return;
await loadGmailMatches(gmailQuery);
toast(t("correspondenceImportThreadResult", { imported: res.data.imported, skippedText: res.data.skipped ? t("correspondenceImportThreadSkipped", { count: res.data.skipped }) : "" }), "success");
if (!active()) return;
const translate = startupTranslation.current;
toast(translate("correspondenceImportThreadResult", { imported: res.data.imported, skippedText: res.data.skipped ? translate("correspondenceImportThreadSkipped", { count: res.data.skipped }) : "" }), "success");
} catch (error: any) {
toast(getApiErrorMessage(error, t("correspondenceImportThreadFailed")), "error");
if (active()) toast(getApiErrorMessage(error, startupTranslation.current("correspondenceImportThreadFailed")), "error");
} finally {
setImportingThreadId(null);
if (active()) setImportingThreadId(null);
}
};
@@ -396,6 +396,53 @@ describe("correspondence Gmail import", () => {
});
});
describe('Gmail import completion lifetime', () => {
async function beginImport(kind: 'message' | 'thread') {
const view = renderDialog();
fireEvent.click(await screen.findByRole('button', { name: /import email/i }));
fireEvent.click(await screen.findByRole('tab', { name: /^google$/i }));
await screen.findByText('Backend Developer follow-up');
if (kind === 'thread') fireEvent.click(screen.getByRole('button', { name: translations.en.correspondenceImportThread }));
else {
const buttons = screen.getAllByRole('button', { name: translations.en.correspondenceImportEmail });
fireEvent.click(buttons[buttons.length - 1]);
}
return view;
}
test.each([
['message', 'success'], ['message', 'failure'], ['thread', 'success'], ['thread', 'failure'],
] as const)('%s import %s after leaving cannot read or notify another workflow', async (kind, outcome) => {
const write = deferred<any>();
const original = mockedApi.post.getMockImplementation()!;
const endpoint = kind === 'thread' ? '/gmail/import-thread' : '/gmail/import';
mockedApi.post.mockImplementation((url: any, body?: any) => url === endpoint ? write.promise : original(url, body));
const view = await beginImport(kind);
await waitFor(() => expect(mockedApi.post).toHaveBeenCalledWith(endpoint, expect.objectContaining({ jobApplicationId: 42 })));
view.rerender(dialog(42, false));
const reads = mockedApi.get.mock.calls.length;
await act(async () => {
if (outcome === 'success') write.resolve({ data: { imported: 1, skipped: 0 } });
else write.reject(new Error('obsolete import failure'));
});
expect(mockedApi.get).toHaveBeenCalledTimes(reads);
expect(screen.queryByRole('alert')).not.toBeInTheDocument();
});
test.each(['message', 'thread'] as const)('%s import failure uses the current language', async kind => {
const write = deferred<any>();
const original = mockedApi.post.getMockImplementation()!;
const endpoint = kind === 'thread' ? '/gmail/import-thread' : '/gmail/import';
mockedApi.post.mockImplementation((url: any, body?: any) => url === endpoint ? write.promise : original(url, body));
await beginImport(kind);
await act(async () => { window.dispatchEvent(new StorageEvent('storage', { key: 'uiLanguage', newValue: 'nb' })); });
await act(async () => { write.reject(new Error('synthetic import failure')); });
const key = kind === 'thread' ? 'correspondenceImportThreadFailed' : 'correspondenceImportGmailFailed';
expect(await screen.findByText(translations.nb[key])).toBeInTheDocument();
expect(screen.queryByText(translations.en[key])).not.toBeInTheDocument();
});
});
test("lets the user unlink a linked Gmail thread", async () => {
correspondenceMessages = [
{