Skip to content

[stable28] fix: merge conflict dialog added when overwriting files on move-file action #43811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emoral435 merged 4 commits into from
Mar 9, 2024
Merged

[stable28] fix: merge conflict dialog added when overwriting files on move-file action #43811

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
650b609
fix: merge conflict dialog added when overwriting files on move-file …
emoral435 Feb 20, 2024
9d613d0
fix: conflict picker moves files correctly to its directory
emoral435 Feb 20, 2024
960bf24
feat: files update correctly on destination/current folder
emoral435 Feb 20, 2024
ed0ad08
chore: compile assets
emoral435 Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: merge conflict dialog added when overwriting files on move-file … 
…action

Signed-off-by: Eduardo Morales <emoral435@gmail.com>
  • Loading branch information
@emoral435
emoral435 committed Mar 9, 2024
commit 650b6090df347a76250e458e74991ec3522fd268
9 changes: 9 additions & 0 deletions apps/files/src/actions/moveOrCopyAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ 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 { openConflictPicker, hasConflict } from '@nextcloud/upload'
import Vue from 'vue'

import CopyIconSvg from '@mdi/svg/svg/folder-multiple.svg?raw'
import FolderMoveSvg from '@mdi/svg/svg/folder-move.svg?raw'

import { MoveCopyAction, canCopy, canMove, getQueue } from './moveOrCopyActionUtils'
import { getContents } from '../services/Files'
import logger from '../logger'
import { getUniqueName } from '../utils/fileUtils'

Expand Down Expand Up @@ -133,6 +135,13 @@ export const handleCopyMoveNodeTo = async (node: Node, destination: Folder, meth
emit('files:node:created', davResultToNode(data))
}
} else {
// show conflict file popup if we do not allow overwriting
if (!overwrite) {
const contents = await getContents(destinationPath)
if (hasConflict([node], contents.contents)) {
await openConflictPicker
}
}
await client.moveFile(currentPath, join(destinationPath, node.basename))
// Delete the node as it will be fetched again
// when navigating to the destination folder
Expand Down