upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

feat: files update correctly on destination/current folder

Browse source 
Signed-off-by: Eduardo Morales <emoral435@gmail.com>
This commit is contained in:
Eduardo Morales 2024-02-20 11:19:48 -06:00
parent 67b0c7ce14
commit f168187dc9
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/files/src/actions/moveOrCopyAction.ts
View file

@ -32,7 +32,7 @@ import { emit } from '@nextcloud/event-bus'
import { FilePickerClosed, getFilePickerBuilder, showError } from '@nextcloud/dialogs'
import { Permission, FileAction, FileType, NodeStatus, davGetClient, davRootPath, davResultToNode, davGetDefaultPropfind } from '@nextcloud/files'
import { translate as t } from '@nextcloud/l10n'
import { getUploader, openConflictPicker, hasConflict } from '@nextcloud/upload'
import { openConflictPicker, hasConflict } from '@nextcloud/upload'
import Vue from 'vue'
import CopyIconSvg from '@mdi/svg/svg/folder-multiple.svg?raw'
@ -136,34 +136,27 @@ export const handleCopyMoveNodeTo = async (node: Node, destination: Folder, meth
}
} else {
// show conflict file popup if we do not allow overwriting
logger.debug("NO CONFLICTS SHOULD BE FOUND11")
const otherNodes = await getContents(destination.path)
logger.debug("NO CONFLICTS SHOULD BE FOUND2")
let files: (Node|File)[] = [node]
if (hasConflict([node], otherNodes.contents)) {
const conflicts = otherNodes.contents.filter((otherNode: Node) => {
return otherNode.basename === node.basename
}).filter(Boolean) as Node[]
const uploads = otherNodes.contents.filter((otherNode: Node) => {
return !conflicts.includes(otherNode)
})
try {
// Let the user choose what to do with the conflicting files
const { selected, renamed } = await openConflictPicker(destination.path, conflicts, otherNodes.contents)
files = [...uploads, ...selected, ...renamed]
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
if (!selected.length && !renamed.length) {
await client.deleteFile(currentPath)
emit('files:node:deleted', node)
return
}
} catch (error) {
// User cancelled
showError(t('files','Upload cancelled'))
showError(t('files','Move cancelled'))
return
}
}
logger.debug("NO CONFLICTS SHOULD BE FOUND")
// getting here means either no conflict, file was renamed to keep both files
// in a conflict, or the selected file was chosen to be kept during the conflict
await client.moveFile(currentPath, join(destinationPath, node.basename))
logger.debug("FINALLY DELETE THE NODE")
// Delete the node as it will be fetched again
// when navigating to the destination folder
emit('files:node:deleted', node)