From feb5536ec85e450b5e8d62a24d557cee93cf46f4 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sat, 3 Feb 2024 18:03:19 +0530
Subject: [PATCH] fix: removed default view logic from router

---
 frontend/src/router.js       | 20 ++------------------
 frontend/src/stores/views.js |  1 +
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 32ca69db..adc3f17f 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -1,11 +1,11 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import { usersStore } from '@/stores/users'
 import { sessionStore } from '@/stores/session'
-import { viewsStore } from '@/stores/views'
 
 const routes = [
   {
     path: '/',
+    redirect: { name: 'Leads' },
     name: 'Home',
   },
   {
@@ -130,30 +130,14 @@ let router = createRouter({
 router.beforeEach(async (to, from, next) => {
   const { users } = usersStore()
   const { isLoggedIn } = sessionStore()
-  const { views, getDefaultView } = viewsStore()
 
   await users.promise
-  await views.promise
 
   if (from.meta?.scrollPos) {
     from.meta.scrollPos.top = document.querySelector('#list-rows')?.scrollTop
   }
 
-  if (to.path === '/') {
-    const defaultView = getDefaultView()
-    if (defaultView?.route_name) {
-      if (defaultView.is_view) {
-        next({
-          name: defaultView.route_name,
-          query: { view: defaultView.name },
-        })
-      } else {
-        next({ name: defaultView.route_name })
-      }
-    } else {
-      next({ name: 'Leads' })
-    }
-  } else if (to.name === 'Login' && isLoggedIn) {
+  if (to.name === 'Login' && isLoggedIn) {
     next({ name: 'Leads' })
   } else if (to.name !== 'Login' && !isLoggedIn) {
     next({ name: 'Login' })
diff --git a/frontend/src/stores/views.js b/frontend/src/stores/views.js
index 35d66a71..f6744c01 100644
--- a/frontend/src/stores/views.js
+++ b/frontend/src/stores/views.js
@@ -34,6 +34,7 @@ export const viewsStore = defineStore('crm-views', (doctype) => {
           (!view.public && view.default) ||
           (view.public &&
             view.default &&
+            view.user_list &&
             JSON.parse(view.user_list).includes(user))
         ) {
           defaultView.value = view