diff --git a/job-tracker-ui/src/cv-builder-deep-link.test.tsx b/job-tracker-ui/src/cv-builder-deep-link.test.tsx
index a4cfe016..9025ee05 100644
--- a/job-tracker-ui/src/cv-builder-deep-link.test.tsx
+++ b/job-tracker-ui/src/cv-builder-deep-link.test.tsx
@@ -91,6 +91,97 @@ function SwitchCountLanguage() {
return ;
}
+test.each(['en', 'nb'] as const)('pending CV reload follows %s language changes without resolving the decision', async (language) => {
+ localStorage.setItem('uiLanguage', language);
+ const next = language === 'en' ? 'nb' : 'en';
+ routeGet(() => Promise.resolve({ data: variant }));
+ mockedApi.put.mockRejectedValue({ response: { status: 409, data: { code: 'cv_revision_conflict' } } });
+ renderAt(3, false, );
+ await screen.findByDisplayValue('Backend CV');
+ fireEvent.click(screen.getByRole('tab', { name: translations[language].cvEditorContent }));
+ const headline = screen.getByLabelText(translations[language].cvEditorHeadlineOverride);
+ fireEvent.change(headline, { target: { value: 'Recoverable pending draft' } });
+ fireEvent.click(screen.getByRole('button', { name: translations[language].cvEditorSaveNow }));
+ await screen.findByText(translations[language].cvEditorConflict);
+ const reads = mockedApi.get.mock.calls.length;
+ const writes = mockedApi.put.mock.calls.length;
+ fireEvent.click(screen.getByRole('button', { name: translations[language].cvEditorConflictReload }));
+ const dialog = await screen.findByRole('dialog', { name: translations[language].cvEditorConflictReload });
+ fireEvent.click(screen.getByText('Switch count language'));
+ expect(screen.getByRole('dialog', { name: translations[next].cvEditorConflictReload })).toBe(dialog);
+ expect(within(dialog).getByText(translations[next].cvEditorConflictReloadMessage)).toBeInTheDocument();
+ expect(within(dialog).getByText(translations[next].confirmDestructiveHint)).toBeInTheDocument();
+ expect(within(dialog).getByRole('button', { name: translations[next].cvEditorConflictReload })).toBeInTheDocument();
+ expect(mockedApi.get).toHaveBeenCalledTimes(reads);
+ expect(mockedApi.put).toHaveBeenCalledTimes(writes);
+ expect(headline).toHaveValue('Recoverable pending draft');
+ fireEvent.click(within(dialog).getByRole('button', { name: translations[next].cancel }));
+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
+ expect(headline).toHaveValue('Recoverable pending draft');
+
+});
+
+test.each(['en', 'nb'] as const)('pending CV discard follows %s language changes and preserves the blocked draft', async (language) => {
+ localStorage.setItem('uiLanguage', language);
+ const next = language === 'en' ? 'nb' : 'en';
+ routeGet(() => Promise.resolve({ data: variant }));
+ mockedApi.put.mockRejectedValue({ response: { status: 409, data: { code: 'cv_revision_conflict' } } });
+ const { router } = renderAt(3, false, );
+ await screen.findByDisplayValue('Backend CV');
+ fireEvent.click(screen.getByRole('tab', { name: translations[language].cvEditorContent }));
+ const headline = screen.getByLabelText(translations[language].cvEditorHeadlineOverride);
+ fireEvent.change(headline, { target: { value: 'Blocked draft' } });
+ fireEvent.click(screen.getByRole('button', { name: translations[language].cvEditorSaveNow }));
+ await screen.findByText(translations[language].cvEditorConflict);
+ fireEvent.click(screen.getByRole('button', { name: translations[language].cvEditorBack }));
+ const dialog = await screen.findByRole('dialog', { name: translations[language].cvEditorDiscardTitle });
+ const reads = mockedApi.get.mock.calls.length;
+ fireEvent.click(screen.getByText('Switch count language'));
+ expect(screen.getByRole('dialog', { name: translations[next].cvEditorDiscardTitle })).toBe(dialog);
+ expect(within(dialog).getByText(translations[next].cvEditorDiscardMessage)).toBeInTheDocument();
+ expect(within(dialog).getByRole('button', { name: translations[next].cvEditorDiscardLeave })).toBeInTheDocument();
+ expect(router.state.location.pathname).toBe('/career/builder/3');
+ expect(mockedApi.get).toHaveBeenCalledTimes(reads);
+ expect(mockedApi.put).toHaveBeenCalledTimes(1);
+ fireEvent.click(within(dialog).getByRole('button', { name: translations[next].cancel }));
+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
+ expect(headline).toHaveValue('Blocked draft');
+ expect(router.state.location.pathname).toBe('/career/builder/3');
+});
+
+test.each(['en', 'nb'] as const)('pending CV restore follows %s language changes and retains its version', async (language) => {
+ localStorage.setItem('uiLanguage', language);
+ const next = language === 'en' ? 'nb' : 'en';
+ routeGet(() => Promise.resolve({ data: variant }), { sections: [] }, [
+ { version: 3, isCurrent: false, source: 'manual', createdAtUtc: variant.updatedAtUtc },
+ ]);
+ mockedApi.post.mockImplementation((url: string) => Promise.resolve({ data: url.endsWith('/restore') ? { ...variant, version: 5 } : { html: '
CV
' } } as any));
+ renderAt(3, false, );
+ await screen.findByDisplayValue('Backend CV');
+ fireEvent.click(screen.getByRole('tab', { name: translations[language].cvEditorHistory }));
+ const title = (locale: 'en' | 'nb') => translations[locale].cvEditorRestoreTitle.replace('{version}', '3');
+ fireEvent.click(await screen.findByRole('button', { name: title(language) }));
+ const dialog = await screen.findByRole('dialog', { name: title(language) });
+ const reads = mockedApi.get.mock.calls.length;
+ const posts = mockedApi.post.mock.calls.length;
+ fireEvent.click(screen.getByText('Switch count language'));
+ expect(screen.getByRole('dialog', { name: title(next) })).toBe(dialog);
+ expect(within(dialog).getByText(translations[next].cvEditorRestoreMessage.replace('{version}', '3'))).toBeInTheDocument();
+ expect(within(dialog).getByText(translations[next].confirmStandardHint)).toBeInTheDocument();
+ expect(within(dialog).getByRole('button', { name: translations[next].cvEditorRestoreVersion })).toBeInTheDocument();
+ expect(mockedApi.get).toHaveBeenCalledTimes(reads);
+ expect(mockedApi.post).toHaveBeenCalledTimes(posts);
+ expect(mockedApi.put).not.toHaveBeenCalled();
+ fireEvent.click(within(dialog).getByRole('button', { name: translations[next].cancel }));
+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument());
+ expect(mockedApi.post).toHaveBeenCalledTimes(posts);
+ fireEvent.click(await screen.findByRole('button', { name: title(next) }));
+ fireEvent.click(within(await screen.findByRole('dialog')).getByRole('button', { name: translations[next].cvEditorRestoreVersion }));
+ await waitFor(() => expect(mockedApi.post).toHaveBeenCalledWith('/cv/variants/3/versions/3/restore', { expectedVersion: 4 }));
+ expect(mockedApi.post.mock.calls.filter(([url]) => String(url).endsWith('/restore'))).toHaveLength(1);
+ expect(mockedApi.put).not.toHaveBeenCalled();
+});
+
test.each((['en', 'nb'] as const).flatMap(language => ['profile', 'custom'].flatMap(source => [0, 1, 2].map(count => [language, source, count] as const))))('section count grammar: %s %s %s updates locale without saving', async (language, source, count) => {
localStorage.setItem('uiLanguage', language);
const items = Array.from({ length: count }, (_, i) => `Recorded item ${i}`);
diff --git a/job-tracker-ui/src/views/CvBuilderEditor.tsx b/job-tracker-ui/src/views/CvBuilderEditor.tsx
index 5e9b6ed4..4f87c809 100644
--- a/job-tracker-ui/src/views/CvBuilderEditor.tsx
+++ b/job-tracker-ui/src/views/CvBuilderEditor.tsx
@@ -395,7 +395,7 @@ export default function CvBuilderEditor() {
};
const reloadSavedVariant = async () => {
- if (!(await confirmAction(t("cvEditorConflictReloadMessage"), { title: t("cvEditorConflictReload"), confirmLabel: t("cvEditorConflictReload"), destructive: true }))) return;
+ if (!(await confirmAction({ key: "cvEditorConflictReloadMessage" }, { title: { key: "cvEditorConflictReload" }, confirmLabel: { key: "cvEditorConflictReload" }, destructive: true }))) return;
const revision = saveRevision.current;
const epoch = editorEpoch.current;
await saveQueue.current;
@@ -414,9 +414,9 @@ export default function CvBuilderEditor() {
}
if (blockerPromptOpen.current) return;
blockerPromptOpen.current = true;
- void confirmAction(t("cvEditorDiscardMessage"), {
- title: t("cvEditorDiscardTitle"),
- confirmLabel: t("cvEditorDiscardLeave"),
+ void confirmAction({ key: "cvEditorDiscardMessage" }, {
+ title: { key: "cvEditorDiscardTitle" },
+ confirmLabel: { key: "cvEditorDiscardLeave" },
destructive: true,
}).then((confirmed) => {
if (confirmed) blocker.proceed();
@@ -517,9 +517,9 @@ export default function CvBuilderEditor() {
const restore = async (version: number) => {
const epoch = editorEpoch.current;
- if (!(await confirmAction(t("cvEditorRestoreMessage", { version }), {
- title: t("cvEditorRestoreTitle", { version }),
- confirmLabel: t("cvEditorRestoreVersion"),
+ if (!(await confirmAction({ key: "cvEditorRestoreMessage", params: { version } }, {
+ title: { key: "cvEditorRestoreTitle", params: { version } },
+ confirmLabel: { key: "cvEditorRestoreVersion" },
}))) return;
if (epoch !== editorEpoch.current) return;
if (hasUnsavedChanges && !(await retrySave())) {