Skip to content

fix(files): improve handling of copy-move action#57993

Merged
susnux merged 2 commits intomasterfrom
fix/copy-move
Feb 6, 2026
Merged

fix(files): improve handling of copy-move action#57993
susnux merged 2 commits intomasterfrom
fix/copy-move

Conversation

@susnux
Copy link
Contributor

@susnux susnux commented Feb 2, 2026

Summary

  1. only show 1 loading toast instead of N for N files in batch operation.
  2. Reuse more code to reduce duplicated logic.
  3. Show the conflict picker once for all files instead of opening a new conflict picker for every file to copy / move.

Checklist

@susnux susnux requested review from a team and skjnldsv as code owners February 2, 2026 12:26
@susnux susnux requested review from nfebe and sorbaugh and removed request for a team February 2, 2026 12:26
@susnux susnux added bug 3. to review Waiting for reviews labels Feb 2, 2026
@susnux susnux added this to the Nextcloud 34 milestone Feb 2, 2026
@susnux
Copy link
Contributor Author

susnux commented Feb 2, 2026

/backport to stable33

Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@susnux
Copy link
Contributor Author

susnux commented Feb 2, 2026

/compile

1. only show 1 loading toast instead of N for N files in batch
   operation.
2. Reuse more code to reduce duplicated logic.
3. Show the conflict picker once for all files instead of opening a new
   conflict picker for every file to copy / move.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux susnux merged commit f26d329 into master Feb 6, 2026
136 of 139 checks passed
@susnux susnux deleted the fix/copy-move branch February 6, 2026 00:16
@szaimen
Copy link
Contributor

szaimen commented Feb 6, 2026

/backport to stable33

@szaimen
Copy link
Contributor

szaimen commented Feb 6, 2026

/backport to stable32

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: confilct handling in web UI is fundamentally broken

3 participants