v0.6.377: ask on a taken name: Replace, Keep both, Skip (#975) #1053

Merged
Cordy merged 21 commits from cf975 into main 2026-10-31 08:16:46 +00:00
Owner

Closes #975.

  • One Keep both numbering rule (strip a trailing " N", 2-999) shared by server, trash restore and the web planner (shared fixture).
  • REST rename/copy/upload and TUS take conflict fail|replace|keepBoth; 409 destination-exists carries the existing row; uploads use If-None-Match; X-Cairn-Path/X-Cairn-Renamed; one root rule (storage.KeepBothLimit).
  • Audit notes conflict/asked/replaced/surface on successful rename/copy/write; WebDAV Overwrite onto a file noted.
  • Web: conflict dialog (cards, reasons, apply to the others, Keep both first), all questions before anything is sent, late conflicts, one result line; merged with #835 move-out confirm (name question first, then confirm).
  • Docs: CHANGELOG v0.6.377, chart, handbook, VERSIONING.md, ARCHITECTURE.md.

Final whole-branch review: release-ready; final fixes merged; merged with v0.6.376.

Closes #975. - One Keep both numbering rule (strip a trailing " N", 2-999) shared by server, trash restore and the web planner (shared fixture). - REST rename/copy/upload and TUS take conflict fail|replace|keepBoth; 409 destination-exists carries the existing row; uploads use If-None-Match; X-Cairn-Path/X-Cairn-Renamed; one root rule (storage.KeepBothLimit). - Audit notes conflict/asked/replaced/surface on successful rename/copy/write; WebDAV Overwrite onto a file noted. - Web: conflict dialog (cards, reasons, apply to the others, Keep both first), all questions before anything is sent, late conflicts, one result line; merged with #835 move-out confirm (name question first, then confirm). - Docs: CHANGELOG v0.6.377, chart, handbook, VERSIONING.md, ARCHITECTURE.md. Final whole-branch review: release-ready; final fixes merged; merged with v0.6.376.
askConflict/cfDlgClose in ui:conflict975-dlg build one step of the native
#cfdlg dialog per spec 5.2; 29 keys of spec 6.1 after lockedBy (IT quotes
the button name «Sostituisci» in prose, as i18n-style requires); buildRow's
hold chip reads chipHold. a11y test conflict975dlg covers frames A to I,
narrow order, Esc/close, step announcement, axe (B1, B3, C1, I, dark).
cfFlow plans each move or copy batch against the destination listing (the
picker's pickLast, or one GET for a drop), asks every conflict before a
request is sent (askConflict, cfAnswer with "apply to the others"), sends
one rename or copy per item with its conflict mode (fail for free names),
handles a late 409 once in the single form, says one result line
(cfSummary) and returns focus. Uploads plan against currentItems, ask
before a byte is sent, then run the #804 quota check on the files really
sent; small uploads carry &conflict=, TUS carries it in Upload-Metadata
and X-Cairn-Conflict and answers {path, renamed}; tusDrop ends an upload
after Skip or Stop. The picker shows #pickdlg-hint; moveOutRetry resends
with the same conflict; AUD_NOTE_VERBS shows rename/copy/write notes;
copySamePlace is retired.

Existing tests changed (they asserted the old code shape):
- destexists926: the move flows now run through cfFlow; the api() message
  is kept by cfRun and said by cfSummary after moveFailed.
- devices897c: devAffSay follows cfFlow's result line, for the items that
  really moved; the drop passes the dragged row.
- fix897b: pickRender keeps pickLast and fills the hint (rig gains both).
- pickdlg: the flows pass the same items to cfFlow; the picker calls are
  counted instead of every "items: [it]".
- qa804: the room check runs after the questions on the files really
  sent, before cfRun.
- tus742: uploadFiles plans with the conflict planner; the S2 rig gains
  the planner block and stubs for the dialog helpers.
Merge branch 'lf835' into cf975-mg: #975 conflict prompt with #835 links follow their file
All checks were successful
ci / test-and-build (pull_request) Successful in 33m15s
120ffa6d45
Conflicts resolved so both work:
- CHANGELOG v0.6.377 above v0.6.376 above v0.6.375; chart appVersion v0.6.377.
- api rename: #975 conflict modes, moveAnswer and 409 existing, plus the
  #835 409 personal-share-move-out; a taken name answers destination-exists
  before the move-out question.
- web: moveOutRetry(first, from, to, name, extra, out) takes the conflict
  answer (resent with endShares) and reports a cancel kept in Personal;
  cfSendOne marks the job, cfRun collects res.kept, cfSummary heads the
  line with movedKeptKey (#835 B1) in place of the old bulk helper;
  Create space from selection sends the planner's conflict with endShares.
- docs: ARCHITECTURE, file-browser, sharing describe the order (name
  question, then the move-out confirm) and a replace as a new version.
- tests: devices897c and linksfollow835files adapted to cfFlow; new
  conflict975personal835.test.js and TestRenameConflictThenPersonalMoveOut.
Cordy merged commit 3b2babfadc into main 2026-10-31 08:16:46 +00:00
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Cordy/Cairn#1053
No description provided.