From 2c06e7ac2b84065e71410a1feb49deae829b4037 Mon Sep 17 00:00:00 2001 From: Alberto Balbo Date: Tue, 17 Nov 2026 19:20:30 +0100 Subject: [PATCH] fix(copies): close the fourth verification round of owner review 6 The fourth verification round of the matches work found 18 defects in the merge, Integrate and Matches surfaces. This commit fixes them: - An Integrate job now carries the planning account's id, so its re-plan decides ownership the way the dialog did. - A merge skips only a project the kept sequence holds a real copy of (name, offset head and history content) and re-points its renders to that copy. - A merge runs its trash checks before the Links stage and records an undo, so an abandoned merge gives the other sequence back its link, session keys and pairs. - The metered hold adopts automatic transfers that were paused before a restart. - Apply in the Compare dialog re-plans when the plan is pending or stale. - The Library's Two versions... lists the second versions a Union merge leaves, each with Drop... (dry run, confirmation, verified partner). A merge job's Open shows that list. - The merge's typed confirmation is the invariant count, and the prompt names it in all 38 languages. - Italian text uses Principale and Gemello. The Main project is named through WorkspaceText in the Projects part and in the twin tooltip. - The session keys tooltip is split into two keys, and To trash... and Delete on server... say why they are disabled. - The capture restores the editor account before the Matches scenes. - Upload again follows SyncHost.CanSendSync (Upload with Edit). - Matches rows trim archive names in the middle on a rebalanced grid; the Projects part rows trim, with the full text in the tooltip. - The sample project targets use ProjectTransplant.FreeName. DECISIONS, CHANGELOG, STATUS 8.7, the request doc and the 16 changed capture baselines are updated. Refs #73 Co-Authored-By: Claude Opus 5.5 --- docs/CHANGELOG.md | 22 +- docs/DECISIONS.md | 11 +- docs/STATUS.md | 2 +- docs/requests/2026-11-16-owner-review-6.md | 4 +- i18n/GLOSSARY.md | 2 +- i18n/ar/Library.ar.resx | 5 + i18n/ar/Server.ar.resx | 2 +- i18n/ar/Tooltips.ar.resx | 6 +- i18n/bg/Library.bg.resx | 5 + i18n/bg/Server.bg.resx | 2 +- i18n/bg/Tooltips.bg.resx | 6 +- i18n/cs/Library.cs.resx | 5 + i18n/cs/Server.cs.resx | 2 +- i18n/cs/Tooltips.cs.resx | 6 +- i18n/da/Library.da.resx | 5 + i18n/da/Server.da.resx | 2 +- i18n/da/Tooltips.da.resx | 6 +- i18n/de/Library.de.resx | 5 + i18n/de/Server.de.resx | 2 +- i18n/de/Tooltips.de.resx | 6 +- i18n/el/Library.el.resx | 5 + i18n/el/Server.el.resx | 2 +- i18n/el/Tooltips.el.resx | 6 +- i18n/en/Library.resx | 5 + i18n/en/Server.resx | 2 +- i18n/en/Tooltips.resx | 6 +- i18n/es/Library.es.resx | 5 + i18n/es/Server.es.resx | 2 +- i18n/es/Tooltips.es.resx | 6 +- i18n/et/Library.et.resx | 5 + i18n/et/Server.et.resx | 2 +- i18n/et/Tooltips.et.resx | 6 +- i18n/fi/Library.fi.resx | 5 + i18n/fi/Server.fi.resx | 2 +- i18n/fi/Tooltips.fi.resx | 6 +- i18n/fr/Library.fr.resx | 5 + i18n/fr/Server.fr.resx | 2 +- i18n/fr/Tooltips.fr.resx | 6 +- i18n/he/Library.he.resx | 5 + i18n/he/Server.he.resx | 2 +- i18n/he/Tooltips.he.resx | 6 +- i18n/hi/Library.hi.resx | 5 + i18n/hi/Server.hi.resx | 2 +- i18n/hi/Tooltips.hi.resx | 6 +- i18n/hr/Library.hr.resx | 5 + i18n/hr/Server.hr.resx | 2 +- i18n/hr/Tooltips.hr.resx | 6 +- i18n/hu/Library.hu.resx | 5 + i18n/hu/Server.hu.resx | 2 +- i18n/hu/Tooltips.hu.resx | 6 +- i18n/id/Library.id.resx | 5 + i18n/id/Server.id.resx | 2 +- i18n/id/Tooltips.id.resx | 6 +- i18n/it/Editor.it.resx | 2 +- i18n/it/Library.it.resx | 5 + i18n/it/Server.it.resx | 2 +- i18n/it/Tooltips.it.resx | 12 +- i18n/ja/Library.ja.resx | 5 + i18n/ja/Server.ja.resx | 2 +- i18n/ja/Tooltips.ja.resx | 6 +- i18n/ko/Library.ko.resx | 5 + i18n/ko/Server.ko.resx | 2 +- i18n/ko/Tooltips.ko.resx | 6 +- i18n/lt/Library.lt.resx | 5 + i18n/lt/Server.lt.resx | 2 +- i18n/lt/Tooltips.lt.resx | 6 +- i18n/lv/Library.lv.resx | 5 + i18n/lv/Server.lv.resx | 2 +- i18n/lv/Tooltips.lv.resx | 6 +- i18n/ms/Library.ms.resx | 5 + i18n/ms/Server.ms.resx | 2 +- i18n/ms/Tooltips.ms.resx | 6 +- i18n/nb/Library.nb.resx | 5 + i18n/nb/Server.nb.resx | 2 +- i18n/nb/Tooltips.nb.resx | 6 +- i18n/nl/Library.nl.resx | 5 + i18n/nl/Server.nl.resx | 2 +- i18n/nl/Tooltips.nl.resx | 6 +- i18n/pl/Library.pl.resx | 5 + i18n/pl/Server.pl.resx | 2 +- i18n/pl/Tooltips.pl.resx | 6 +- i18n/pt-BR/Library.pt-BR.resx | 5 + i18n/pt-BR/Server.pt-BR.resx | 2 +- i18n/pt-BR/Tooltips.pt-BR.resx | 6 +- i18n/pt-PT/Library.pt-PT.resx | 5 + i18n/pt-PT/Server.pt-PT.resx | 2 +- i18n/pt-PT/Tooltips.pt-PT.resx | 6 +- i18n/ro/Library.ro.resx | 5 + i18n/ro/Server.ro.resx | 2 +- i18n/ro/Tooltips.ro.resx | 6 +- i18n/ru/Library.ru.resx | 5 + i18n/ru/Server.ru.resx | 2 +- i18n/ru/Tooltips.ru.resx | 6 +- i18n/sk/Library.sk.resx | 5 + i18n/sk/Server.sk.resx | 2 +- i18n/sk/Tooltips.sk.resx | 6 +- i18n/sl/Library.sl.resx | 5 + i18n/sl/Server.sl.resx | 2 +- i18n/sl/Tooltips.sl.resx | 6 +- i18n/sv/Library.sv.resx | 5 + i18n/sv/Server.sv.resx | 2 +- i18n/sv/Tooltips.sv.resx | 6 +- i18n/th/Library.th.resx | 5 + i18n/th/Server.th.resx | 2 +- i18n/th/Tooltips.th.resx | 6 +- i18n/tr/Library.tr.resx | 5 + i18n/tr/Server.tr.resx | 2 +- i18n/tr/Tooltips.tr.resx | 6 +- i18n/uk/Library.uk.resx | 5 + i18n/uk/Server.uk.resx | 2 +- i18n/uk/Tooltips.uk.resx | 6 +- i18n/vi/Library.vi.resx | 5 + i18n/vi/Server.vi.resx | 2 +- i18n/vi/Tooltips.vi.resx | 6 +- i18n/zh-Hans/Library.zh-Hans.resx | 5 + i18n/zh-Hans/Server.zh-Hans.resx | 2 +- i18n/zh-Hans/Tooltips.zh-Hans.resx | 6 +- i18n/zh-Hant/Library.zh-Hant.resx | 5 + i18n/zh-Hant/Server.zh-Hant.resx | 2 +- i18n/zh-Hant/Tooltips.zh-Hant.resx | 6 +- src/Chronos.App/DesignTime/SampleCopies.cs | 25 +- src/Chronos.App/DesignTime/SampleData.cs | 12 +- src/Chronos.App/Infrastructure/AppServices.cs | 2 +- .../Library/VersionsDialogViewModel.cs | 151 ++++++++++++ src/Chronos.App/Sections/JobsViewModel.cs | 13 +- src/Chronos.App/Sections/LibraryView.xaml | 67 +++++- src/Chronos.App/Sections/LibraryViewModel.cs | 16 ++ src/Chronos.App/Sections/ServerView.xaml | 20 +- .../Server/Copies/CopyDialogViewModel.cs | 63 ++++- .../Server/Copies/CopyDialogs.xaml | 51 ++-- .../Server/Copies/CopyListViewModel.cs | 2 +- .../Server/Copies/CopyProjectRow.cs | 10 +- src/Chronos.App/Server/Copies/CopyRow.cs | 9 +- src/Chronos.App/Server/Copies/CopyText.cs | 22 +- src/Chronos.App/Server/SyncHost.cs | 9 + src/Chronos.App/Server/SyncTableViewModel.cs | 2 +- src/Chronos.App/Server/UploadHold.cs | 38 ++- src/Chronos.App/Shell/ScreenCapture.cs | 2 + .../Workspace/WorkspaceProjectItem.cs | 7 +- .../Archiving/Jobs/MergeJobHandler.cs | 220 +++++++++++++++--- src/Chronos.Data/Archiving/MergeJournal.cs | 12 + src/Chronos.Data/Archiving/SequenceMerger.cs | 77 ++++-- src/Chronos.Data/Copies/CopyEngine.cs | 40 ++++ src/Chronos.Data/Copies/CopyJobs.cs | 9 +- src/Chronos.Data/Copies/CopyModel.cs | 9 + src/Chronos.Data/Copies/CopyPlans.cs | 9 + src/Chronos.Data/Copies/CopySides.cs | 17 +- src/Chronos.Data/Copies/FoundCopyStore.cs | 63 +++++ src/Chronos.Data/Copies/ICopyEngine.cs | 9 + .../Server/CopyScreenSmokeTests.cs | 13 +- .../Chronos.App.Tests/Server/CopyTextTests.cs | 46 ++++ .../Server/UploadHoldTests.cs | 40 ++++ .../Archiving/SequenceMergerTests.cs | 101 ++++++++ .../Copies/CopyEngineTests.cs | 26 +++ .../Copies/IntegrateTests.cs | 54 +++++ .../baselines/server-copies-confirm-dark.png | Bin 15429 -> 15700 bytes .../baselines/server-copies-confirm-light.png | Bin 14448 -> 14817 bytes tests/visual/baselines/server-copies-dark.png | Bin 79743 -> 80170 bytes .../baselines/server-copies-empty-dark.png | Bin 61609 -> 61739 bytes .../baselines/server-copies-empty-light.png | Bin 57244 -> 57314 bytes .../baselines/server-copies-gone-dark.png | Bin 61874 -> 60977 bytes .../baselines/server-copies-gone-light.png | Bin 57382 -> 56690 bytes .../visual/baselines/server-copies-light.png | Bin 75242 -> 75607 bytes .../baselines/server-copies-projects-dark.png | Bin 76004 -> 78064 bytes .../server-copies-projects-light.png | Bin 75792 -> 78406 bytes .../server-copies-signedout-dark.png | Bin 48133 -> 48627 bytes .../server-copies-signedout-light.png | Bin 45476 -> 45889 bytes .../baselines/server-copies-toast-dark.png | Bin 83949 -> 84424 bytes .../baselines/server-copies-toast-light.png | Bin 80142 -> 80507 bytes .../baselines/server-sync-copyfound-dark.png | Bin 83691 -> 85475 bytes .../baselines/server-sync-copyfound-light.png | Bin 77454 -> 78908 bytes 171 files changed, 1591 insertions(+), 218 deletions(-) create mode 100644 src/Chronos.App/Library/VersionsDialogViewModel.cs diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 31700569..a9898e13 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -92,8 +92,9 @@ match. A 1.1 server works as before, without Integrate; a 1.2 server adds the ph an unhashed photo that turns out different is kept as a second version instead of going to the trash. - Before comparing, a merge hashes the other sequence's unhashed photos that match nothing, so different photos with the same size and time are no longer taken for copies. - - A merge plan lists "Deleted in the other · n" and names the servers it relinks; a merge's second versions stay - discoverable in the kept sequence after the pair is gone. + - A merge plan lists "Deleted in the other · n" and names the servers it relinks; a merge's second versions are + listed from the Library (*Two versions…* on a card's menu, and a merge job's Open), each with *Drop…*: a dry run, + a confirmation naming the version that stays, then the archive trash while the other version is still verified. - The Merge and Integrate plans' block lines name the right sequence, archive, server and space; "already linked" names the server. - An Integrate retried after a failure before its first stage runs again instead of refusing. @@ -146,6 +147,23 @@ match. A 1.1 server works as before, without Integrate; a 1.2 server adds the ph name the lists they head; a merge reads Kept and Other from the start; the Projects part shows where each project goes as soon as it opens. Matches: the This side and Other side columns take the room the actions leave. - The Edit picker's Twin chip sits right after the project name. + - An Integrate started by a sequence's owner who is not an admin runs the plan the dialog showed instead of refusing + it as changed. + - A merge copies a project of the other sequence that only shares its head with a kept project, renders included; + one already copied is skipped and its renders name the copy. + - A merge abandoned at its trash checks (work since the plan, unsent work, a stop) leaves the other sequence its link, + session keys and pairs. + - New photos of an integrated pair paused on a metered connection resume after a restart once it is not metered. + - Apply in the Compare dialog plans again when the choices changed in the last moment, so it never confirms the + previous plan. + - The merge confirmation asks for the photo count without separators and says it in the prompt. + - The session keys line's tooltip no longer shows "{0}"; To trash… and Delete on server… say to select photos first. + - Italian: the Main project reads *Principale* in the match tooltips and the Projects part, the twin chip *Gemello*; + the Edit picker's twin tooltip names the other home's Main in the UI language. + - Matches: long archive names are cut in their middle with the whole name in the tooltip; the Projects part trims long + names and shows the whole row in its tooltip. + - Upload again on a match is enabled only for an account that may send sequences (Upload and Edit), as in the sync + table. ## [1.1.1] — 2026-11-16 diff --git a/docs/DECISIONS.md b/docs/DECISIONS.md index 70fe6b8f..d42a4144 100644 --- a/docs/DECISIONS.md +++ b/docs/DECISIONS.md @@ -960,7 +960,7 @@ One line per decision: date · decision · alternative · reason. | 2026-11-17 | A Corrupt or Missing frame on this PC whose photo the server holds is repaired by an Integrate through the ordinary fetch: the plan lists it as a Fetch (the comparison leaves unusable frames out), and the ingest replaces the damaged holder in place, the old file moved aside as `.damaged-