From 289ed65d4e3706ceb4426fd9e6102d8a6b37841c Mon Sep 17 00:00:00 2001
From: Christopher Ng <chrng8@gmail.com>
Date: Wed, 3 Apr 2024 17:00:01 -0700
Subject: [PATCH] fix: Fix navigation to folder

Signed-off-by: Christopher Ng <chrng8@gmail.com>
(cherry picked from commit 3647a0ab8f7e4329cd7f1e18ba0ffb87e7eaa6fd)
---
 package-lock.json                  |  1 +
 package.json                       |  1 +
 src/components/RecommendedFile.vue | 10 ++++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7880dbbd..1b2412a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
         "@nextcloud/axios": "^2.4.0",
         "@nextcloud/files": "^3.0.0",
         "@nextcloud/l10n": "^2.2.0",
+        "@nextcloud/paths": "^2.1.0",
         "@nextcloud/router": "^3.0.0",
         "@nextcloud/vue": "^8.9.1",
         "lodash": "^4.17.21",
diff --git a/package.json b/package.json
index 97459cd7..3db26a04 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "@nextcloud/axios": "^2.4.0",
     "@nextcloud/files": "^3.0.0",
     "@nextcloud/l10n": "^2.2.0",
+    "@nextcloud/paths": "^2.1.0",
     "@nextcloud/router": "^3.0.0",
     "@nextcloud/vue": "^8.9.1",
     "lodash": "^4.17.21",
diff --git a/src/components/RecommendedFile.vue b/src/components/RecommendedFile.vue
index ae705611..09e5a70a 100644
--- a/src/components/RecommendedFile.vue
+++ b/src/components/RecommendedFile.vue
@@ -51,6 +51,7 @@
 <script>
 import { translate as t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
+import { joinPaths } from '@nextcloud/paths'
 
 export default {
 	name: 'RecommendedFile',
@@ -100,6 +101,9 @@ export default {
 		path() {
 			return (this.directory === '/' ? '' : this.directory) + '/' + this.name
 		},
+		isFolder() {
+			return this.mimeType === 'httpd/unix-directory'
+		},
 	},
 	mounted() {
 		if (this.hasPreview) {
@@ -128,12 +132,14 @@ export default {
 
 			// Navigate to the file if the file router is available
 			if (window.OCP?.Files?.Router) {
+				const dir = this.isFolder ? joinPaths(this.directory, this.name) : this.directory
+				const fileid = this.isFolder ? null : this.id
 				window.OCP.Files.Router.goToRoute(
 					// use default route
 					null,
 					// recommendations is only enabled on files
-					{ view: 'files', fileid: this.id },
-					{ dir: this.directory },
+					{ view: 'files', fileid },
+					{ dir },
 				)
 				return
 			}