Simplify the file conflict dialog - #2540
Open
jancborchardt wants to merge 1 commit into
Open
Conversation
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Jan C. Borchardt <925062+jancborchardt@users.noreply.github.com>
jancborchardt
added
enhancement
1 task
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2540 +/- ##
=======================================
Coverage 43.79% 43.79%
=======================================
Files 15 15
Lines 427 427
Branches 82 81 -1
=======================================
Hits 187 187
Misses 211 211
Partials 29 29 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
susnux
reviewed
Jul 31, 2026
| @@ -0,0 +1,142 @@ | |||
| <!-- | |||
| - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors | |||
Contributor
There was a problem hiding this comment.
Suggested change
| - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors | |
| - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors |
| {{ t('If you select both versions, the incoming file will have a number added to its name.') }}<br> | ||
| {{ descriptionParts.before }}<strong>{{ folderName }}</strong>{{ descriptionParts.after }}<br> | ||
| <template v-if="!isSingle"> | ||
| {{ t('Files and folders not selected will be deleted. If both are chosen, they will be renamed.') }}<br> |
Contributor
There was a problem hiding this comment.
This is a bit confusing, what does "will be deleted" mean?
In which case are files deleted?
| * Single-file mode: render the two versions without checkboxes. | ||
| * The parent then offers "Keep both"/"Replace" buttons instead. | ||
| */ | ||
| single?: boolean |
Contributor
There was a problem hiding this comment.
in the other file its called isSingle maybe use it consistently (isSingle)
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
2 participants
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.
Same as nextcloud-libraries/nextcloud-upload#2151
Our current file conflict dialog (when you upload the same file again) immediately jumps into a very complex "pick files" view.
Based on a mockup by @kra-mo and some discussions.
The improvements:
We could probably simplify the wording even more for the multiple files case, but this PR is also quite big already. :)
Mockup by @kra-mo for reference
🤖 AI (if applicable)