1 files changed, 82 insertions, 24 deletions

diff --git a/apps/files/src/store/paths.ts b/apps/files/src/store/paths.ts
index 2993cc9d704..4a83cb51c83 100644
--- a/apps/files/src/store/paths.ts
+++ b/apps/files/src/store/paths.ts
@@ -2,9 +2,10 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import type { FileSource, PathsStore, PathOptions, ServicesState } from '../types'
+import type { FileSource, PathsStore, PathOptions, ServicesState, Service } from '../types'
 import { defineStore } from 'pinia'
-import { FileType, Folder, Node, getNavigation } from '@nextcloud/files'
+import { dirname } from '@nextcloud/paths'
+import { File, FileType, Folder, Node, getNavigation } from '@nextcloud/files'
 import { subscribe } from '@nextcloud/event-bus'
 import Vue from 'vue'
 import logger from '../logger'
@@ -41,6 +42,15 @@ export const usePathsStore = function(...args) {
 				Vue.set(this.paths[payload.service], payload.path, payload.source)
 			},
 
+			deletePath(service: Service, path: string) {
+				// skip if service does not exist
+				if (!this.paths[service]) {
+					return
+				}
+
+				Vue.delete(this.paths[service], path)
+			},
+
 			onCreatedNode(node: Node) {
 				const service = getNavigation()?.active?.id || 'files'
 				if (!node.fileid) {
@@ -59,46 +69,94 @@ export const usePathsStore = function(...args) {
 
 				// Update parent folder children if exists
 				// If the folder is the root, get it and update it
-				if (node.dirname === '/') {
-					const root = files.getRoot(service)
-					if (!root._children) {
-						Vue.set(root, '_children', [])
+				this.addNodeToParentChildren(node)
+			},
+
+			onDeletedNode(node: Node) {
+				const service = getNavigation()?.active?.id || 'files'
+
+				if (node.type === FileType.Folder) {
+					// Delete the path
+					this.deletePath(
+						service,
+						node.path,
+					)
+				}
+
+				this.deleteNodeFromParentChildren(node)
+			},
+
+			onMovedNode({ node, oldSource }: { node: Node, oldSource: string }) {
+				const service = getNavigation()?.active?.id || 'files'
+
+				// Update the path of the node
+				if (node.type === FileType.Folder) {
+					// Delete the old path if it exists
+					const oldPath = Object.entries(this.paths[service]).find(([, source]) => source === oldSource)
+					if (oldPath?.[0]) {
+						this.deletePath(service, oldPath[0])
 					}
-					root._children.push(node.source)
+
+					// Add the new path
+					this.addPath({
+						service,
+						path: node.path,
+						source: node.source,
+					})
+				}
+
+				// Dummy simple clone of the renamed node from a previous state
+				const oldNode = new File({ source: oldSource, owner: node.owner, mime: node.mime })
+
+				this.deleteNodeFromParentChildren(oldNode)
+				this.addNodeToParentChildren(node)
+			},
+
+			deleteNodeFromParentChildren(node: Node) {
+				const service = getNavigation()?.active?.id || 'files'
+
+				// Update children of a root folder
+				const parentSource = dirname(node.source)
+				const folder = (node.dirname === '/' ? files.getRoot(service) : files.getNode(parentSource)) as Folder & { _children?: string[] }
+				if (folder) {
+					// ensure sources are unique
+					const children = new Set(folder._children ?? [])
+					children.delete(node.source)
+					Vue.set(folder, '_children', [...children.values()])
+					logger.debug('Children updated', { parent: folder, node, children: folder._children })
 					return
 				}
 
-				// If the folder doesn't exists yet, it will be
-				// fetched later and its children updated anyway.
-				if (this.paths[service][node.dirname]) {
-					const parentSource = this.paths[service][node.dirname]
-					const parentFolder = files.getNode(parentSource) as Folder
-					logger.debug('Path already exists, updating children', { parentFolder, node })
+				logger.debug('Parent path does not exists, skipping children update', { node })
+			},
 
-					if (!parentFolder) {
-						logger.error('Parent folder not found', { parentSource })
-						return
-					}
+			addNodeToParentChildren(node: Node) {
+				const service = getNavigation()?.active?.id || 'files'
 
-					if (!parentFolder._children) {
-						Vue.set(parentFolder, '_children', [])
-					}
-					parentFolder._children.push(node.source)
+				// Update children of a root folder
+				const parentSource = dirname(node.source)
+				const folder = (node.dirname === '/' ? files.getRoot(service) : files.getNode(parentSource)) as Folder & { _children?: string[] }
+				if (folder) {
+					// ensure sources are unique
+					const children = new Set(folder._children ?? [])
+					children.add(node.source)
+					Vue.set(folder, '_children', [...children.values()])
+					logger.debug('Children updated', { parent: folder, node, children: folder._children })
 					return
 				}
 
 				logger.debug('Parent path does not exists, skipping children update', { node })
 			},
+
 		},
 	})
 
 	const pathsStore = store(...args)
 	// Make sure we only register the listeners once
 	if (!pathsStore._initialized) {
-		// TODO: watch folders to update paths?
 		subscribe('files:node:created', pathsStore.onCreatedNode)
-		// subscribe('files:node:deleted', pathsStore.onDeletedNode)
-		// subscribe('files:node:moved', pathsStore.onMovedNode)
+		subscribe('files:node:deleted', pathsStore.onDeletedNode)
+		subscribe('files:node:moved', pathsStore.onMovedNode)
 
 		pathsStore._initialized = true
 	}