Repository navigation
fix: keep upload batch out of uppy while the conflict dialog is open - #4140
Merged
Merged
Conversation
JammingBen
force-pushed
the
fix/upload-conflict-dialog-concurrent-upload
branch
2 times, most recently
from
November 2, 2026 14:28
4bd990c to
50ccb51
Compare
JammingBen
changed the title
JammingBen
force-pushed
the
fix/upload-conflict-dialog-concurrent-upload
branch
from
November 2, 2026 14:39
50ccb51 to
8eed3ac
Compare
JammingBen
force-pushed
the
fix/upload-conflict-dialog-concurrent-upload
branch
from
November 2, 2026 14:52
8eed3ac to
4fe9b73
Compare
JammingBen
marked this pull request as ready for review
November 2, 2026 15:04
AlexAndBear
approved these changes
Nov 4, 2026
Member
|
Can we create an issue for the planned follow-up, so it doesn't get lost? |
Member
Author
I created #4263 for this. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
While the upload conflict dialog was open, any other upload (e.g. a dropped file) called
uppy.upload(), which uploads every file in Uppy's state, including the unresolved conflicting ones. This overwrote existing files without the user choosing to.Closing the conflict dialog without answering it now drops the whole batch instead of leaving it pending. Previously the
web-app-importerclosed whichever modal was on top whenever any batch was added for upload, which would have dropped the batch whose conflict dialog it closed; that is fixed in opencloud-eu/web-extensions#657.Known limitation: after the dialog is answered, the batch still awaits vault encryption and folder creation before its upload starts. An upload started in that window can still pick up the batch's files early. This was already the case before and is not caused by the conflict dialog, so it's left for a follow-up. See #4263.
Related Issue