stop file actions when conflict dialog skipped

[grnd-alt]

• Resolves: [Bug]: Duplicate File/folder names delete file when moving #45548

Summary

relies on: nextcloud-libraries/nextcloud-upload#1270

Checklist

• Code is properly formatted
• Sign-off message is added to all commits
• Tests (unit, integration, api and/or acceptance) are included
• Screenshots before/after for front-end changes
• Documentation (manuals or wiki) has been updated or is not required
• Backports requested where applicable (ex: critical bugfixes)

did not read the other PR first

[skjnldsv]

I see the point, but looking a the PR that introduced that issue: #43667,

If the conflict dialog returns two empty arrays, selected and renamed, that means the user chose to keep the file already in the directory path, thereby choosing to delete the current selected file they want to move

I actually don't understand this anymore.
Is this really the outcome we want, if someone didn't pick the old NOR the new, that means we want to delete the source file? I'm far from certain 🤔

[grnd-alt]

I see the point, but looking a the PR that introduced that issue: #43667,

If the conflict dialog returns two empty arrays, selected and renamed, that means the user chose to keep the file already in the directory path, thereby choosing to delete the current selected file they want to move

I actually don't understand this anymore. Is this really the outcome we want, if someone didn't pick the old NOR the new, that means we want to delete the source file? I'm far from certain 🤔

@skjnldsv
I've wondered about that behavior as well. Having both arrays (selected and renamed) empty actually does not mean no file has been selected but that only the existing file has been selected (the one on the right). Without this PR, skipping files caused the same result as selecting only existing files, now we have different cases for each. But i don't know if it's expected behavior to delete files when it's selected to keep only the existing, or if that should mean the same as skipping(keeping both)

[susnux]

From my understanding

N = Selected new ones
O = Selected old ones

Renamed = (n e N) in O
Selected = (n e N) not in O

So if you have upload (files to upload) and existing (all files that are already existing) and resolve using the conflict picker, then you have:

• upload
• existing
• renamed (from the submit event)
• selected (from the submit event)

So now we have two simple tasks

1. Handle selected
   1. delete from existing if it is in selected
   2. upload (or move) all selected
2. upload all renamed with their new name (or move with new name)

But now we also have all files not in renamed and not in selected, meaning those files where we selected to keep the old one.

• For upload this is basically a "skip uploading file"
• For moving I think it should also just cancel (skip) that file, this is how the file managers on Linux / Windows work.

So what do two empty arrays mean?
All old files where selected -> I would say we should simply skip the moving in those cases.

[susnux]

TLDR:

Files not in renamed and not inselected are marked for "use the old one" -> File managers on Linux / Windows will just cancel the move and (my opinion) we should also just cancel the move operation for those files.

[susnux]

Was also the suggested solution by designers.

[welcome]

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

[grnd-alt]

/backport to stable28

[grnd-alt]

/backport to stable29