fix: stop file actions when conflict dialog skipped

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
nextcloud · Jul 16, 2024 · 3ebfe95 · 3ebfe95
1 parent 70dd8d5
commit 3ebfe95
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts
@@ -128,11 +128,8 @@ export const handleCopyMoveNodeTo = async (node: Node, destination: Folder, meth
 					try {
 						// Let the user choose what to do with the conflicting files
 						const { selected, renamed } = await openConflictPicker(destination.path, [node], otherNodes.contents)
-						// if the user selected to keep the old file, and did not select the new file
-						// that means they opted to delete the current node
+						// two empty arrays: either only old files or conflict skipped -> no action required
 						if (!selected.length && !renamed.length) {
-							await client.deleteFile(currentPath)
-							emit('files:node:deleted', node)
 							return
 						}
 					} catch (error) {

diff --git a/dist/files-init.js b/dist/files-init.js
diff --git a/dist/files-init.js.map b/dist/files-init.js.map
diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map