Compare commits

...

1 Commits

Author SHA1 Message Date
cesnimda f6143b9c7d fix(cv): preserve concurrent names when renaming from the library
(cherry picked from commit 89128e1c33)
2026-11-20 13:59:48 +01:00
3 changed files with 59 additions and 4 deletions
@@ -20,3 +20,15 @@ No fresh export build/native browser journey, real API/session/cookie-switch int
Evidence is under [cv-library-lifetime](evidence/cv-library-lifetime/SOURCE_RECEIPTS.json). Normalised source hashes and raw receipt hashes bind this bounded result.
AST graph refresh PASSED on an exact 1,003-file tracked-code snapshot on E: (E:/Storage/Projects/Active/temp docs/jobjakt-local-build/a3-cv-library-source). SOURCE_MANIFEST.json binds files to source commit de2fb452; 10,345 nodes and 36,111 edges. 51 no-symbol warnings retained. Code-only snapshot excludes documentation. Stale generated integration graph: all 2,721 files (97,063,540 bytes) preserved and SHA256-verified on E before replacing its C directory with a junction; no tracked source or evidence removed.
## Concurrent rename in the library · 20 November 2026
On application source `7a2b8a95c146d67bc4584740e4a72740cfc25cbf`, the rename dialog opened with the listed name. After confirmation the library fetched the current CV and used its latest revision and settings to write the requested name. A second editor could rename the same CV while that dialog was open. The subsequent write adopted the second editor’s revision and silently replaced their name. If both editors chose the same name the redundant write also created a revision.
The library now compares the name shown in the dialog with the name returned by the existing detail read. When they differ it shows the latest persisted name and skips the write. If the requested name differs as well, the existing localised conflict message appears. A user can reopen Rename on the current name and explicitly retry. A concurrent change confined to settings still allows a rename, using the latest settings and expected revision. A change after the detail read remains subject to server revision checks.
**Reproduction and verification.** Both added component cases failed on the original source because a PUT was issued. The corrected combined run passed **77 distinct cases in three suites** (47 CV library, 15 CV helpers, 15 session boundary), zero failed or skipped. The conflict case verifies an explicit retry sends exactly one PUT with the current revision and settings. The equal-name case verifies zero PUTs and no conflict alert. TypeScript, scoped ESLint and Git whitespace checks passed. Raw Jest results are in the local `cv-library-rename-verification` evidence directory. SHA-256 values are `1841f3d9e7199d6f8e6deb886d2581a93f36b66273e3083075e5fd2dd2a46ba5` (red) and `8db570ffa120e80dc047db98ad2f3368a586cd35791a164343ee150742312495` (final). An intermediate invocation included a misspelled suite path and exited 1. Its two successful suites and the separate corrected session-suite run overlap the final 77.
**Evidence scope.** The tests render the real library and prompt with mocked transport. A native two-tab/browser run, real database writes, PDF rendering and full integrated acceptance were outside this execution. The earlier 85-case verification above is historical. The changed library source blob is `4b5018c6e549a4c5711dcc84a00082629af0ef80` and test blob is `448f46e977f4c733b3d99265e500fed8ee7779bf`.
The AST-only Graphify refresh completed with 20,198 nodes and 50,033 edges. SQL extraction was unavailable and 146 source files yielded no symbols.
@@ -509,6 +509,41 @@ test('a rename conflict keeps the original library entry and never retries the w
expect(mockedApi.delete).not.toHaveBeenCalled();
});
test.each(['My proposed name', 'Name from another editor'])(
'a concurrent rename preserves the saved title before applying "%s"', async proposedName => {
const latest = { ...existingCv, name: 'Name from another editor', version: 7, settings: emptyCvVariantSettings('clean') };
mockedApi.get.mockImplementation(async url => ({ data: url === '/cv/variants' ? [existingCv]
: url === '/cv/variants/1' ? latest : themes }) as any);
mockedApi.put.mockResolvedValue({ data: { ...latest, name: proposedName, version: 8 } } as any);
renderPage();
await screen.findByText(existingCv.name);
await selectAction('Rename');
fireEvent.change(await screen.findByRole('textbox'), { target: { value: proposedName } });
fireEvent.click(screen.getByRole('button', { name: 'Rename' }));
await waitFor(() => expect(mockedApi.get).toHaveBeenCalledWith('/cv/variants/1'));
await waitFor(() => expect(screen.getByRole('link')).toHaveAttribute('aria-disabled', 'false'));
expect(mockedApi.put).not.toHaveBeenCalled();
expect(screen.getByRole('link', { name: 'Open Name from another editor' })).toBeInTheDocument();
if (proposedName === latest.name) {
expect(screen.queryByText('CV changed elsewhere')).not.toBeInTheDocument();
return;
}
expect(screen.getByText('CV changed elsewhere')).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: 'Actions for Name from another editor' }));
fireEvent.click(await screen.findByRole('menuitem', { name: 'Rename' }));
const retry = await screen.findByRole('textbox');
expect(retry).toHaveValue(latest.name);
fireEvent.change(retry, { target: { value: proposedName } });
fireEvent.click(screen.getByRole('button', { name: 'Rename' }));
expect(await screen.findByRole('link', { name: 'Open My proposed name' })).toBeInTheDocument();
expect(mockedApi.put).toHaveBeenCalledTimes(1);
expect(mockedApi.put).toHaveBeenCalledWith('/cv/variants/1', {
name: proposedName, settings: latest.settings, source: 'manual', expectedVersion: latest.version,
});
},
);
test('cancelling deletion returns focus to the surviving CV action control without removing the CV', async () => {
mockedApi.get.mockImplementation(async (url) => ({ data: url === '/cv/variants' ? [existingCv] : themes }) as any);
renderPage();
+12 -4
View File
@@ -173,15 +173,23 @@ export default function CvBuilderPage() {
if (!active) return;
const current = variants.find((item) => item.id === id);
try {
const nextName = await promptForValue({ key: "cvDashboardRenameMessage" }, current?.name ?? "", { title: { key: "cvDashboardRenameCv" }, confirmLabel: { key: "cvDashboardRename" } });
if (!active() || !nextName?.trim() || nextName.trim() === current?.name) return;
const input = await promptForValue({ key: "cvDashboardRenameMessage" }, current?.name ?? "", { title: { key: "cvDashboardRenameCv" }, confirmLabel: { key: "cvDashboardRename" } });
const nextName = input?.trim();
if (!active() || !nextName || nextName === current?.name) return;
setPending(true);
const variant = await cvBuilderApi.get(id);
if (!active()) return;
const updated = await cvBuilderApi.save(id, { name: nextName.trim(), settings: variant.settings, source: "manual", expectedVersion: variant.version });
const renamedElsewhere = variant.name !== current?.name;
const updated = renamedElsewhere ? variant : await cvBuilderApi.save(id, {
name: nextName, settings: variant.settings, source: "manual", expectedVersion: variant.version,
});
if (!active()) return;
setVariants((items) => items.map((item) => item.id === id ? { ...item, name: updated.name, updatedAtUtc: updated.updatedAtUtc, version: updated.version } : item));
toast(localeRef.current("cvDashboardRenamed"), "success");
if (renamedElsewhere && updated.name !== nextName) {
setActionError({ key: "cvEditorConflict" });
} else {
toast(localeRef.current("cvDashboardRenamed"), "success");
}
} catch (err) { if (active()) setActionError({ error: err, key: "cvDashboardRenameFailed" }); }
finally { finishAction(active); }
};