Merge pull request #2128 from nextcloud/artonge/backport/stable28/2103

[stable28] Improve handling of Node API properties
nextcloud · Jan 18, 2024 · f5c06ac · f5c06ac
2 parents 7879be2 + 76648e6
commit f5c06ac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue
@@ -1110,12 +1110,19 @@ export default {
 		},
 
 		// Update etag of updated file to break cache.
+		/**
+		 *
+		 * @param {Node} node
+		 */
 		async handleFileUpdated(node) {
 			const index = this.fileList.findIndex(({ fileid: currentFileId }) => currentFileId === node.fileid)
 
-			this.fileList.splice(index, 1, { ...node, etag: node.etag })
+			// Ensure compatibility with the legacy data model that the Viewer is using. (see "model.ts").
+			// This can be removed once Viewer is migrated to the new Node API.
+			node.etag = node.attributes.etag
+			this.fileList.splice(index, 1, node)
 			if (node.fileid === this.currentFile.fileid) {
-				this.currentFile.etag = node.etag
+				this.currentFile.etag = node.attributes.etag
 			}
 		},