fix: load views before route

This commit is contained in:
Shariq Ansari 2024-01-25 20:39:20 +05:30
parent 4c976ea757
commit 9c74b6ae42
2 changed files with 5 additions and 1 deletions

View File

@ -118,15 +118,17 @@ let router = createRouter({
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
const { users } = usersStore() const { users } = usersStore()
const { isLoggedIn } = sessionStore() const { isLoggedIn } = sessionStore()
const { getDefaultView } = viewsStore() const { views, getDefaultView } = viewsStore()
await users.promise await users.promise
await views.promise
if (from.meta?.scrollPos) { if (from.meta?.scrollPos) {
from.meta.scrollPos.top = document.querySelector('#list-rows')?.scrollTop from.meta.scrollPos.top = document.querySelector('#list-rows')?.scrollTop
} }
if (to.path === '/') { if (to.path === '/') {
debugger
const defaultView = getDefaultView() const defaultView = getDefaultView()
if (defaultView?.route_name) { if (defaultView?.route_name) {
if (defaultView.is_view) { if (defaultView.is_view) {

View File

@ -19,6 +19,7 @@ export const viewsStore = defineStore('crm-views', (doctype) => {
initialData: [], initialData: [],
auto: true, auto: true,
transform(views) { transform(views) {
debugger
pinnedViews.value = [] pinnedViews.value = []
publicViews.value = [] publicViews.value = []
for (let view of views) { for (let view of views) {
@ -70,6 +71,7 @@ export const viewsStore = defineStore('crm-views', (doctype) => {
} }
return { return {
views,
getPinnedViews, getPinnedViews,
getPublicViews, getPublicViews,
getDefaultView, getDefaultView,