From 52039ea152c4abad04bb89b32783a411ac2dc063 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Wed, 17 Apr 2024 17:03:44 +0200
Subject: [PATCH] fix(files): Update current fileid in route if that node was
 deleted

We do not change the view to the trash bin but stay in the current view,
so we need to update the current fileid on the route if that was deleted.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 apps/files/src/actions/deleteAction.ts |  5 ++--
 apps/files/src/store/paths.ts          |  2 +-
 apps/files/src/views/FilesList.vue     | 36 ++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/apps/files/src/actions/deleteAction.ts b/apps/files/src/actions/deleteAction.ts
index 458cfd05eef..f98dded714e 100644
--- a/apps/files/src/actions/deleteAction.ts
+++ b/apps/files/src/actions/deleteAction.ts
@@ -143,14 +143,15 @@ export const action = new FileAction({
 			.every(permission => (permission & Permission.DELETE) !== 0)
 	},
 
-	async exec(node: Node) {
+	async exec(node: Node, view: View, dir: string) {
 		try {
 			await axios.delete(node.encodedSource)
 
 			// Let's delete even if it's moved to the trashbin
 			// since it has been removed from the current view
-			//  and changing the view will trigger a reload anyway.
+			// and changing the view will trigger a reload anyway.
 			emit('files:node:deleted', node)
+
 			return true
 		} catch (error) {
 			logger.error('Error while deleting a file', { error, source: node.source, node })
diff --git a/apps/files/src/store/paths.ts b/apps/files/src/store/paths.ts
index 49b0ec9495b..15d16b1760b 100644
--- a/apps/files/src/store/paths.ts
+++ b/apps/files/src/store/paths.ts
@@ -29,7 +29,7 @@ import logger from '../logger'
 import { useFilesStore } from './files'
 
 export const usePathsStore = function(...args) {
-	const files = useFilesStore()
+	const files = useFilesStore(...args)
 
 	const store = defineStore('paths', {
 		state: () => ({
diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index bd42e80c3a7..9c739476793 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -240,6 +240,14 @@ export default defineComponent({
 			return (this.$route?.query?.dir?.toString() || '/').replace(/^(.+)\/$/, '$1')
 		},
 
+		/**
+		 * The current file id
+		 */
+		fileId(): number | null {
+			const number = Number.parseInt(this.$route?.params.fileid ?? '')
+			return Number.isNaN(number) ? null : number
+		},
+
 		/**
 		 * The current folder.
 		 */
@@ -453,6 +461,8 @@ export default defineComponent({
 
 	mounted() {
 		this.fetchContent()
+
+		subscribe('files:node:deleted', this.onNodeDeleted)
 		subscribe('files:node:updated', this.onUpdatedNode)
 		subscribe('nextcloud:unified-search.search', this.onSearch)
 		subscribe('nextcloud:unified-search.reset', this.onSearch)
@@ -462,6 +472,7 @@ export default defineComponent({
 	},
 
 	unmounted() {
+		unsubscribe('files:node:deleted', this.onNodeDeleted)
 		unsubscribe('files:node:updated', this.onUpdatedNode)
 		unsubscribe('nextcloud:unified-search.search', this.onSearch)
 		unsubscribe('nextcloud:unified-search.reset', this.onSearch)
@@ -535,6 +546,31 @@ export default defineComponent({
 			return this.filesStore.getNode(fileId)
 		},
 
+		/**
+		 * Handle the node deleted event to reset open file
+		 * @param node The deleted node
+		 */
+		 onNodeDeleted(node: Node) {
+			if (node.fileid && node.fileid === this.fileId) {
+				if (node.fileid === this.currentFolder?.fileid) {
+					// Handle the edge case that the current directory is deleted
+					// in this case we neeed to keept the current view but move to the parent directory
+					window.OCP.Files.Router.goToRoute(
+						null,
+						{ view: this.$route.params.view },
+						{ dir: this.currentFolder?.dirname ?? '/' },
+					)
+				} else {
+					// If the currently active file is deleted we need to remove the fileid and possible the `openfile` query
+					window.OCP.Files.Router.goToRoute(
+						null,
+						{ ...this.$route.params, fileid: undefined },
+						{ ...this.$route.query, openfile: undefined },
+					)
+				}
+			}
+		},
+
 		/**
 		 * The upload manager have finished handling the queue
 		 * @param {Upload} upload the uploaded data
-- 
2.39.5