Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/src/lib/site-initializer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const init = async () => {
await ServiceConfigurator.initialize(mergedConfig);
await APIClientManager.initialize(mergedConfig);
initDomainSettings();
initModeSetting();
await initModeSetting();
await initWorkspace(userId);
initRouter(domainId);
// prefetchResources();
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/lib/site-initializer/mode-setting.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useAppContextStore } from '@/store/app-context/app-context-store';
import { pinia } from '@/store/pinia';

import ServiceConfigurator from '@/services/configurator';

export const initModeSetting = () => {
// NOTE: this is to use pinia store outside vue component
useAppContextStore(pinia);
Expand All @@ -12,4 +14,5 @@ export const initModeSetting = () => {
if (modePath === 'admin') {
appContextStore.enterAdminMode();
}
ServiceConfigurator.getMenuList(modePath);
};
4 changes: 2 additions & 2 deletions apps/web/src/services/configurator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class ServiceConfigurator {
this.featureSchema = featureSchema;
}

getRoutes(mode: 'admin' | 'workspace'): RouteConfig[] {
getRoutes(mode: string): RouteConfig[] {
const baseRoutes = mode === 'admin'
? [adminWorkspaceHomeRoutes, adminAdvancedRoutes, adminInfoRoutes]
: [workspaceHomeRoute, infoRoutes];
Expand All @@ -61,7 +61,7 @@ class ServiceConfigurator {
return baseRoutes;
}

getMenuList(mode: 'admin' | 'workspace'): Menu[] {
getMenuList(mode: string): Menu[] {
const menuStore = useMenuStore();

const menuList: Menu[] = mode === 'admin' ? [] : DEFAULT_MENU_LIST;
Expand Down
10 changes: 5 additions & 5 deletions apps/web/src/store/display/display-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import type {
DisplayMenu, DisplayStoreState, SidebarProps, SidebarType,
DisplayStoreGetters,
} from '@/store/display/type';
import { useMenuStore } from '@/store/menu/menu-store';
import { useUserStore } from '@/store/user/user-store';

import type { Menu, MenuId, MenuInfo } from '@/lib/menu/config';
Expand All @@ -37,8 +38,6 @@ import { MENU_INFO_MAP } from '@/lib/menu/menu-info';

import ErrorHandler from '@/common/composables/error/errorHandler';

import ServiceConfigurator from '@/services/configurator';

const verbose = false;
const filterMenuByRoute = (menuList: DisplayMenu[], router: VueRouter): DisplayMenu[] => menuList.reduce((results, _menu) => {
const userWorkspaceStore = useUserWorkspaceStore();
Expand Down Expand Up @@ -306,14 +305,15 @@ export const useDisplayStore = defineStore('display-store', () => {
}
};

const getAllMenuList = (route: Route): DisplayMenu[] => {
const isMyPage = route.path.startsWith('/my-page');
const getAllMenuList = (route?: Route): DisplayMenu[] => {
const isMyPage = route?.path.startsWith('/my-page');
const appContextStore = useAppContextStore();
const menuStore = useMenuStore();
const appContextState = appContextStore.$state;
const userWorkspaceStore = useUserWorkspaceStore();
const isAdminMode = appContextState.getters.isAdminMode;
const currentWorkspaceId = userWorkspaceStore.getters.currentWorkspaceId;
const menuList = ServiceConfigurator.getMenuList(isAdminMode ? 'admin' : 'workspace');
const menuList = menuStore.state.menuList;
let _allGnbMenuList: DisplayMenu[];

_allGnbMenuList = getDisplayMenuList(menuList, isAdminMode, currentWorkspaceId);
Expand Down
Loading