Skip to content

fix: handle name clashes inside a move or copy batch and cancel on closing the conflict dialog - #4355

Merged
AlexAndBear merged 4 commits into
mainfrom
fix/batch-transfer-same-name
Nov 9, 2026
Merged

AlexAndBear merged 4 commits into
mainfrom
fix/batch-transfer-same-name

Conversation

@AlexAndBear

@AlexAndBear AlexAndBear commented Nov 7, 2026 •

Copy link
Copy Markdown
Member

Description

  • Same names in one batch: moving or copying same-named items from different folders in one go now asks like any other conflict (Keep both or Skip) instead of silently keeping only one of them.
  • Closing the conflict dialog: closing it (close button or Escape) now cancels the whole move, copy, upload or restore, nothing is transferred. Skip stays its own button. The move/copy/restore dialog now shows the close button too, so it can be cancelled on touch devices.

Related Issue

How Has This Been Tested?

  • test environment: unit tests (Vitest), browser tests (Playwright) against a local OpenCloud
  • test case 1: unit: in-batch clashes for move and copy (files, folders, 3+ items, existing "(1)" names, items already in the target, every answer combination incl. apply to all, unique target paths), cancel at the first and later dialogs for move/copy/paste/drop/upload/restore
  • test case 2: browser: reproduced both bugs on main, then on the fix: Move to / Copy to / paste from Favorites and search with same-named files and folders, combined with existing conflicts, close button and Escape cancel for move/copy/paste/drag and drop/upload/restore, regression checks (cross-space, same-folder copy, move into itself), Pixel 7 (English and German)

Types of changes

  • Bugfix
  • Enhancement (a change that doesn't break existing code or deployments)
  • Breaking change (a modification that affects current functionality)
  • Technical debt (addressing code that needs refactoring or improvements)
  • Tests (adding or improving tests)
  • Documentation (updates or additions to documentation)
  • Maintenance (like dependency updates or tooling adjustments)

@AlexAndBear
AlexAndBear force-pushed the fix/batch-transfer-same-name branch from d798ef7 to e0bccbf Compare November 9, 2026 11:23
@AlexAndBear
AlexAndBear merged commit 0dc6b0f into main Nov 9, 2026
28 checks passed
@AlexAndBear
AlexAndBear deleted the fix/batch-transfer-same-name branch November 9, 2026 12:36
@openclouders openclouders mentioned this pull request Nov 9, 2026
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

2 participants