Skip to content

fix: skip the conflict when closing the resource conflict modal - #3742

Merged
AlexAndBear merged 1 commit into
mainfrom
fix/upload-conflict-close
Oct 18, 2026
Merged

AlexAndBear merged 1 commit into
mainfrom
fix/upload-conflict-close

Conversation

@AlexAndBear

Copy link
Copy Markdown
Member

Description

  • Conflict dialog: closing it with X or Escape now counts as "Skip" instead of leaving the upload queued, so a later upload no longer silently overwrites the existing file.
  • Copy, move and restore: pressing Escape in their conflict dialog skips that item instead of leaving the whole operation hanging.

Related Issue

How Has This Been Tested?

  • test environment: unit tests (Vitest), browser tests (Playwright) against a local OpenCloud
  • test case 1: closing the conflict modal resolves the conflict as skip
  • test case 2: browser: X/Escape on upload, copy/cut/paste and trash restore conflicts skip only that item, the rest goes through

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)

@tammi-23 tammi-23 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we also fix this issue:

  1. A folder contains one.txt with content "SERVER".
  2. Upload a local one.txt (content "LOCAL"). The "File already exists" dialog opens.
  3. Leave the dialog open and drag another, unrelated file (e.g. other.txt) into the same folder.

Expected: only other.txt is uploaded; one.txt stays untouched until the dialog is answered.

Actual: one.txt is uploaded too and overwritten with "LOCAL", although the dialog is still asking.

@AlexAndBear

Copy link
Copy Markdown
Member Author

@tammi-23 Could you please open a separate issue for this? We will address it in a follow-up PR to avoid merge conflicts with other open PRs.

@tammi-23 tammi-23 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍 LGTM, opened a new Issue for the other issue.

@AlexAndBear
AlexAndBear merged commit 0b9d502 into main Oct 18, 2026
28 checks passed
@AlexAndBear
AlexAndBear deleted the fix/upload-conflict-close branch October 18, 2026 12:38
@openclouders openclouders mentioned this pull request Oct 18, 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

Development

Successfully merging this pull request may close these issues.

Closing the upload conflict dialog with X or Escape leaves the file queued; the next upload silently overwrites the existing file

2 participants