From 772dba3c2bd4b2ac7d9e3f8d44db004dc0c42cc4 Mon Sep 17 00:00:00 2001 From: cesnimda Date: Tue, 17 Nov 2026 09:16:07 +0100 Subject: [PATCH] fix(i18n): use current language for delayed trash and undo feedback --- job-tracker-ui/src/components/JobTable.tsx | 10 +++--- .../src/jobs-view-integration.test.tsx | 33 +++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/job-tracker-ui/src/components/JobTable.tsx b/job-tracker-ui/src/components/JobTable.tsx index c791a7fc..9d517942 100644 --- a/job-tracker-ui/src/components/JobTable.tsx +++ b/job-tracker-ui/src/components/JobTable.tsx @@ -149,6 +149,8 @@ export default function JobTable({ refreshToken, pageSize, onPageSizeChange, col const isMobile = useMediaQuery("(max-width:767.95px)"); const { toast } = useToast(); const { t, language } = useI18n(); + const currentTranslation = useRef(t); + currentTranslation.current = t; const { confirmAction } = useDialogActions(); const location = useLocation(); const boardView = mode === "jobs" && new URLSearchParams(location.search).get("view") === "board"; @@ -414,20 +416,20 @@ export default function JobTable({ refreshToken, pageSize, onPageSizeChange, col if (!(await confirmDelete([job]))) return; try { await api.delete(`/jobapplications/${job.id}`); - toast(t("jobTableMovedToTrash"), "success", { label: t("jobTableUndo"), onClick: () => { void restore(job.id); } }); + toast(currentTranslation.current("jobTableMovedToTrash"), "success", { label: currentTranslation.current("jobTableUndo"), onClick: () => { void restore(job.id); } }); setReloadToken((token) => token + 1); } catch { - toast(t("jobTableDeleteFailed"), "error"); + toast(currentTranslation.current("jobTableDeleteFailed"), "error"); } }; const restore = async (id: number) => { try { await api.post(`/jobapplications/${id}/restore`); - toast(t("jobTableRestored"), "success"); + toast(currentTranslation.current("jobTableRestored"), "success"); setReloadToken((token) => token + 1); } catch { - toast(t("jobTableRestoreFailed"), "error"); + toast(currentTranslation.current("jobTableRestoreFailed"), "error"); } }; diff --git a/job-tracker-ui/src/jobs-view-integration.test.tsx b/job-tracker-ui/src/jobs-view-integration.test.tsx index 16020307..e709c084 100644 --- a/job-tracker-ui/src/jobs-view-integration.test.tsx +++ b/job-tracker-ui/src/jobs-view-integration.test.tsx @@ -176,3 +176,36 @@ test("saved filters applied in Board reset the Table page and refresh only the a await waitFor(() => expect(ids("[data-job-row-id]", "data-job-row-id")).toEqual([2])); expect(reads("/jobapplications")[0][1]?.params).toMatchObject({ page: 1, q: "Engineer", status: "Custom review" }); }); + +describe('individual application outcome language', () => { + beforeEach(() => { + mockedApi.delete.mockReset().mockResolvedValue({ data: {} } as any); + mockedApi.post.mockReset().mockResolvedValue({ data: {} } as any); + }); + afterEach(() => { mockedApi.delete.mockReset(); mockedApi.post.mockReset(); }); + + test.each((['delete', 'restore'] as const).flatMap(action => (['en', 'nb'] as const).flatMap(from => (['resolve', 'reject'] as const).map(outcome => [action, from, from === 'en' ? 'nb' : 'en', outcome] as const))))('delayed %s from %s to %s / %s keeps current feedback and original target', async (action, from, to, outcome) => { + let resolve!: (value: any) => void; + let reject!: (error: unknown) => void; + const pending = new Promise((yes, no) => { resolve = yes; reject = no; }); + const write = action === 'delete' ? mockedApi.delete : mockedApi.post; + write.mockReturnValueOnce(pending); + localStorage.setItem('uiLanguage', from); + show(); + fireEvent.click((await screen.findAllByRole('button', { name: `${translations[from].jobTableActions}: ${jobs[0].jobTitle}` }))[0]); + fireEvent.click(await screen.findByRole('menuitem', { name: translations[from].jobTableSoftDelete })); + const dialog = await screen.findByRole('dialog', { name: translations[from].jobTableMoveToTrashTitle }); + fireEvent.click(within(dialog).getByRole('button', { name: translations[from].jobTableMove })); + await waitFor(() => expect(mockedApi.delete).toHaveBeenCalledWith('/jobapplications/1')); + if (action === 'restore') fireEvent.click(await screen.findByRole('button', { name: translations[from].jobTableUndo })); + await waitFor(() => expect(write).toHaveBeenCalledTimes(1)); + await act(async () => { window.dispatchEvent(new StorageEvent('storage', { key: 'uiLanguage', newValue: to })); }); + await act(async () => { if (outcome === 'resolve') resolve({ data: {} }); else reject(new Error('synthetic mutation failure')); }); + const key = action === 'delete' ? outcome === 'resolve' ? 'jobTableMovedToTrash' : 'jobTableDeleteFailed' : outcome === 'resolve' ? 'jobTableRestored' : 'jobTableRestoreFailed'; + expect(await screen.findByText(translations[to][key])).toBeVisible(); + expect(screen.queryByText(translations[from][key])).not.toBeInTheDocument(); + expect(write).toHaveBeenCalledWith(action === 'delete' ? '/jobapplications/1' : '/jobapplications/1/restore'); + expect(write).toHaveBeenCalledTimes(1); + if (action === 'delete' && outcome === 'resolve') expect(await screen.findByRole('button', { name: translations[to].jobTableUndo })).toBeVisible(); + }); +});