fix(route-constant): separate route-constant

apps/web/src/common/modules/workspace/WorkspaceSelectDropdown.vue

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router/composables';
 
 import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper';
-import { PSelectDropdown } from '@cloudforet/mirinae';
+import { PSelectDropdown, PButton } from '@cloudforet/mirinae';
 import type { MenuItem } from '@cloudforet/mirinae/src/controls/context-menu/type';
 import type {
     AutocompleteHandler,
@@ -17,7 +17,6 @@ import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
 import type { WorkspaceListParameters } from '@/schema/identity/workspace/api-verbs/list';
 import type { WorkspaceModel } from '@/schema/identity/workspace/model';
 
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
 
 import { useAllReferenceStore } from '@/store/reference/all-reference-store';
 import type { WorkspaceReferenceMap } from '@/store/reference/workspace-reference-store';
@@ -28,7 +27,7 @@ import WorkspaceLogoIcon from '@/common/modules/navigations/top-bar/modules/top-
 
 import { workspaceStateFormatter } from '@/services/advanced/composables/refined-table-data';
 import { WORKSPACE_STATE } from '@/services/advanced/constants/workspace-constant';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
 
 const router = useRouter();
 
@@ -139,7 +138,7 @@ watch(() => workspaceState.selectedItems, (selectedItems) => {
                 <template #button>
                     <p-button style-type="substitutive"
                               icon-left="ic_plus_bold"
-                              @click="router.push({ name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME) })"
+                              @click="router.push({ name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME })"
                     >
                         {{ $t('IAM.USER.FORM.CREATE_WORKSPACE') }}
                     </p-button>

apps/web/src/lib/menu/menu-info.ts

@@ -1,15 +1,18 @@
 import type { MenuId, MenuInfo } from '@/lib/menu/config';
 import { MENU_ID } from '@/lib/menu/config';
 
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
 import { ALERT_MANAGER_ROUTE_V1 } from '@/services/alert-manager-v1/routes/route-constant';
 import { ALERT_MANAGER_ROUTE } from '@/services/alert-manager/routes/route-constant';
 import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
+import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
 import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
 import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant';
+import { ADMIN_IAM_ROUTE } from '@/services/iam/routes/admin/route-constant';
 import { IAM_ROUTE } from '@/services/iam/routes/route-constant';
 import { INFO_ROUTE } from '@/services/info/routes/route-constant';
 import { MY_PAGE_ROUTE } from '@/services/my-page/routes/route-constant';
+import { ADMIN_OPS_FLOW_ROUTE } from '@/services/ops-flow/routes/admin/route-constant';
 import { OPS_FLOW_ROUTE } from '@/services/ops-flow/routes/route-constant';
 import { PROJECT_ROUTE } from '@/services/project-v1/routes/route-constant';
 import { WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/route-constant';
@@ -102,25 +105,25 @@ export const MENU_INFO_MAP: Record<MenuId, MenuInfo> = Object.freeze({
     },
     [MENU_ID.DATA_SOURCES]: {
         menuId: MENU_ID.DATA_SOURCES,
-        routeName: COST_EXPLORER_ROUTE.DATA_SOURCES._NAME,
+        routeName: ADMIN_COST_EXPLORER_ROUTE.DATA_SOURCES._NAME,
         translationId: 'MENU.COST_EXPLORER_DATA_SOURCES',
         icon: 'ic_service_data-sources',
     },
     [MENU_ID.COST_ADVANCED_SETTINGS]: {
         menuId: MENU_ID.COST_ADVANCED_SETTINGS,
-        routeName: COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS._NAME,
+        routeName: ADMIN_COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS._NAME,
         translationId: 'COST_EXPLORER.COST_ADVANCED_SETTINGS',
         highlightTag: 'new',
         icon: 'ic_service_advanced-settings',
     },
     [MENU_ID.ANOMALY_DETECTION_DOMAIN_CONFIGURATION]: {
         menuId: MENU_ID.ANOMALY_DETECTION_DOMAIN_CONFIGURATION,
-        routeName: COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.ANOMALY_DETECTION_DOMAIN_CONFIGURATION._NAME,
+        routeName: ADMIN_COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.ANOMALY_DETECTION_DOMAIN_CONFIGURATION._NAME,
         translationId: 'COST_EXPLORER.ANOMALY_DETECTION_CONFIGURATION',
     },
     [MENU_ID.CURRENCY_CONVERTER]: {
         menuId: MENU_ID.CURRENCY_CONVERTER,
-        routeName: COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.CURRENCY_CONVERTER._NAME,
+        routeName: ADMIN_COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.CURRENCY_CONVERTER._NAME,
         translationId: 'COST_EXPLORER.CURRENCY_CONVERTER',
         highlightTag: 'new',
     },
@@ -176,7 +179,7 @@ export const MENU_INFO_MAP: Record<MenuId, MenuInfo> = Object.freeze({
     },
     [MENU_ID.ROLE]: {
         menuId: MENU_ID.ROLE,
-        routeName: IAM_ROUTE.ROLE._NAME,
+        routeName: ADMIN_IAM_ROUTE.ROLE._NAME,
         translationId: 'MENU.ADMINISTRATION_ROLE',
         icon: 'ic_service_role',
     },
@@ -188,49 +191,49 @@ export const MENU_INFO_MAP: Record<MenuId, MenuInfo> = Object.freeze({
     },
     [MENU_ID.ADVANCED]: {
         menuId: MENU_ID.ADVANCED,
-        routeName: ADVANCED_ROUTE._NAME,
+        routeName: ADMIN_ADVANCED_ROUTE._NAME,
         translationId: 'MENU.ADMINISTRATION_ADVANCED',
     },
     [MENU_ID.PREFERENCES]: {
         menuId: MENU_ID.PREFERENCES,
-        routeName: ADVANCED_ROUTE.PREFERENCES._NAME,
+        routeName: ADMIN_ADVANCED_ROUTE.PREFERENCES._NAME,
         translationId: 'MENU.ADMINISTRATION_PREFERENCES',
         icon: 'ic_service_domain-settings',
     },
     [MENU_ID.DOMAIN_INFORMATION]: {
         menuId: MENU_ID.DOMAIN_INFORMATION,
-        routeName: ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME,
+        routeName: ADMIN_ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME,
         translationId: 'IAM.DOMAIN_SETTINGS.DOMAIN_INFORMATION',
     },
 
     [MENU_ID.APPEARANCE]: {
         menuId: MENU_ID.APPEARANCE,
-        routeName: ADVANCED_ROUTE.PREFERENCES.APPEARANCE._NAME,
+        routeName: ADMIN_ADVANCED_ROUTE.PREFERENCES.APPEARANCE._NAME,
         translationId: 'IAM.DOMAIN_SETTINGS.APPEARANCE',
     },
 
     [MENU_ID.AUTO_DORMANCY_CONFIGURATION]: {
         menuId: MENU_ID.AUTO_DORMANCY_CONFIGURATION,
-        routeName: ADVANCED_ROUTE.AUTO_DORMANCY_CONFIGURATION._NAME,
+        routeName: ADMIN_ADVANCED_ROUTE.AUTO_DORMANCY_CONFIGURATION._NAME,
         translationId: 'IAM.AUTO_DORMANCY_CONFIGURATION',
         icon: 'ic_service_dormancy-configuration',
     },
     [MENU_ID.WORKSPACES]: {
         menuId: MENU_ID.WORKSPACES,
-        routeName: ADVANCED_ROUTE.WORKSPACES._NAME,
+        routeName: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME,
         translationId: 'MENU.ADMINISTRATION_WORKSPACES',
         icon: 'ic_service_workspaces',
     },
     [MENU_ID.WORKSPACE_GROUP]: {
         menuId: MENU_ID.WORKSPACE_GROUP,
-        routeName: ADVANCED_ROUTE.WORKSPACE_GROUP._NAME,
+        routeName: ADMIN_ADVANCED_ROUTE.WORKSPACE_GROUP._NAME,
         translationId: 'MENU.ADMINISTRATION_WORKSPACE_GROUP',
         icon: 'ic_workspaces',
         highlightTag: 'new',
     },
     [MENU_ID.BOOKMARK]: {
         menuId: MENU_ID.BOOKMARK,
-        routeName: ADVANCED_ROUTE.BOOKMARK._NAME,
+        routeName: ADMIN_ADVANCED_ROUTE.BOOKMARK._NAME,
         translationId: 'MENU.ADMINISTRATION_BOOKMARK',
         icon: 'ic_service_bookmark',
     },
@@ -285,7 +288,7 @@ export const MENU_INFO_MAP: Record<MenuId, MenuInfo> = Object.freeze({
     },
     [MENU_ID.TASK_MANAGEMENT]: {
         menuId: MENU_ID.TASK_MANAGEMENT,
-        routeName: OPS_FLOW_ROUTE.TASK_MANAGEMENT._NAME,
+        routeName: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT._NAME,
         translationId: 'MENU.TASK_MANAGEMENT',
         icon: 'ic_service_task-management',
     },

apps/web/src/router/alert-manager-v1-integral-routes.ts

@@ -5,14 +5,14 @@ import { alertManagerV1WorkspaceRoutes } from '@/router/alert-manager-v1-workspa
 import { ROOT_ROUTE, ROUTE_SCOPE } from '@/router/constant';
 import { errorRoutes } from '@/router/error-routes';
 import { externalRoutes } from '@/router/external-routes';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
 
 import { pinia } from '@/store/pinia';
 import { useUserStore } from '@/store/user/user-store';
 
 import authRoutes from '@/services/auth/routes/routes';
 import landingPageRoutes from '@/services/landing/routes/routes';
 import myPageRoutes from '@/services/my-page/routes/routes';
+import { ADMIN_WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/admin/route-constant';
 import { WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/route-constant';
 
 const userStore = useUserStore(pinia);
@@ -38,7 +38,7 @@ export const alertManagerV1IntegralRoutes: RouteConfig[] = [
                 meta: { scope: ROUTE_SCOPE.DOMAIN },
                 redirect: () => {
                     if (!userStore.getters.isDomainAdmin) return { name: ROOT_ROUTE.WORKSPACE._NAME };
-                    return ({ name: makeAdminRouteName(WORKSPACE_HOME_ROUTE._NAME) });
+                    return ({ name: ADMIN_WORKSPACE_HOME_ROUTE._NAME });
                 },
                 component: { template: '<router-view />' },
                 children: [

apps/web/src/router/helpers/route-helper.ts

@@ -20,6 +20,7 @@ import { getLastAccessedWorkspaceId, setCurrentAccessedWorkspaceId } from '@/lib
 
 import { AUTH_ROUTE } from '@/services/auth/routes/route-constant';
 import { LANDING_ROUTE } from '@/services/landing/routes/route-constant';
+import { ADMIN_WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/admin/route-constant';
 import { WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/route-constant';
 
 export const makeAdminRouteName = (routeName: string): string => {
@@ -100,7 +101,7 @@ export const processRouteIntegrityCheck = (to: Route, next: NavigationGuardNext)
     }
     if (isNonePathRoute) {
         if (prevRole === 'DOMAIN_ADMIN') {
-            next({ name: makeAdminRouteName(to.name as string) });
+            next({ name: ADMIN_WORKSPACE_HOME_ROUTE._NAME });
             return false;
         }
 

apps/web/src/router/integral-routes.ts

@@ -4,7 +4,6 @@ import { adminRoutes } from '@/router/admin-routes';
 import { ROOT_ROUTE, ROUTE_SCOPE } from '@/router/constant';
 import { errorRoutes } from '@/router/error-routes';
 import { externalRoutes } from '@/router/external-routes';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
 import { workspaceRoutes } from '@/router/workspace-routes';
 
 import { pinia } from '@/store/pinia';
@@ -13,6 +12,7 @@ import { useUserStore } from '@/store/user/user-store';
 import authRoutes from '@/services/auth/routes/routes';
 import landingPageRoutes from '@/services/landing/routes/routes';
 import myPageRoutes from '@/services/my-page/routes/routes';
+import { ADMIN_WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/admin/route-constant';
 import { WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/route-constant';
 
 
@@ -38,7 +38,7 @@ export const integralRoutes: RouteConfig[] = [
                 redirect: () => {
                     const userStore = useUserStore(pinia);
                     if (!userStore.getters.isDomainAdmin) return { name: ROOT_ROUTE.WORKSPACE._NAME };
-                    return ({ name: makeAdminRouteName(WORKSPACE_HOME_ROUTE._NAME) });
+                    return ({ name: ADMIN_WORKSPACE_HOME_ROUTE._NAME });
                 },
                 component: { template: '<router-view />' },
                 children: [

apps/web/src/services/advanced/components/BookmarkContainer.vue

@@ -6,8 +6,6 @@ import { useRoute, useRouter } from 'vue-router/composables';
 
 import type { WorkspaceModel } from '@/schema/identity/workspace/model';
 
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
 import { useAppContextStore } from '@/store/app-context/app-context-store';
 
 import BookmarkDeleteModal from '@/common/components/bookmark/BookmarkDeleteModal.vue';
@@ -17,7 +15,7 @@ import { BOOKMARK_MODAL_TYPE } from '@/common/components/bookmark/constant/const
 import { useBookmarkStore } from '@/common/components/bookmark/store/bookmark-store';
 import type { BookmarkModalType, BookmarkItem } from '@/common/components/bookmark/type/type';
 
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
 import { useBookmarkPageStore } from '@/services/advanced/store/bookmark-page-store';
 
 const bookmarkStore = useBookmarkStore();
@@ -50,7 +48,7 @@ const handleCreateFolder = async (isEdit?: boolean, name?: string) => {
     if (isEdit && name) {
         if (!storeState.isTableItem) {
             await router.push({
-                name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME),
+                name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME,
                 params: {
                     group: route.params.group,
                     folder: name,
@@ -66,7 +64,7 @@ const handleCreateLink = (selectedFolder?: BookmarkItem) => {
     if (route.params.folder) {
         if (!selectedFolder) {
             router.push({
-                name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME),
+                name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME,
                 params: {
                     group: route.params.group,
                 },
@@ -80,7 +78,7 @@ const handleConfirmDelete = (isFolder?: boolean) => {
     if (route.params.folder) {
         if (isFolder && !storeState.isTableItem) {
             router.push({
-                name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME),
+                name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME,
                 params: {
                     group: route.params.group,
                 },

apps/web/src/services/advanced/components/BookmarkDetailContainer.vue

@@ -16,8 +16,6 @@ import type { MenuItem } from '@cloudforet/mirinae/src/controls/context-menu/typ
 import type { WorkspaceModel } from '@/schema/identity/workspace/model';
 import { i18n } from '@/translations';
 
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
 import { BOOKMARK_MODAL_TYPE } from '@/common/components/bookmark/constant/constant';
 import { useBookmarkStore } from '@/common/components/bookmark/store/bookmark-store';
 import type { BookmarkModalType, BookmarkItem } from '@/common/components/bookmark/type/type';
@@ -28,7 +26,7 @@ import { gray } from '@/styles/colors';
 
 import { getWorkspaceInfo, workspaceStateFormatter } from '@/services/advanced/composables/refined-table-data';
 import { WORKSPACE_STATE } from '@/services/advanced/constants/workspace-constant';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
 import { useBookmarkPageStore } from '@/services/advanced/store/bookmark-page-store';
 import { WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/route-constant';
 
@@ -90,7 +88,7 @@ const handleClickCreateButton = () => {
 };
 const handleClickGoBackButton = () => {
     router.push({
-        name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME),
+        name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME,
         params: {
             group: state.group,
         },
@@ -107,7 +105,7 @@ const handleClickWorkspaceButton = () => {
         return;
     }
     window.open(router.resolve({
-        name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME),
+        name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME,
     }).href, '_blank');
 };
 const handleClickDeleteButton = () => {

apps/web/src/services/advanced/components/BookmarkLSB.vue

@@ -10,8 +10,6 @@ import {
 
 import { i18n } from '@/translations';
 
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
 import type { BookmarkItem } from '@/common/components/bookmark/type/type';
 import LSB from '@/common/modules/navigations/lsb/LSB.vue';
 import LSBRouterMenuItem from '@/common/modules/navigations/lsb/modules/LSBRouterMenuItem.vue';
@@ -21,7 +19,7 @@ import { MENU_ITEM_TYPE } from '@/common/modules/navigations/lsb/type';
 import { gray } from '@/styles/colors';
 
 import BookmarkTree from '@/services/advanced/components/BookmarkTree.vue';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
 import { useBookmarkPageStore } from '@/services/advanced/store/bookmark-page-store';
 
 const bookmarkPageStore = useBookmarkPageStore();
@@ -41,7 +39,7 @@ const state = reactive({
             type: MENU_ITEM_TYPE.ITEM,
             label: i18n.t('IAM.BOOKMARK.ALL_BOOKMARK'),
             icon: 'ic_dots-4-square',
-            to: { name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK._NAME) },
+            to: { name: ADMIN_ADVANCED_ROUTE.BOOKMARK._NAME },
             hideFavorite: true,
         },
         {
@@ -67,7 +65,7 @@ const state = reactive({
             id: folder.id,
             icon: { name: 'ic_folder', color: gray[900] },
             to: {
-                name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME),
+                name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME,
                 params: {
                     group: folder.workspaceId || 'global',
                     folder: folder.name as string || '',

apps/web/src/services/advanced/components/BookmarkManagementDetailTable.vue

@@ -16,8 +16,6 @@ import type {
 
 import { i18n } from '@/translations';
 
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
 import { BOOKMARK_MODAL_TYPE } from '@/common/components/bookmark/constant/constant';
 import { useBookmarkStore } from '@/common/components/bookmark/store/bookmark-store';
 import type { BookmarkItem } from '@/common/components/bookmark/type/type';
@@ -27,7 +25,7 @@ import { gray } from '@/styles/colors';
 
 import { makeSearchQueryTagsHandler, makeValueHandler } from '@/services/advanced/composables/bookmark-data-helper';
 import { BOOKMARK_TYPE, PageSizeOptions } from '@/services/advanced/constants/bookmark-constant';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
 import { useBookmarkPageStore } from '@/services/advanced/store/bookmark-page-store';
 
 const bookmarkStore = useBookmarkStore();
@@ -161,7 +159,7 @@ const handleClickName = (item: BookmarkItem) => {
         return;
     }
     router.push({
-        name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME),
+        name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME,
         params: {
             group: item.workspaceId || 'global',
             folder: item.name as string || '',