Merge pull request #60615 from nextcloud/fix/move-notes

[stable32] fix(files): show proper information when a move will override the target

Author: susnux

apps/files/src/actions/moveOrCopyAction.ts

@@ -136,7 +136,7 @@ export async function * handleCopyMoveNodesTo(nodes: INode[], destination: IFold
 			if (method === MoveCopyAction.MOVE) {
 				// Let the user choose what to do with the conflicting files
 				const content = otherNodes.filter((n) => conflicts.some((c) => c.basename === n.basename))
-				const result = await openConflictPicker(destination.path, conflicts, content)
+				const result = await openConflictPicker(destination.path, conflicts, content, { overwriting: true })
 				if (!result) {
 					// User cancelled
 					return

core/css/server.css

@@ -26,7 +26,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.1.0
 	- license: GPL-3.0-or-later
 - @nextcloud/vue
-	- version: 8.38.0
+	- version: 8.39.0
 	- license: AGPL-3.0-or-later
 - @vueuse/core
 	- version: 11.3.0

core/css/server.css.map

@@ -58,43 +58,43 @@ This file is generated from multiple sources. Included packages:
 	- version: 4.0.0
 	- license: AGPL-3.0-or-later
 - @nextcloud/paths
-	- version: 3.0.0
+	- version: 3.1.0
 	- license: GPL-3.0-or-later
 - @nextcloud/vue
-	- version: 9.5.0
+	- version: 9.8.0
 	- license: AGPL-3.0-or-later
 - @vue/devtools-shared
-	- version: 8.0.6
+	- version: 8.1.2
 	- license: MIT
 - @vueuse/core
-	- version: 14.2.1
+	- version: 14.3.0
 	- license: MIT
 - @vueuse/shared
-	- version: 14.2.1
+	- version: 14.3.0
 	- license: MIT
 - focus-trap
-	- version: 8.0.0
+	- version: 8.2.1
 	- license: MIT
 - perfect-debounce
 	- version: 2.1.0
 	- license: MIT
 - @vue/devtools-api
-	- version: 8.0.6
+	- version: 8.1.2
 	- license: MIT
 - @vue/devtools-kit
-	- version: 8.0.6
+	- version: 8.1.2
 	- license: MIT
 - vue-router
-	- version: 5.0.2
+	- version: 5.0.7
 	- license: MIT
 - vue
-	- version: 3.5.28
+	- version: 3.5.34
 	- license: MIT
 - @nextcloud/dialogs
-	- version: 7.3.0
+	- version: 7.4.0
 	- license: AGPL-3.0-or-later
 - semver
-	- version: 7.7.2
+	- version: 7.8.0
 	- license: ISC
 - @nextcloud/event-bus
 	- version: 3.3.3
@@ -112,16 +112,16 @@ This file is generated from multiple sources. Included packages:
 	- version: 3.1.0
 	- license: GPL-3.0-or-later
 - @vue/reactivity
-	- version: 3.5.28
+	- version: 3.5.34
 	- license: MIT
 - @vue/runtime-core
-	- version: 3.5.28
+	- version: 3.5.34
 	- license: MIT
 - @vue/runtime-dom
-	- version: 3.5.28
+	- version: 3.5.34
 	- license: MIT
 - @vue/shared
-	- version: 3.5.28
+	- version: 3.5.34
 	- license: MIT
 - base64-js
 	- version: 1.5.1

dist/1023-1023.js.license

@@ -0,0 +1 @@
+1217-1217.js.license