From fb87dc331bdd00355511b7526bead74b783ec43a Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Fri, 13 Sep 2024 17:31:25 -0700 Subject: [PATCH] chore(files): Provide old node on moved Signed-off-by: Christopher Ng --- apps/files/src/components/FileEntry/FileEntryName.vue | 6 +++--- apps/files/src/eventbus.d.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files/src/components/FileEntry/FileEntryName.vue b/apps/files/src/components/FileEntry/FileEntryName.vue index cf425127282..91cc751f46a 100644 --- a/apps/files/src/components/FileEntry/FileEntryName.vue +++ b/apps/files/src/components/FileEntry/FileEntryName.vue @@ -46,7 +46,6 @@ import { showError, showSuccess } from '@nextcloud/dialogs' import { emit } from '@nextcloud/event-bus' import { FileType, NodeStatus } from '@nextcloud/files' import { translate as t } from '@nextcloud/l10n' -import { dirname } from '@nextcloud/paths' import { defineComponent, inject } from 'vue' import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js' @@ -244,6 +243,7 @@ export default defineComponent({ return } + const oldNode = this.source.clone() const oldName = this.source.basename const oldEncodedSource = this.source.encodedSource if (oldName === newName) { @@ -272,8 +272,8 @@ export default defineComponent({ emit('files:node:updated', this.source) emit('files:node:renamed', this.source) emit('files:node:moved', { - node: this.source, - oldSource: `${dirname(this.source.source)}/${oldName}`, + newNode: this.source, + oldNode, }) showSuccess(t('files', 'Renamed "{oldName}" to "{newName}"', { oldName, newName })) diff --git a/apps/files/src/eventbus.d.ts b/apps/files/src/eventbus.d.ts index e1fd8c73b4b..33779b11a96 100644 --- a/apps/files/src/eventbus.d.ts +++ b/apps/files/src/eventbus.d.ts @@ -16,7 +16,7 @@ declare module '@nextcloud/event-bus' { 'files:node:deleted': Node 'files:node:updated': Node 'files:node:renamed': Node - 'files:node:moved': { node: Node, oldSource: string } + 'files:node:moved': { newNode: Node, oldNode: Node } 'files:filter:added': IFileListFilter 'files:filter:removed': string