Merge pull request #37726 from nextcloud/feat/files-events

fix(files): standardize `files:node:event` event syntax
nextcloud · Apr 14, 2023 · 8a79636 · 8a79636
2 parents a578a5e + edbdfef
commit 8a79636
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 29 deletions.
diff --git a/apps/files/src/actions/deleteAction.ts b/apps/files/src/actions/deleteAction.ts
@@ -50,7 +50,7 @@ registerFileAction(new FileAction({
 			// 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.
-			emit('files:file:deleted', node)
+			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/components/NavigationQuota.vue b/apps/files/src/components/NavigationQuota.vue
@@ -80,15 +80,10 @@ export default {
 		 */
 		setInterval(this.throttleUpdateStorageStats, 60 * 1000)
 
-		subscribe('files:file:created', this.throttleUpdateStorageStats)
-		subscribe('files:file:deleted', this.throttleUpdateStorageStats)
-		subscribe('files:file:moved', this.throttleUpdateStorageStats)
-		subscribe('files:file:updated', this.throttleUpdateStorageStats)
-
-		subscribe('files:folder:created', this.throttleUpdateStorageStats)
-		subscribe('files:folder:deleted', this.throttleUpdateStorageStats)
-		subscribe('files:folder:moved', this.throttleUpdateStorageStats)
-		subscribe('files:folder:updated', this.throttleUpdateStorageStats)
+		subscribe('files:node:created', this.throttleUpdateStorageStats)
+		subscribe('files:node:deleted', this.throttleUpdateStorageStats)
+		subscribe('files:node:moved', this.throttleUpdateStorageStats)
+		subscribe('files:node:updated', this.throttleUpdateStorageStats)
 	},
 
 	methods: {

diff --git a/apps/files/src/store/files.ts b/apps/files/src/store/files.ts
@@ -91,15 +91,10 @@ export const useFilesStore = () => {
 	const fileStore = store()
 	// Make sure we only register the listeners once
 	if (!fileStore._initialized) {
-		// subscribe('files:file:created', fileStore.onCreatedNode)
-		subscribe('files:file:deleted', fileStore.onDeletedNode)
-		// subscribe('files:file:moved', fileStore.onMovedNode)
-		// subscribe('files:file:updated', fileStore.onUpdatedNode)
-
-		// subscribe('files:folder:created', fileStore.onCreatedNode)
-		subscribe('files:folder:deleted', fileStore.onDeletedNode)
-		// subscribe('files:folder:moved', fileStore.onMovedNode)
-		// subscribe('files:folder:updated', fileStore.onUpdatedNode)
+		// subscribe('files:node:created', fileStore.onCreatedNode)
+		subscribe('files:node:deleted', fileStore.onDeletedNode)
+		// subscribe('files:node:moved', fileStore.onMovedNode)
+		// subscribe('files:node:updated', fileStore.onUpdatedNode)
 
 		fileStore._initialized = true
 	}

diff --git a/apps/files/src/store/paths.ts b/apps/files/src/store/paths.ts
@@ -59,9 +59,9 @@ export const usePathsStore = () => {
 	// Make sure we only register the listeners once
 	if (!pathsStore._initialized) {
 		// TODO: watch folders to update paths?
-		// subscribe('files:folder:created', pathsStore.onCreatedNode)
-		// subscribe('files:folder:deleted', pathsStore.onDeletedNode)
-		// subscribe('files:folder:moved', pathsStore.onMovedNode)
+		// subscribe('files:node:created', pathsStore.onCreatedNode)
+		// subscribe('files:node:deleted', pathsStore.onDeletedNode)
+		// subscribe('files:node:moved', pathsStore.onMovedNode)
 
 		pathsStore._initialized = true
 	}

diff --git a/apps/files_trashbin/src/actions/restoreAction.ts b/apps/files_trashbin/src/actions/restoreAction.ts
@@ -62,7 +62,7 @@ registerFileAction(new FileAction({
 
 			// Let's pretend the file is deleted since
 			// we don't know the restored location
-			emit('files:file:deleted', node)
+			emit('files:node:deleted', node)
 			return true
 		} catch (error) {
 			logger.error(error)

diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map
diff --git a/dist/files_trashbin-main.js b/dist/files_trashbin-main.js
diff --git a/dist/files_trashbin-main.js.map b/dist/files_trashbin-main.js.map