From e10bfdd315d361379a2df36dc00fc0155508bccb Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Thu, 24 Jul 2025 08:49:18 +0200
Subject: [PATCH] fix: navigation with restricted permissions

---
 src/components/Footer.vue      | 4 ++--
 src/components/Header.vue      | 4 ++--
 src/router/adminGuard.ts       | 7 ++++++-
 src/stores/ability.ts          | 3 ++-
 src/stores/admin/navigation.ts | 5 +++++
 src/views/NoPermission.vue     | 2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index f1082c4..eda9403 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -6,7 +6,7 @@
     <div class="w-full flex flex-row gap-2 h-full align-middle">
       <TopLevelLink
         v-if="routeName == 'admin' || routeName.includes('admin-')"
-        v-for="item in topLevel"
+        v-for="item in topLevelObject"
         :key="item.key"
         :link="item"
         :disableSubLink="true"
@@ -34,7 +34,7 @@ import TopLevelLink from "./admin/TopLevelLink.vue";
 export default defineComponent({
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
-    ...mapState(useNavigationStore, ["topLevel"]),
+    ...mapState(useNavigationStore, ["topLevelObject"]),
     routeName() {
       return typeof this.$route.name == "string" ? this.$route.name : "";
     },
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 109c38a..72575c0 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -10,7 +10,7 @@
       <div v-if="authCheck" class="hidden md:flex flex-row gap-2 h-full align-middle">
         <TopLevelLink
           v-if="routeName == 'admin' || routeName.includes('admin-')"
-          v-for="item in topLevel"
+          v-for="item in topLevelObject"
           :key="item.key"
           :link="item"
         />
@@ -46,7 +46,7 @@ import { useConfigurationStore } from "@/stores/configuration";
 export default defineComponent({
   computed: {
     ...mapState(useAuthStore, ["authCheck"]),
-    ...mapState(useNavigationStore, ["topLevel"]),
+    ...mapState(useNavigationStore, ["topLevelObject"]),
     ...mapState(useConfigurationStore, ["clubName"]),
     routeName() {
       return typeof this.$route.name == "string" ? this.$route.name : "";
diff --git a/src/router/adminGuard.ts b/src/router/adminGuard.ts
index 8016b7d..26396d9 100644
--- a/src/router/adminGuard.ts
+++ b/src/router/adminGuard.ts
@@ -19,11 +19,16 @@ export async function abilityAndNavUpdate(to: any, from: any, next: any) {
     navigation.updateNavigation();
     NProgress.done();
     next();
-  } else if ((admin && ability.isAdmin()) || ability.can(type, section, module)) {
+  } else if (module && ((admin && ability.isAdmin()) || ability.can(type, section, module))) {
     NProgress.done();
     navigation.activeNavigation = to.name.split("-")[1];
     navigation.activeLink = to.name.split("-")[2];
     next();
+  } else if (!module && ((admin && ability.isAdmin()) || ability.canSection(type, section))) {
+    NProgress.done();
+    navigation.activeNavigation = to.name.split("-")[1];
+    navigation.activeLink = null;
+    next();
   } else {
     NProgress.done();
     next({ name: "admin-default" });
diff --git a/src/stores/ability.ts b/src/stores/ability.ts
index ed65b5f..26cfa52 100644
--- a/src/stores/ability.ts
+++ b/src/stores/ability.ts
@@ -33,7 +33,8 @@ export const useAbilityStore = defineStore("ability", {
         if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
         if (permissions?.admin || permissions?.adminByOwner) return true;
         if (
-          (permissions[section]?.all == "*" || permissions[section]?.all?.includes(type)) &&
+          permissions[section]?.all == "*" ||
+          permissions[section]?.all?.includes(type) ||
           permissions[section] != undefined
         )
           return true;
diff --git a/src/stores/admin/navigation.ts b/src/stores/admin/navigation.ts
index 3b14619..566fccd 100644
--- a/src/stores/admin/navigation.ts
+++ b/src/stores/admin/navigation.ts
@@ -37,6 +37,11 @@ export const useNavigationStore = defineStore("navigation", {
     };
   },
   getters: {
+    topLevelObject: (state) =>
+      state.topLevel.map((tl) => ({
+        ...tl,
+        levelDefault: state.navigation[tl.key].main.filter((m) => !m.key.includes("divider"))[0]?.key ?? "",
+      })),
     activeNavigationObject: (state) => (state.navigation[state.activeNavigation] ?? {}) as navigationSplitModel,
     activeTopLevelObject: (state) =>
       (state.topLevel.find((elem) => elem.key == state.activeNavigation) ?? {}) as topLevelNavigationModel,
diff --git a/src/views/NoPermission.vue b/src/views/NoPermission.vue
index d953327..ddf2841 100644
--- a/src/views/NoPermission.vue
+++ b/src/views/NoPermission.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col items-center">
+  <div class="flex flex-col gap-2 items-center">
     <br />
     <h1 class="w-full p-4 text-center font-bold text-3xl">Kein Zugriff</h1>
     <br />