From 860b216e2b0ffcc5fbc7d32027951bf680ff8c4d Mon Sep 17 00:00:00 2001
From: Abhinav Raut <abhinavrautcs@gmail.com>
Date: Sat, 22 Mar 2025 00:30:04 +0530
Subject: [PATCH] fix: remove redirect from /admin to /admin/general as some
 users may not have permission to the general settings

---
 frontend/src/App.vue                       | 6 ++++--
 frontend/src/layouts/admin/AdminLayout.vue | 8 +++++++-
 frontend/src/router/index.js               | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index ae84069a..140c2597 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -16,7 +16,9 @@
                 </SidebarMenuItem>
                 <SidebarMenuItem v-if="userStore.hasAdminTabPermissions">
                   <SidebarMenuButton asChild :isActive="route.path.startsWith('/admin')">
-                    <router-link :to="{ name: 'admin' }">
+                    <router-link
+                      :to="{ name: userStore.can('general_settings:manage') ? 'general' : 'admin' }"
+                    >
                       <Shield />
                     </router-link>
                   </SidebarMenuButton>
@@ -46,7 +48,7 @@
         @create-view="openCreateViewForm = true"
         @edit-view="editView"
         @delete-view="deleteView"
-        @create-conversation="() => openCreateConversationDialog = true"
+        @create-conversation="() => (openCreateConversationDialog = true)"
       >
         <div class="flex flex-col h-screen">
           <!-- Show app update only in admin routes -->
diff --git a/frontend/src/layouts/admin/AdminLayout.vue b/frontend/src/layouts/admin/AdminLayout.vue
index ea9fde64..37df265e 100644
--- a/frontend/src/layouts/admin/AdminLayout.vue
+++ b/frontend/src/layouts/admin/AdminLayout.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="overflow-y-auto h-screen">
     <div class="p-6 sm:p-8 min-h-full flex flex-col">
+      <div
+        class="flex flex-col items-center justify-center flex-grow"
+        v-if="$route.path === '/admin'"
+      >
+        <div>Select a section from the sidebar</div>
+      </div>
       <router-view class="flex-grow" />
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 59c60189..5dc63ca2 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -155,12 +155,12 @@ const routes = [
       {
         path: '/admin',
         name: 'admin',
-        redirect: '/admin/general',
         component: AdminLayout,
         meta: { title: 'Admin' },
         children: [
           {
             path: 'general',
+            name: 'general',
             component: () => import('@/views/admin/general/General.vue'),
             meta: { title: 'General' }
           },