fix: while last opened tab is loaded instead of rerouting just update…

… the route with hash
frappe · Sep 28, 2024 · 2f58da9 · 2f58da9
1 parent 9e156ef
commit 2f58da9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/frontend/src/composables/useActiveTabManager.js b/frontend/src/composables/useActiveTabManager.js
@@ -46,7 +46,6 @@ export function useActiveTabManager(tabs, storageKey) {
 
  let lastVisitedTab = getActiveTabFromLocalStorage()
  if (lastVisitedTab) {
- setActiveTabInUrl(lastVisitedTab)
  return getTabIndex(lastVisitedTab)
  }
 

diff --git a/frontend/src/router.js b/frontend/src/router.js
@@ -145,10 +145,16 @@ router.beforeEach(async (to, from, next) => {
  if (to.name === 'Home' && isLoggedIn) {
  next({ name: 'Leads' })
  } else if (!isLoggedIn) {
- window.location.href = "/login?redirect-to=/crm";
+ window.location.href = '/login?redirect-to=/crm'
  } else if (to.matched.length === 0) {
  next({ name: 'Invalid Page' })
  } else {
+ if (['Deal', 'Lead'].includes(to.name) && !to.hash) {
+ let storageKey = to.name === 'Deal' ? 'lastDealTab' : 'lastLeadTab'
+ const activeTab = localStorage.getItem(storageKey) || 'activity'
+ const hash = '#' + activeTab
+ next({ ...to, hash })
+ }
  next()
  }
 })