From 425932c7703430450ef54d1803f4ce2c1158eb89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@protonmail.com>
Date: Fri, 21 Apr 2023 15:44:06 +0200
Subject: [PATCH] fix(files): fileid attribute
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 apps/files/src/components/FilesListHeader.vue | 2 +-
 apps/files/src/views/FilesList.vue            | 8 ++++----
 apps/files/src/views/Navigation.vue           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/files/src/components/FilesListHeader.vue b/apps/files/src/components/FilesListHeader.vue
index 9e3fe0d46de..2d848d0eefe 100644
--- a/apps/files/src/components/FilesListHeader.vue
+++ b/apps/files/src/components/FilesListHeader.vue
@@ -173,7 +173,7 @@ export default Vue.extend({
 
 		onToggleAll(selected) {
 			if (selected) {
-				const selection = this.nodes.map(node => node.attributes.fileid.toString())
+				const selection = this.nodes.map(node => node.fileid.toString())
 				logger.debug('Added all nodes to selection', { selection })
 				this.selectionStore.setLastIndex(null)
 				this.selectionStore.set(selection)
diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index 50f35fef5aa..f2a20c18f28 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -268,16 +268,16 @@ export default Vue.extend({
 				this.filesStore.updateNodes(contents)
 
 				// Define current directory children
-				folder._children = contents.map(node => node.attributes.fileid)
+				folder._children = contents.map(node => node.fileid)
 
 				// If we're in the root dir, define the root
 				if (dir === '/') {
 					this.filesStore.setRoot({ service: currentView.id, root: folder })
 				} else
 				// Otherwise, add the folder to the store
-				if (folder.attributes.fileid) {
+				if (folder.fileid) {
 					this.filesStore.updateNodes([folder])
-					this.pathsStore.addPath({ service: currentView.id, fileid: folder.attributes.fileid, path: dir })
+					this.pathsStore.addPath({ service: currentView.id, fileid: folder.fileid, path: dir })
 				} else {
 					// If we're here, the view API messed up
 					logger.error('Invalid root folder returned', { dir, folder, currentView })
@@ -286,7 +286,7 @@ export default Vue.extend({
 				// Update paths store
 				const folders = contents.filter(node => node.type === 'folder')
 				folders.forEach(node => {
-					this.pathsStore.addPath({ service: currentView.id, fileid: node.attributes.fileid, path: join(dir, node.basename) })
+					this.pathsStore.addPath({ service: currentView.id, fileid: node.fileid, path: join(dir, node.basename) })
 				})
 			} catch (error) {
 				logger.error('Error while fetching content', { error })
diff --git a/apps/files/src/views/Navigation.vue b/apps/files/src/views/Navigation.vue
index e5556e88958..e164880003a 100644
--- a/apps/files/src/views/Navigation.vue
+++ b/apps/files/src/views/Navigation.vue
@@ -44,7 +44,7 @@
 					:title="child.name"
 					:to="generateToNavigation(child)">
 					<!-- Sanitized icon as svg if provided -->
-					<NcIconSvgWrapper v-if="view.icon" slot="icon" :svg="view.icon" />
+					<NcIconSvgWrapper v-if="child.icon" slot="icon" :svg="child.icon" />
 				</NcAppNavigationItem>
 			</NcAppNavigationItem>
 		</template>