Include SharedResource route in active state of Shares nav item

owncloud · Apr 27, 2022 · 2f412bd · 2f412bd
1 parent edb8de4
commit 2f412bd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/packages/web-app-files/src/index.js b/packages/web-app-files/src/index.js
@@ -65,7 +65,8 @@ const navItems = [
     icon: 'share-forward',
     route: {
       path: `/${appInfo.id}/shares`
-    }
+    },
+    activeFor: [{ path: `/${appInfo.id}/spaces/shares` }]
   },
   {
     name: $gettext('Spaces'),

diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
@@ -97,14 +97,26 @@ export default defineComponent({
 
       const { href: currentHref } = this.$router.resolve(this.$route)
       return items.map((item) => {
-        const { href: comparativeHref } = this.$router.resolve(item.route)
-
+        const active = [item.route, ...(item.activeFor || [])]
+          .filter(Boolean)
+          .reduce((result, currentItem) => {
+            if (result) {
+              return true
+            }
+            try {
+              const comparativeHref = this.$router.resolve(currentItem).href
+              return currentHref.startsWith(comparativeHref)
+            } catch (e) {
+              console.error(e)
+              return false
+            }
+          }, false)
         const name = typeof item.name === 'function' ? item.name(this.capabilities) : item.name
 
         return {
           ...item,
           name: this.$gettext(name),
-          active: currentHref.startsWith(comparativeHref)
+          active
         }
       })
     },