diff --git a/apps/web/src/common/modules/workspace/WorkspaceSelectDropdown.vue b/apps/web/src/common/modules/workspace/WorkspaceSelectDropdown.vue
index 233b4bd439..3871f1a5b6 100644
--- a/apps/web/src/common/modules/workspace/WorkspaceSelectDropdown.vue
+++ b/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) => {
{{ $t('IAM.USER.FORM.CREATE_WORKSPACE') }}
diff --git a/apps/web/src/lib/menu/menu-info.ts b/apps/web/src/lib/menu/menu-info.ts
index aa8bde216f..3139f77ef9 100644
--- a/apps/web/src/lib/menu/menu-info.ts
+++ b/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 = 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 = 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 = 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 = 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',
},
diff --git a/apps/web/src/router/alert-manager-v1-integral-routes.ts b/apps/web/src/router/alert-manager-v1-integral-routes.ts
index 0912dc48a3..13641db1e0 100644
--- a/apps/web/src/router/alert-manager-v1-integral-routes.ts
+++ b/apps/web/src/router/alert-manager-v1-integral-routes.ts
@@ -5,7 +5,6 @@ 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';
@@ -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';
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: '' },
children: [
diff --git a/apps/web/src/router/helpers/route-helper.ts b/apps/web/src/router/helpers/route-helper.ts
index 0bd39dc297..445455e9e7 100644
--- a/apps/web/src/router/helpers/route-helper.ts
+++ b/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;
}
diff --git a/apps/web/src/router/integral-routes.ts b/apps/web/src/router/integral-routes.ts
index c34af5e885..106e74ef15 100644
--- a/apps/web/src/router/integral-routes.ts
+++ b/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: '' },
children: [
diff --git a/apps/web/src/services/advanced/components/BookmarkContainer.vue b/apps/web/src/services/advanced/components/BookmarkContainer.vue
index e486d28e01..e14c5a8a23 100644
--- a/apps/web/src/services/advanced/components/BookmarkContainer.vue
+++ b/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,
},
diff --git a/apps/web/src/services/advanced/components/BookmarkDetailContainer.vue b/apps/web/src/services/advanced/components/BookmarkDetailContainer.vue
index 7894e19788..b95769853f 100644
--- a/apps/web/src/services/advanced/components/BookmarkDetailContainer.vue
+++ b/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 = () => {
diff --git a/apps/web/src/services/advanced/components/BookmarkLSB.vue b/apps/web/src/services/advanced/components/BookmarkLSB.vue
index 14372e453c..b51cf3105d 100644
--- a/apps/web/src/services/advanced/components/BookmarkLSB.vue
+++ b/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 || '',
diff --git a/apps/web/src/services/advanced/components/BookmarkManagementDetailTable.vue b/apps/web/src/services/advanced/components/BookmarkManagementDetailTable.vue
index 5f2e0d1732..996564c85f 100644
--- a/apps/web/src/services/advanced/components/BookmarkManagementDetailTable.vue
+++ b/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 || '',
diff --git a/apps/web/src/services/advanced/components/BookmarkManagementTable.vue b/apps/web/src/services/advanced/components/BookmarkManagementTable.vue
index dd95d0cac4..95eee7fdd9 100644
--- a/apps/web/src/services/advanced/components/BookmarkManagementTable.vue
+++ b/apps/web/src/services/advanced/components/BookmarkManagementTable.vue
@@ -13,13 +13,12 @@ import type { KeyItemSet, ValueHandlerMap, ValueItem } from '@cloudforet/mirinae
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 { BookmarkItem } from '@/common/components/bookmark/type/type';
import WorkspaceLogoIcon from '@/common/modules/navigations/top-bar/modules/top-bar-header/WorkspaceLogoIcon.vue';
+
import { gray } from '@/styles/colors';
import {
@@ -31,7 +30,7 @@ import {
} from '@/services/advanced/composables/refined-table-data';
import { BOOKMARK_TYPE, PageSizeOptions } from '@/services/advanced/constants/bookmark-constant';
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';
@@ -168,7 +167,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 || '',
diff --git a/apps/web/src/services/advanced/components/BookmarkTree.vue b/apps/web/src/services/advanced/components/BookmarkTree.vue
index f0087b2b73..557369909a 100644
--- a/apps/web/src/services/advanced/components/BookmarkTree.vue
+++ b/apps/web/src/services/advanced/components/BookmarkTree.vue
@@ -9,8 +9,6 @@ import { PI, PTreeView, PTextButton } from '@cloudforet/mirinae';
import type { WorkspaceModel } from '@/schema/identity/workspace/model';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import type { BookmarkItem } from '@/common/components/bookmark/type/type';
import { useGnbStore } from '@/common/modules/navigations/stores/gnb-store';
import WorkspaceLogoIcon from '@/common/modules/navigations/top-bar/modules/top-bar-header/WorkspaceLogoIcon.vue';
@@ -19,7 +17,7 @@ import type { Breadcrumb } from '@/common/modules/page-layouts/type';
import { gray } from '@/styles/colors';
import { getWorkspaceInfo } from '@/services/advanced/composables/refined-table-data';
-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 type { TreeNode } from '@/services/project-v1/tree/type';
@@ -48,7 +46,7 @@ const state = reactive({
allPaths.push({
name: state.group === 'global' ? i18n.t('IAM.BOOKMARK.GLOBAL_BOOKMARK') : workspaceItem?.name || '',
to: {
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME,
params: {
group: state.group,
},
@@ -59,7 +57,7 @@ const state = reactive({
allPaths.push({
name: state.folder,
to: {
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME,
params: {
group: state.group,
folder: state.folder,
@@ -72,13 +70,13 @@ const state = reactive({
{
name: i18n.t('MENU.ADMINISTRATION_ADVANCED'),
to: {
- name: makeAdminRouteName(ADVANCED_ROUTE._NAME),
+ name: ADMIN_ADVANCED_ROUTE._NAME,
},
},
{
name: i18n.t('MENU.ADMINISTRATION_BOOKMARK'),
to: {
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK._NAME,
},
},
...allPaths,
@@ -96,7 +94,7 @@ const convertBookmarkItemsToTreeNodes = (allBookmarkFolderItems: BookmarkItem[])
id: cur,
name: cur,
to: {
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME,
params: {
group: cur,
},
@@ -116,7 +114,7 @@ const convertBookmarkItemsToTreeNodes = (allBookmarkFolderItems: BookmarkItem[])
id: item.id,
name: item.name,
to: {
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME,
params: {
group: item.workspaceId || 'global',
folder: item.name,
@@ -135,7 +133,7 @@ const convertBookmarkItemsToTreeNodes = (allBookmarkFolderItems: BookmarkItem[])
id: item.workspaceId,
name: item.workspaceId,
to: {
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME,
params: {
group: item.workspaceId,
},
@@ -159,7 +157,7 @@ const convertBookmarkItemsToTreeNodes = (allBookmarkFolderItems: BookmarkItem[])
id: 'global',
name: i18n.t('IAM.BOOKMARK.GLOBAL_BOOKMARK'),
to: {
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME,
params: {
group: 'global',
},
diff --git a/apps/web/src/services/advanced/components/PreferencesContainer.vue b/apps/web/src/services/advanced/components/PreferencesContainer.vue
index 1ee63ecb7c..2f6eb078ca 100644
--- a/apps/web/src/services/advanced/components/PreferencesContainer.vue
+++ b/apps/web/src/services/advanced/components/PreferencesContainer.vue
@@ -9,11 +9,9 @@ import {
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useDomainConfigStore } from '@/store/config/domain-config-store';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
const domainConfigStore = useDomainConfigStore();
@@ -23,9 +21,9 @@ const route = useRoute();
const state = reactive({
headingTitle: computed(() => {
let title: TranslateResult = '';
- if (route.name === makeAdminRouteName(ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME)) {
+ if (route.name === ADMIN_ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME) {
title = i18n.t('IAM.DOMAIN_SETTINGS.DOMAIN_INFORMATION');
- } else if (route.name === makeAdminRouteName(ADVANCED_ROUTE.PREFERENCES.APPEARANCE._NAME)) {
+ } else if (route.name === ADMIN_ADVANCED_ROUTE.PREFERENCES.APPEARANCE._NAME) {
title = i18n.t('IAM.DOMAIN_SETTINGS.APPEARANCE');
}
return title;
diff --git a/apps/web/src/services/advanced/components/PreferencesLSB.vue b/apps/web/src/services/advanced/components/PreferencesLSB.vue
index c5b6fe2d72..cd5484cbb2 100644
--- a/apps/web/src/services/advanced/components/PreferencesLSB.vue
+++ b/apps/web/src/services/advanced/components/PreferencesLSB.vue
@@ -3,26 +3,24 @@ import { computed, reactive } from 'vue';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import LSB from '@/common/modules/navigations/lsb/LSB.vue';
import { MENU_ITEM_TYPE } from '@/common/modules/navigations/lsb/type';
import type { LSBItem } from '@/common/modules/navigations/lsb/type';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
const state = reactive({
menuSet: computed(() => [
{
type: MENU_ITEM_TYPE.ITEM,
label: i18n.t('IAM.DOMAIN_SETTINGS.DOMAIN_INFORMATION'),
- to: { name: makeAdminRouteName(ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME) },
+ to: { name: ADMIN_ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME },
hideFavorite: true,
},
{
type: MENU_ITEM_TYPE.ITEM,
label: i18n.t('IAM.DOMAIN_SETTINGS.APPEARANCE'),
- to: { name: makeAdminRouteName(ADVANCED_ROUTE.PREFERENCES.APPEARANCE._NAME) },
+ to: { name: ADMIN_ADVANCED_ROUTE.PREFERENCES.APPEARANCE._NAME },
hideFavorite: true,
},
]),
diff --git a/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue b/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue
index b9afdf453d..6f3e531b95 100644
--- a/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue
+++ b/apps/web/src/services/advanced/pages/admin/AdminDomainSettingsAutoDormancyConfigurationPage.vue
@@ -19,7 +19,6 @@ import { DOMAIN_CONFIG_NAMES } from '@/schema/config/domain-config/constant';
import type { DomainConfigModel } from '@/schema/config/domain-config/model';
import { i18n as _i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
import { CURRENCY_SYMBOL } from '@/store/display/constant';
import type { Currency } from '@/store/display/type';
@@ -31,7 +30,7 @@ import { useFormValidator } from '@/common/composables/form-validator';
import { usePageEditableStatus } from '@/common/composables/page-editable-status';
import type { DormancyConfig } from '@/services/advanced/types/preferences-type';
-import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
+import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
const router = useRouter();
@@ -77,7 +76,7 @@ const handleUpdateCost = (value?: string) => {
};
const handleClickReportButton = () => {
window.open(router.resolve({
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_REPORT._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_REPORT._NAME,
}).href, '_blank');
};
const handleChangeToggleButton = async (value: boolean) => {
diff --git a/apps/web/src/services/advanced/routes/admin/route-constant.ts b/apps/web/src/services/advanced/routes/admin/route-constant.ts
new file mode 100644
index 0000000000..0d9668e379
--- /dev/null
+++ b/apps/web/src/services/advanced/routes/admin/route-constant.ts
@@ -0,0 +1,21 @@
+import { MENU_ID } from '@/lib/menu/config';
+
+export const ADMIN_ADVANCED_ROUTE = {
+ _NAME: `admin.${MENU_ID.ADVANCED}`,
+ WORKSPACES: { _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.WORKSPACES}` },
+ WORKSPACE_GROUP: { _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.WORKSPACE_GROUP}` },
+ PREFERENCES: {
+ _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.PREFERENCES}`,
+ DOMAIN_INFORMATION: { _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.PREFERENCES}.domain_information` },
+ APPEARANCE: { _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.PREFERENCES}.appearance` },
+ },
+ BOOKMARK: {
+ _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.BOOKMARK}`,
+ DETAIL: {
+ _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.BOOKMARK}.detail`,
+ GROUP: { _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.BOOKMARK}.detail.group` },
+ FOLDER: { _NAME: `admin.${MENU_ID.ADVANCED}.${MENU_ID.BOOKMARK}.detail.folder` },
+ },
+ },
+ AUTO_DORMANCY_CONFIGURATION: { _NAME: `admin.${MENU_ID.ADVANCED}.auto_dormancy_configuration` },
+} as const;
diff --git a/apps/web/src/services/advanced/routes/admin/routes.ts b/apps/web/src/services/advanced/routes/admin/routes.ts
index a8416c76c1..72a235ab80 100644
--- a/apps/web/src/services/advanced/routes/admin/routes.ts
+++ b/apps/web/src/services/advanced/routes/admin/routes.ts
@@ -1,11 +1,9 @@
import type { RouteConfig } from 'vue-router';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { MENU_ID } from '@/lib/menu/config';
import { MENU_INFO_MAP } from '@/lib/menu/menu-info';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
const AdvancedContainer = () => import('@/services/advanced/AdvancedContainer.vue');
const DomainSettingsContainer = () => import('@/services/advanced/components/PreferencesContainer.vue');
@@ -21,19 +19,19 @@ const BookmarkDetailPage = () => import('@/services/advanced/pages/admin/AdminBo
const adminAdvancedRoutes: RouteConfig = {
path: 'advanced',
- name: makeAdminRouteName(ADVANCED_ROUTE._NAME),
+ name: ADMIN_ADVANCED_ROUTE._NAME,
meta: {
menuId: MENU_ID.ADVANCED,
translationId: MENU_INFO_MAP[MENU_ID.ADVANCED].translationId,
},
redirect: () => ({
- name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME),
+ name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME,
}),
component: AdvancedContainer,
children: [
{
path: 'workspaces',
- name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME),
+ name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME,
meta: {
menuId: MENU_ID.WORKSPACES,
translationId: MENU_INFO_MAP[MENU_ID.WORKSPACES].translationId,
@@ -42,7 +40,7 @@ const adminAdvancedRoutes: RouteConfig = {
},
{
path: 'workspace-group',
- name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACE_GROUP._NAME),
+ name: ADMIN_ADVANCED_ROUTE.WORKSPACE_GROUP._NAME,
meta: {
menuId: MENU_ID.WORKSPACE_GROUP,
translationId: MENU_INFO_MAP[MENU_ID.WORKSPACE_GROUP].translationId,
@@ -51,7 +49,7 @@ const adminAdvancedRoutes: RouteConfig = {
},
{
path: 'bookmark',
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK._NAME,
meta: {
lsbVisible: true,
menuId: MENU_ID.BOOKMARK,
@@ -61,7 +59,7 @@ const adminAdvancedRoutes: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK._NAME,
meta: { lsbVisible: true, menuId: MENU_ID.BOOKMARK },
props: true,
component: BookmarkPage,
@@ -73,14 +71,14 @@ const adminAdvancedRoutes: RouteConfig = {
children: [
{
path: ':group?',
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.GROUP._NAME,
meta: { lsbVisible: true },
props: true,
component: BookmarkDetailPage,
children: [
{
path: ':folder?',
- name: makeAdminRouteName(ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME),
+ name: ADMIN_ADVANCED_ROUTE.BOOKMARK.DETAIL.FOLDER._NAME,
meta: { lsbVisible: true },
props: true,
component: BookmarkDetailPage,
@@ -93,26 +91,26 @@ const adminAdvancedRoutes: RouteConfig = {
},
{
path: 'preferences',
- name: makeAdminRouteName(ADVANCED_ROUTE.PREFERENCES._NAME),
+ name: ADMIN_ADVANCED_ROUTE.PREFERENCES._NAME,
meta: {
menuId: MENU_ID.PREFERENCES,
lsbVisible: true,
translationId: MENU_INFO_MAP[MENU_ID.PREFERENCES].translationId,
},
redirect: () => ({
- name: makeAdminRouteName(ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME),
+ name: ADMIN_ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME,
}),
component: DomainSettingsContainer,
children: [
{
path: 'domain-information',
- name: makeAdminRouteName(ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME),
+ name: ADMIN_ADVANCED_ROUTE.PREFERENCES.DOMAIN_INFORMATION._NAME,
meta: { lsbVisible: true, translationId: MENU_INFO_MAP[MENU_ID.DOMAIN_INFORMATION].translationId },
component: AdminDomainSettingsBaseInformationPage,
},
{
path: 'appearance',
- name: makeAdminRouteName(ADVANCED_ROUTE.PREFERENCES.APPEARANCE._NAME),
+ name: ADMIN_ADVANCED_ROUTE.PREFERENCES.APPEARANCE._NAME,
meta: { lsbVisible: true, translationId: MENU_INFO_MAP[MENU_ID.APPEARANCE].translationId },
component: AdminDomainSettingsBrandAssetsPage,
},
@@ -120,7 +118,7 @@ const adminAdvancedRoutes: RouteConfig = {
},
{
path: 'auto-dormancy-configuration',
- name: makeAdminRouteName(ADVANCED_ROUTE.AUTO_DORMANCY_CONFIGURATION._NAME),
+ name: ADMIN_ADVANCED_ROUTE.AUTO_DORMANCY_CONFIGURATION._NAME,
meta: { menuId: MENU_ID.AUTO_DORMANCY_CONFIGURATION, translationId: MENU_INFO_MAP[MENU_ID.AUTO_DORMANCY_CONFIGURATION].translationId },
component: AdminDomainSettingsAutoDormancyConfigurationPage,
},
diff --git a/apps/web/src/services/advanced/routes/route-constant.ts b/apps/web/src/services/advanced/routes/route-constant.ts
deleted file mode 100644
index 83ccdd8f49..0000000000
--- a/apps/web/src/services/advanced/routes/route-constant.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { MENU_ID } from '@/lib/menu/config';
-
-export const ADVANCED_ROUTE = {
- _NAME: `${MENU_ID.ADVANCED}`,
- WORKSPACES: { _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.WORKSPACES}` },
- WORKSPACE_GROUP: { _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.WORKSPACE_GROUP}` },
- PREFERENCES: {
- _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.PREFERENCES}`,
- DOMAIN_INFORMATION: { _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.PREFERENCES}.domain_information` },
- APPEARANCE: { _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.PREFERENCES}.appearance` },
- },
- BOOKMARK: {
- _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.BOOKMARK}`,
- DETAIL: {
- _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.BOOKMARK}.detail`,
- GROUP: { _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.BOOKMARK}.detail.group` },
- FOLDER: { _NAME: `${MENU_ID.ADVANCED}.${MENU_ID.BOOKMARK}.detail.folder` },
- },
- },
- AUTO_DORMANCY_CONFIGURATION: { _NAME: `${MENU_ID.ADVANCED}.auto_dormancy_configuration` },
-} as const;
diff --git a/apps/web/src/services/asset-inventory-v1/components/CloudServiceLSB.vue b/apps/web/src/services/asset-inventory-v1/components/CloudServiceLSB.vue
index 4e6f9569f3..423b56ab37 100644
--- a/apps/web/src/services/asset-inventory-v1/components/CloudServiceLSB.vue
+++ b/apps/web/src/services/asset-inventory-v1/components/CloudServiceLSB.vue
@@ -12,8 +12,6 @@ import {
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useAllReferenceStore } from '@/store/reference/all-reference-store';
import type { ProviderReferenceMap } from '@/store/reference/provider-reference-store';
import { useUserStore } from '@/store/user/user-store';
@@ -30,6 +28,7 @@ import {
CLOUD_SERVICE_FILTER_KEY,
CLOUD_SERVICE_GLOBAL_FILTER_KEY, UNIDENTIFIED_PROVIDER,
} from '@/services/asset-inventory-v1/constants/cloud-service-constant';
+import { ADMIN_ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/admin/route-constant';
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
import { useCloudServiceDetailPageStore } from '@/services/asset-inventory-v1/stores/cloud-service-detail-page-store';
import { useCloudServicePageStore } from '@/services/asset-inventory-v1/stores/cloud-service-page-store';
@@ -60,7 +59,7 @@ const storeState = reactive({
const state = reactive({
currentPath: computed(() => route.fullPath),
isCloudServiceDetailPage: computed(() => route.name === ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME
- || route.name === makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME)),
+ || route.name === ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME),
detailPageParams: computed(() => {
if (state.isCloudServiceDetailPage) return route.params as unknown as CloudServiceDetailPageParams;
return undefined;
diff --git a/apps/web/src/services/asset-inventory-v1/components/WorkspaceDropdown.vue b/apps/web/src/services/asset-inventory-v1/components/WorkspaceDropdown.vue
index 49248584bc..f17fbbcf0f 100644
--- a/apps/web/src/services/asset-inventory-v1/components/WorkspaceDropdown.vue
+++ b/apps/web/src/services/asset-inventory-v1/components/WorkspaceDropdown.vue
@@ -13,14 +13,12 @@ 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 ErrorHandler from '@/common/composables/error/errorHandler';
import WorkspaceLogoIcon from '@/common/modules/navigations/top-bar/modules/top-bar-header/WorkspaceLogoIcon.vue';
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 PAGE_SIZE = 10;
@@ -95,7 +93,7 @@ const handleClickReloadButton = async () => {
};
const handleClickCreateButton = () => {
- window.open(router.resolve({ name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME) }).href);
+ window.open(router.resolve({ name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME }).href);
};
const handleClickShowMore = async () => {
diff --git a/apps/web/src/services/asset-inventory-v1/pages/CollectorDetailPage.vue b/apps/web/src/services/asset-inventory-v1/pages/CollectorDetailPage.vue
index 16f92777e1..38b3a30794 100644
--- a/apps/web/src/services/asset-inventory-v1/pages/CollectorDetailPage.vue
+++ b/apps/web/src/services/asset-inventory-v1/pages/CollectorDetailPage.vue
@@ -41,8 +41,6 @@ import type { CollectorGetParameters } from '@/schema/inventory/collector/api-ve
import type { CollectorModel } from '@/schema/inventory/collector/model';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useUserStore } from '@/store/user/user-store';
import type { PageAccessMap } from '@/lib/access-control/config';
@@ -67,6 +65,7 @@ import CollectorScheduleSection from '@/services/asset-inventory-v1/components/C
import CollectorServiceAccountsSection
from '@/services/asset-inventory-v1/components/CollectorDetailServiceAccountsSection.vue';
import { COLLECT_DATA_TYPE } from '@/services/asset-inventory-v1/constants/collector-constant';
+import { ADMIN_ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/admin/route-constant';
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
import {
useCollectorDataModalStore,
@@ -76,7 +75,6 @@ import { useCollectorFormStore } from '@/services/asset-inventory-v1/stores/coll
import { useCollectorJobStore } from '@/services/asset-inventory-v1/stores/collector-job-store';
import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
-
const props = defineProps<{
collectorId: string;
}>();
@@ -264,7 +262,7 @@ onUnmounted(() => {
{
state.deleteModalVisible = true;
diff --git a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorDetailPage.vue b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorDetailPage.vue
index 4ddff2d053..59d931a39d 100644
--- a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorDetailPage.vue
+++ b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorDetailPage.vue
@@ -121,8 +121,6 @@ import type { CollectorGetParameters } from '@/schema/inventory/collector/api-ve
import type { CollectorModel } from '@/schema/inventory/collector/model';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useUserStore } from '@/store/user/user-store';
import type { PageAccessMap } from '@/lib/access-control/config';
@@ -132,7 +130,6 @@ import { MENU_ID } from '@/lib/menu/config';
import ErrorHandler from '@/common/composables/error/errorHandler';
import { useGoBack } from '@/common/composables/go-back';
-import { useProperRouteLocation } from '@/common/composables/proper-route-location';
import CollectorAdditionalRule from '@/services/asset-inventory-v1/components/CollectorAdditionalRule.vue';
import CollectorBaseInfoSection from '@/services/asset-inventory-v1/components/CollectorBaseInfoSection.vue';
@@ -146,7 +143,7 @@ import CollectorOptionsSection
from '@/services/asset-inventory-v1/components/CollectorDetailOptionsSection.vue';
import CollectorScheduleSection from '@/services/asset-inventory-v1/components/CollectorDetailScheduleSection.vue';
import { COLLECT_DATA_TYPE } from '@/services/asset-inventory-v1/constants/collector-constant';
-import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
+import { ADMIN_ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/admin/route-constant';
import {
useCollectorDataModalStore,
} from '@/services/asset-inventory-v1/stores/collector-data-modal-store';
@@ -183,8 +180,6 @@ watch(() => collectorFormState.originCollector, async (collector) => {
}
});
-const { getProperRouteLocation } = useProperRouteLocation();
-
const queryHelper = new QueryHelper();
const storeState = reactive({
@@ -206,7 +201,7 @@ const state = reactive({
collector: computed(() => collectorFormState.originCollector),
collectorName: computed(() => state.collector?.name ?? ''),
collectorHistoryLink: computed(() => ({
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.COLLECTOR.HISTORY._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR.HISTORY._NAME,
query: {
filters: queryHelper.setFilters([
{
@@ -222,7 +217,7 @@ const state = reactive({
editModalVisible: false,
});
-const { setPathFrom, handleClickBackButton } = useGoBack({ name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME) });
+const { setPathFrom, handleClickBackButton } = useGoBack({ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME });
defineExpose({ setPathFrom });
@@ -245,9 +240,9 @@ const fetchDeleteCollector = async () => (collectorFormState.collectorId ? Space
}) : undefined);
const goBackToMainPage = () => {
- SpaceRouter.router.push(getProperRouteLocation({
- name: ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME,
- }));
+ SpaceRouter.router.push({
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME,
+ });
};
const handleClickEditButton = () => {
diff --git a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorHistoryPage.vue b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorHistoryPage.vue
index 0e74b61135..4a4affc7cb 100644
--- a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorHistoryPage.vue
+++ b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorHistoryPage.vue
@@ -28,7 +28,6 @@ import type { JobModel } from '@/schema/inventory/job/model';
import { i18n } from '@/translations';
import { ROOT_ROUTE } from '@/router/constant';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
import { useAllReferenceStore } from '@/store/reference/all-reference-store';
import type { CollectorReferenceMap } from '@/store/reference/collector-reference-store';
@@ -49,12 +48,15 @@ import {
statusTextColorFormatter,
statusTextFormatter,
} from '@/services/asset-inventory-v1/helpers/collector-history-formatter-helper';
+import { ADMIN_ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/admin/route-constant';
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
import { JOB_SELECTED_STATUS } from '@/services/asset-inventory-v1/types/collector-history-page-type';
const COLLECTOR_DETAIL_ROUTE = ASSET_INVENTORY_ROUTE_V1.COLLECTOR.DETAIL._NAME;
+const ADMIN_COLLECTOR_DETAIL_ROUTE = ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR.DETAIL._NAME;
const WORKSPACE_HOME_ROUTE = ROOT_ROUTE.WORKSPACE._NAME;
+const ADMIN_HOME_ROUTE = ROOT_ROUTE.ADMIN._NAME;
const allReferenceStore = useAllReferenceStore();
const userStore = useUserStore();
@@ -145,7 +147,7 @@ const getQuery = () => {
/* Components */
const handleSelect = (item) => {
SpaceRouter.router.push({
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.COLLECTOR.HISTORY.JOB._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR.HISTORY.JOB._NAME,
params: { jobId: item.job_id },
}).catch(() => {});
};
@@ -218,7 +220,7 @@ const getLocation = ({ workspaceId, collectorId, target }: {workspaceId:string,
if (collectorId) routeParams.collectorId = collectorId;
if (!isAdminCenter) routeParams.workspaceId = workspaceId;
return ({
- name: isAdminCenter ? makeAdminRouteName(target) : target,
+ name: target,
params: routeParams,
});
};
@@ -286,7 +288,7 @@ watch(() => state.selectedStatus, (selectedStatus) => {
state.selectedStatus, (selectedStatus) => {
state.selectedStatus, (selectedStatus) => {
diff --git a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorMainPage.vue b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorMainPage.vue
index 76a70197c9..7c9b9cd3f6 100644
--- a/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorMainPage.vue
+++ b/apps/web/src/services/asset-inventory-v1/pages/admin/AdminCollectorMainPage.vue
@@ -18,8 +18,6 @@ import { SpaceRouter } from '@/router';
import type { CollectorListParameters } from '@/schema/inventory/collector/api-verbs/list';
import type { CollectorModel } from '@/schema/inventory/collector/model';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useAllReferenceStore } from '@/store/reference/all-reference-store';
import type { ProviderReferenceMap } from '@/store/reference/provider-reference-store';
@@ -30,7 +28,7 @@ import ErrorHandler from '@/common/composables/error/errorHandler';
import CollectorContents from '@/services/asset-inventory-v1/components/CollectorMainContents.vue';
import CollectorNoData from '@/services/asset-inventory-v1/components/CollectorMainNoData.vue';
import ProviderList from '@/services/asset-inventory-v1/components/ProviderList.vue';
-import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
+import { ADMIN_ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/admin/route-constant';
import { useCollectorPageStore } from '@/services/asset-inventory-v1/stores/collector-page-store';
import type {
CollectorMainPageQuery,
@@ -124,7 +122,7 @@ onMounted(async () => {
import('@/services/asset-inventory-v1/AssetInventoryContainer.vue');
@@ -18,8 +16,8 @@ const CloudServiceTypeSearch = () => import('@/services/asset-inventory-v1/pages
const CloudServicePage = () => import('@/services/asset-inventory-v1/pages/CloudServicePage.vue');
const NoResourcePage = () => import('@/common/pages/NoResourcePage.vue');
-const ServerPage = () => import('@/services/asset-inventory-v1/pages/ServerPage.vue');
-const SecurityPage = () => import('@/services/asset-inventory-v1/pages/SecurityPage.vue');
+// const ServerPage = () => import('@/services/asset-inventory-v1/pages/ServerPage.vue');
+// const SecurityPage = () => import('@/services/asset-inventory-v1/pages/SecurityPage.vue');
const MetricExplorerMainPage = () => import('@/services/asset-inventory-v1/pages/MetricExplorerMainPage.vue');
const MetricExplorerDetailPage = () => import('@/services/asset-inventory-v1/pages/MetricExplorerDetailPage.vue');
@@ -37,9 +35,9 @@ const ServiceAccountAddPage = () => import('@/services/asset-inventory-v1/pages/
const adminAssetInventoryRouteV1: RouteConfig = {
path: 'asset-inventory',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1._NAME,
meta: { menuId: MENU_ID.ASSET_INVENTORY, translationId: MENU_INFO_MAP[MENU_ID.ASSET_INVENTORY].translationId },
- redirect: () => ({ name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE._NAME) }),
+ redirect: () => ({ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE._NAME }),
component: AssetInventoryContainer,
children: [
{
@@ -52,25 +50,25 @@ const adminAssetInventoryRouteV1: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE._NAME,
meta: { lsbVisible: true },
component: CloudServicePage as any,
},
{
path: 'search/:searchKey/:id',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.SEARCH._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.SEARCH._NAME,
props: true,
component: CloudServiceSearch,
},
{
path: 'type/search/:id',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.TYPE_SEARCH._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.TYPE_SEARCH._NAME,
props: true,
component: CloudServiceTypeSearch,
},
{
path: 'no-resource',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.NO_RESOURCE._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.NO_RESOURCE._NAME,
meta: { lsbVisible: true, translationId: 'COMMON.ERROR.NO_RESOURCE_TITLE' },
component: NoResourcePage as any,
},
@@ -81,35 +79,7 @@ const adminAssetInventoryRouteV1: RouteConfig = {
children: [
{
path: ':name?',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME),
- meta: { lsbVisible: true, label: ({ params }) => params.name },
- props: true,
- component: CloudServiceDetailPage as any,
- },
- ],
- },
- ],
- },
- {
- path: 'server',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.SERVER._NAME),
- meta: { menuId: MENU_ID.SERVER, translationId: MENU_INFO_MAP[MENU_ID.SERVER].translationId },
- component: ServerPage as any,
- },
- {
- path: 'security',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.SECURITY._NAME),
- meta: { lsbVisible: true, menuId: MENU_ID.SECURITY, translationId: MENU_INFO_MAP[MENU_ID.SECURITY].translationId },
- component: SecurityPage as any,
- children: [
- {
- path: ':provider/:group',
- meta: { label: ({ params }) => `[${upperCase(params.provider)}] ${params.group}` },
- component: { template: '' },
- children: [
- {
- path: ':name?',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.SECURITY.DETAIL._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME,
meta: { lsbVisible: true, label: ({ params }) => params.name },
props: true,
component: CloudServiceDetailPage as any,
@@ -125,13 +95,13 @@ const adminAssetInventoryRouteV1: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME,
props: true,
component: AdminCollectorMainPage as any,
},
{
path: 'create',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.COLLECTOR.CREATE._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR.CREATE._NAME,
meta: { translationId: 'PLUGIN.COLLECTOR.CREATE.TITLE', centeredLayout: true },
component: AdminCollectorCreatePage as any,
},
@@ -142,12 +112,12 @@ const adminAssetInventoryRouteV1: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.COLLECTOR.HISTORY._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR.HISTORY._NAME,
component: AdminCollectorHistoryPage as any,
},
{
path: ':jobId',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.COLLECTOR.HISTORY.JOB._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR.HISTORY.JOB._NAME,
meta: { label: ({ params }) => params.jobId, copiable: true },
props: true,
component: AdminCollectHistoryJobPage as any,
@@ -156,7 +126,7 @@ const adminAssetInventoryRouteV1: RouteConfig = {
},
{
path: ':collectorId',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.COLLECTOR.DETAIL._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR.DETAIL._NAME,
props: true,
meta: { label: ({ params }) => params.collectorId, copiable: true },
component: AdminCollectorDetailPage as any,
@@ -170,27 +140,27 @@ const adminAssetInventoryRouteV1: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT._NAME,
meta: { menuId: MENU_ID.SERVICE_ACCOUNT },
props: true,
component: ServiceAccountPage as any,
},
{
path: 'no-resource',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.NO_RESOURCE._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.NO_RESOURCE._NAME,
meta: { translationId: 'COMMON.ERROR.NO_RESOURCE_TITLE' },
component: NoResourcePage as any,
},
{
path: ':serviceAccountId',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.DETAIL._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.DETAIL._NAME,
meta: { label: ({ params }) => params.serviceAccountId, copiable: true },
props: true,
component: ServiceAccountDetailPage,
},
{
path: 'add/:provider/:serviceAccountType',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.ADD._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.ADD._NAME,
meta: {
translationId: ({ params }) => (['IDENTITY.SERVICE_ACCOUNT.ADD.TITLE', {
type: ACCOUNT_TYPE_BADGE_OPTION[params.serviceAccountType].label,
@@ -208,20 +178,20 @@ const adminAssetInventoryRouteV1: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER._NAME,
meta: { menuId: MENU_ID.METRIC_EXPLORER, lsbVisible: true },
component: MetricExplorerMainPage as any,
},
{
path: ':metricId',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL._NAME,
meta: { label: ({ params }) => params.metricId, lsbVisible: true },
props: true,
component: { template: '' },
children: [
{
path: '/',
- name: makeAdminRouteName(ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL._NAME),
+ name: ADMIN_ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL._NAME,
meta: { label: ({ params }) => params.metricExampleId, lsbVisible: true },
props: true,
component: MetricExplorerDetailPage as any,
diff --git a/apps/web/src/services/asset-inventory-v1/routes/route-constant.ts b/apps/web/src/services/asset-inventory-v1/routes/route-constant.ts
index ba8d7087c5..98126fe9c3 100644
--- a/apps/web/src/services/asset-inventory-v1/routes/route-constant.ts
+++ b/apps/web/src/services/asset-inventory-v1/routes/route-constant.ts
@@ -32,7 +32,6 @@ export const ASSET_INVENTORY_ROUTE_V1 = Object.freeze({
SERVICE_ACCOUNT: {
_NAME: `${MENU_ID.ASSET_INVENTORY}.${MENU_ID.SERVICE_ACCOUNT}`,
DETAIL: { _NAME: `${MENU_ID.ASSET_INVENTORY}.${MENU_ID.SERVICE_ACCOUNT}.detail` },
- SEARCH: { _NAME: `${MENU_ID.ASSET_INVENTORY}.${MENU_ID.SERVICE_ACCOUNT}.search` },
ADD: { _NAME: `${MENU_ID.ASSET_INVENTORY}.${MENU_ID.SERVICE_ACCOUNT}.add` },
NO_RESOURCE: { _NAME: `${MENU_ID.ASSET_INVENTORY}.${MENU_ID.SERVICE_ACCOUNT}.no_resource` },
},
diff --git a/apps/web/src/services/asset-inventory/components/WorkspaceDropdown.vue b/apps/web/src/services/asset-inventory/components/WorkspaceDropdown.vue
index 49248584bc..f17fbbcf0f 100644
--- a/apps/web/src/services/asset-inventory/components/WorkspaceDropdown.vue
+++ b/apps/web/src/services/asset-inventory/components/WorkspaceDropdown.vue
@@ -13,14 +13,12 @@ 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 ErrorHandler from '@/common/composables/error/errorHandler';
import WorkspaceLogoIcon from '@/common/modules/navigations/top-bar/modules/top-bar-header/WorkspaceLogoIcon.vue';
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 PAGE_SIZE = 10;
@@ -95,7 +93,7 @@ const handleClickReloadButton = async () => {
};
const handleClickCreateButton = () => {
- window.open(router.resolve({ name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME) }).href);
+ window.open(router.resolve({ name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME }).href);
};
const handleClickShowMore = async () => {
diff --git a/apps/web/src/services/cost-explorer/components/AnomalyDetectionConfigurationTable.vue b/apps/web/src/services/cost-explorer/components/AnomalyDetectionConfigurationTable.vue
index 9726c3a21d..7da35c63fc 100644
--- a/apps/web/src/services/cost-explorer/components/AnomalyDetectionConfigurationTable.vue
+++ b/apps/web/src/services/cost-explorer/components/AnomalyDetectionConfigurationTable.vue
@@ -16,7 +16,7 @@ import {
CONFIG_TEMP_DATA,
DETECTION_CONFIGURATION_HANDLERS,
} from '@/services/cost-explorer/constants/anomaly-detection-constant';
-import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
+import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
const allReferenceStore = useAllReferenceStore();
const allReferenceGetters = allReferenceStore.getters;
@@ -58,7 +58,7 @@ const tableState = reactive({
router.getRoutes().filter((r) => r.name?.includes(containerName) && (r.name !== containerName))),
diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisHeader.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisHeader.vue
index 6a72853630..e5a1e22f5c 100644
--- a/apps/web/src/services/cost-explorer/components/CostAnalysisHeader.vue
+++ b/apps/web/src/services/cost-explorer/components/CostAnalysisHeader.vue
@@ -12,8 +12,6 @@ import type { CostQuerySetDeleteParameters } from '@/api-clients/cost-analysis/c
import { SpaceRouter } from '@/router';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useAppContextStore } from '@/store/app-context/app-context-store';
import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store';
import { CURRENCY_SYMBOL } from '@/store/display/constant';
@@ -34,6 +32,7 @@ import { gray } from '@/styles/colors';
import {
DYNAMIC_COST_QUERY_SET_PARAMS,
} from '@/services/cost-explorer/constants/managed-cost-analysis-query-sets';
+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 { useCostAnalysisPageStore } from '@/services/cost-explorer/stores/cost-analysis-page-store';
@@ -123,7 +122,7 @@ const handleDeleteQueryConfirm = async () => {
const handleRouteToUnifiedCostSettings = () => {
router.push({
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.CURRENCY_CONVERTER._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.CURRENCY_CONVERTER._NAME,
}).catch(() => {});
};
diff --git a/apps/web/src/services/cost-explorer/components/CostReportRecipientsCard.vue b/apps/web/src/services/cost-explorer/components/CostReportRecipientsCard.vue
index 54f53160a2..341a2d172c 100644
--- a/apps/web/src/services/cost-explorer/components/CostReportRecipientsCard.vue
+++ b/apps/web/src/services/cost-explorer/components/CostReportRecipientsCard.vue
@@ -15,7 +15,6 @@ import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-rep
import WorkspaceOwnerImage from '@/assets/images/role/img_avatar_workspace-owner.png';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
import { useAppContextStore } from '@/store/app-context/app-context-store';
@@ -25,7 +24,7 @@ import ErrorHandler from '@/common/composables/error/errorHandler';
import CostReportOverviewCardTemplate from '@/services/cost-explorer/components/CostReportOverviewCardTemplate.vue';
import { useCostReportPageStore } from '@/services/cost-explorer/stores/cost-report-page-store';
-import { IAM_ROUTE } from '@/services/iam/routes/route-constant';
+import { ADMIN_IAM_ROUTE } from '@/services/iam/routes/admin/route-constant';
interface Props {
hasReadWriteAccess?: boolean;
@@ -85,7 +84,7 @@ watch(() => costReportPageState.costReportConfig, (costReportConfig) => {
diff --git a/apps/web/src/services/cost-explorer/pages/AnomalyDetectionConfigurationPage.vue b/apps/web/src/services/cost-explorer/pages/AnomalyDetectionConfigurationPage.vue
index a244a7afee..7f0682c6b8 100644
--- a/apps/web/src/services/cost-explorer/pages/AnomalyDetectionConfigurationPage.vue
+++ b/apps/web/src/services/cost-explorer/pages/AnomalyDetectionConfigurationPage.vue
@@ -5,7 +5,7 @@ import { PHeading, PButton, PHeadingLayout } from '@cloudforet/mirinae';
import AnomalyDetectionConfigurationTable
from '@/services/cost-explorer/components/AnomalyDetectionConfigurationTable.vue';
-import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
+import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
const router = useRouter();
@@ -18,7 +18,7 @@ const router = useRouter();
{{ $t('BILLING.COST_MANAGEMENT.ANOMALY_DETECTION.CREATE') }}
diff --git a/apps/web/src/services/cost-explorer/pages/BudgetDetailPage.vue b/apps/web/src/services/cost-explorer/pages/BudgetDetailPage.vue
index ed88429aac..7e920911a1 100644
--- a/apps/web/src/services/cost-explorer/pages/BudgetDetailPage.vue
+++ b/apps/web/src/services/cost-explorer/pages/BudgetDetailPage.vue
@@ -8,8 +8,6 @@ import { ACTION_ICON } from '@cloudforet/mirinae/src/navigation/link/type';
import type { BudgetModel } from '@/api-clients/cost-analysis/budget/schema/model';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useDomainStore } from '@/store/domain/domain-store';
import { useUserStore } from '@/store/user/user-store';
@@ -23,7 +21,7 @@ import BudgetDetailNotifications
from '@/services/cost-explorer/components/BudgetDetailNotifications.vue';
import BudgetDetailSummary
from '@/services/cost-explorer/components/BudgetDetailSummary.vue';
-import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
+import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
import { useBudgetDetailPageStore } from '@/services/cost-explorer/stores/budget-detail-page-store';
@@ -43,7 +41,7 @@ const state = reactive({
budgetData: computed(() => budgetPageState.budgetData),
isWorkspaceTarget: computed(() => (state.budgetData?.resource_group === 'WORKSPACE')),
adminModeLink: computed(() => ({
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.BUDGET.DETAIL._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.BUDGET.DETAIL._NAME,
params: {
budgetId: state.budgetData?.budget_id,
},
diff --git a/apps/web/src/services/cost-explorer/pages/admin/AdminBudgetMainPage.vue b/apps/web/src/services/cost-explorer/pages/admin/AdminBudgetMainPage.vue
index 289fe03b2d..e9a1fb3105 100644
--- a/apps/web/src/services/cost-explorer/pages/admin/AdminBudgetMainPage.vue
+++ b/apps/web/src/services/cost-explorer/pages/admin/AdminBudgetMainPage.vue
@@ -6,18 +6,17 @@ import {
} from '@cloudforet/mirinae';
import { usePageEditableStatus } from '@/common/composables/page-editable-status';
-import { useProperRouteLocation } from '@/common/composables/proper-route-location';
+
import BudgetMainList from '@/services/cost-explorer/components/BudgetMainList.vue';
-import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
+import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
const router = useRouter();
-const { getProperRouteLocation } = useProperRouteLocation();
const { hasReadWriteAccess } = usePageEditableStatus();
const handleCreateBudgetSelect = () => {
- router.push(getProperRouteLocation({ name: COST_EXPLORER_ROUTE.BUDGET.CREATE._NAME }));
+ router.push({ name: ADMIN_COST_EXPLORER_ROUTE.BUDGET.CREATE._NAME });
};
diff --git a/apps/web/src/services/cost-explorer/routes/admin/route-constant.ts b/apps/web/src/services/cost-explorer/routes/admin/route-constant.ts
new file mode 100644
index 0000000000..2592012411
--- /dev/null
+++ b/apps/web/src/services/cost-explorer/routes/admin/route-constant.ts
@@ -0,0 +1,29 @@
+import { MENU_ID } from '@/lib/menu/config';
+
+export const ADMIN_COST_EXPLORER_ROUTE = {
+ _NAME: `admin.${MENU_ID.COST_EXPLORER}`,
+ COST_ANALYSIS: {
+ _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_ANALYSIS}`,
+ QUERY_SET: { _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_ANALYSIS}.query_set` },
+ },
+ BUDGET: {
+ _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.BUDGET}`,
+ DETAIL: { _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.BUDGET}.detail` },
+ CREATE: { _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.BUDGET}.create` },
+ UPDATE: { _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.BUDGET}.update` },
+ },
+ COST_REPORT: {
+ _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_REPORT}`,
+ },
+ DATA_SOURCES: {
+ _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.DATA_SOURCES}`,
+ },
+ LANDING: {
+ _NAME: `admin.${MENU_ID.COST_EXPLORER}.landing`,
+ },
+ COST_ADVANCED_SETTINGS: {
+ _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_ADVANCED_SETTINGS}`,
+ ANOMALY_DETECTION_DOMAIN_CONFIGURATION: { _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_ADVANCED_SETTINGS}.${MENU_ID.ANOMALY_DETECTION_DOMAIN_CONFIGURATION}` },
+ CURRENCY_CONVERTER: { _NAME: `admin.${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_ADVANCED_SETTINGS}.${MENU_ID.CURRENCY_CONVERTER}` },
+ },
+} as const;
diff --git a/apps/web/src/services/cost-explorer/routes/admin/routes.ts b/apps/web/src/services/cost-explorer/routes/admin/routes.ts
index e02fc0f6fc..00aa25ca82 100644
--- a/apps/web/src/services/cost-explorer/routes/admin/routes.ts
+++ b/apps/web/src/services/cost-explorer/routes/admin/routes.ts
@@ -6,8 +6,6 @@ import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
import type { CostDataSourceListParameters } from '@/api-clients/cost-analysis/data-source/schema/api-verbs/list';
import type { DataSourceModel } from '@/schema/monitoring/data-source/model';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { MENU_ID } from '@/lib/menu/config';
import { MENU_INFO_MAP } from '@/lib/menu/menu-info';
@@ -16,7 +14,7 @@ import ErrorHandler from '@/common/composables/error/errorHandler';
import { UNIFIED_COST_KEY } from '@/services/cost-explorer/constants/cost-explorer-constant';
import { DYNAMIC_COST_QUERY_SET_PARAMS, MANAGED_COST_QUERY_SET_IDS } from '@/services/cost-explorer/constants/managed-cost-analysis-query-sets';
import CostExplorerHome from '@/services/cost-explorer/pages/CostExplorerHome.vue';
-import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
+import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
const CostAdvancedSettingsContainer = () => import('@/services/cost-explorer/components/CostAdvancedSettingsContainer.vue');
@@ -34,18 +32,18 @@ const DataSourcesPage = () => import('@/services/cost-explorer/pages/admin/Admin
const adminCostExplorerRoutes: RouteConfig = {
path: 'cost-explorer',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE._NAME,
meta: {
menuId: MENU_ID.COST_EXPLORER,
translationId: MENU_INFO_MAP[MENU_ID.COST_EXPLORER].translationId,
},
- redirect: () => ({ name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ANALYSIS._NAME) }),
+ redirect: () => ({ name: ADMIN_COST_EXPLORER_ROUTE.COST_ANALYSIS._NAME }),
component: CostExplorerContainer,
children: [
{
path: 'landing',
meta: { centeredLayout: true },
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.LANDING._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.LANDING._NAME,
component: CostExplorerHome as any,
},
{
@@ -58,19 +56,19 @@ const adminCostExplorerRoutes: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ANALYSIS._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_ANALYSIS._NAME,
meta: { lsbVisible: true },
beforeEnter: async (to, from, next) => {
try {
const response = await SpaceConnector.clientV2.costAnalysis.dataSource.list>();
const results = response?.results || [];
if (results.length === 0) { // none-data-source case
- next({ name: makeAdminRouteName(COST_EXPLORER_ROUTE.LANDING._NAME) });
+ next({ name: ADMIN_COST_EXPLORER_ROUTE.LANDING._NAME });
} else if (to.params.dataSourceId && to.params.costQuerySetId) {
next();
} else {
next({
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ANALYSIS.QUERY_SET._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_ANALYSIS.QUERY_SET._NAME,
params: {
dataSourceId: UNIFIED_COST_KEY,
costQuerySetId: MANAGED_COST_QUERY_SET_IDS.MONTHLY_PRODUCT,
@@ -84,7 +82,7 @@ const adminCostExplorerRoutes: RouteConfig = {
},
{
path: ':dataSourceId/:costQuerySetId',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ANALYSIS.QUERY_SET._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_ANALYSIS.QUERY_SET._NAME,
meta: {
lsbVisible: true,
label: ({ params }) => (params.costQuerySetId === DYNAMIC_COST_QUERY_SET_PARAMS ? undefined : params.costQuerySetId),
@@ -111,7 +109,7 @@ const adminCostExplorerRoutes: RouteConfig = {
});
const results = response?.results || [];
if (results.length === 0) { // none-data-source case
- next({ name: makeAdminRouteName(COST_EXPLORER_ROUTE.LANDING._NAME) });
+ next({ name: ADMIN_COST_EXPLORER_ROUTE.LANDING._NAME });
} else {
next();
}
@@ -122,19 +120,19 @@ const adminCostExplorerRoutes: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.BUDGET._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.BUDGET._NAME,
meta: { menuId: MENU_ID.BUDGET },
component: AdminBudgetMainPage as any,
},
{
path: 'create',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.BUDGET.CREATE._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.BUDGET.CREATE._NAME,
meta: { translationId: 'BILLING.COST_MANAGEMENT.BUDGET.MAIN.CREATE_BUDGET' },
component: AdminBudgetCreatePage as any,
},
{
path: ':budgetId',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.BUDGET.DETAIL._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.BUDGET.DETAIL._NAME,
props: true,
meta: { label: ({ params }) => params.budgetId, copiable: true },
component: AdminBudgetDetailPage as any,
@@ -153,7 +151,7 @@ const adminCostExplorerRoutes: RouteConfig = {
const response = await SpaceConnector.clientV2.costAnalysis.dataSource.list>();
const results = response?.results || [];
if (results.length === 0) { // none-data-source case
- next({ name: makeAdminRouteName(COST_EXPLORER_ROUTE.LANDING._NAME) });
+ next({ name: ADMIN_COST_EXPLORER_ROUTE.LANDING._NAME });
} else {
next();
}
@@ -164,7 +162,7 @@ const adminCostExplorerRoutes: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_REPORT._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_REPORT._NAME,
meta: { menuId: MENU_ID.COST_REPORT },
component: CostReportPage as any,
},
@@ -182,7 +180,7 @@ const adminCostExplorerRoutes: RouteConfig = {
const response = await SpaceConnector.clientV2.costAnalysis.dataSource.list>();
const results = response?.results || [];
if (results.length === 0) { // none-data-source case
- next({ name: makeAdminRouteName(COST_EXPLORER_ROUTE.LANDING._NAME) });
+ next({ name: ADMIN_COST_EXPLORER_ROUTE.LANDING._NAME });
} else {
next();
}
@@ -193,32 +191,32 @@ const adminCostExplorerRoutes: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.DATA_SOURCES._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.DATA_SOURCES._NAME,
component: DataSourcesPage as any,
},
],
},
{
path: 'cost-advanced-settings',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS._NAME,
meta: {
menuId: MENU_ID.COST_ADVANCED_SETTINGS,
translationId: MENU_INFO_MAP[MENU_ID.COST_ADVANCED_SETTINGS].translationId,
},
redirect: () => ({
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.ANOMALY_DETECTION_DOMAIN_CONFIGURATION._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.ANOMALY_DETECTION_DOMAIN_CONFIGURATION._NAME,
}),
component: CostAdvancedSettingsContainer,
children: [
{
path: 'anomaly-detection-configuration',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.ANOMALY_DETECTION_DOMAIN_CONFIGURATION._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.ANOMALY_DETECTION_DOMAIN_CONFIGURATION._NAME,
meta: { lsbVisible: true, translationId: MENU_INFO_MAP[MENU_ID.ANOMALY_DETECTION_DOMAIN_CONFIGURATION].translationId, menuId: MENU_ID.ANOMALY_DETECTION_DOMAIN_CONFIGURATION },
component: AdminDomainSettingsAnomalyDetectionConfigurationPage,
},
{
path: 'currency-converter',
- name: makeAdminRouteName(COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.CURRENCY_CONVERTER._NAME),
+ name: ADMIN_COST_EXPLORER_ROUTE.COST_ADVANCED_SETTINGS.CURRENCY_CONVERTER._NAME,
meta: { lsbVisible: true, translationId: MENU_INFO_MAP[MENU_ID.CURRENCY_CONVERTER].translationId, menuId: MENU_ID.CURRENCY_CONVERTER },
component: AdminDomainSettingsCurrencyConverterPage,
},
diff --git a/apps/web/src/services/cost-explorer/routes/route-constant.ts b/apps/web/src/services/cost-explorer/routes/route-constant.ts
index e9007a38df..9ea7b52f7c 100644
--- a/apps/web/src/services/cost-explorer/routes/route-constant.ts
+++ b/apps/web/src/services/cost-explorer/routes/route-constant.ts
@@ -15,15 +15,7 @@ export const COST_EXPLORER_ROUTE = {
COST_REPORT: {
_NAME: `${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_REPORT}`,
},
- DATA_SOURCES: {
- _NAME: `${MENU_ID.COST_EXPLORER}.${MENU_ID.DATA_SOURCES}`,
- },
LANDING: {
_NAME: `${MENU_ID.COST_EXPLORER}.landing`,
},
- COST_ADVANCED_SETTINGS: {
- _NAME: `${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_ADVANCED_SETTINGS}`,
- ANOMALY_DETECTION_DOMAIN_CONFIGURATION: { _NAME: `${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_ADVANCED_SETTINGS}.${MENU_ID.ANOMALY_DETECTION_DOMAIN_CONFIGURATION}` },
- CURRENCY_CONVERTER: { _NAME: `${MENU_ID.COST_EXPLORER}.${MENU_ID.COST_ADVANCED_SETTINGS}.${MENU_ID.CURRENCY_CONVERTER}` },
- },
} as const;
diff --git a/apps/web/src/services/dashboards/routes/admin/route-constant.ts b/apps/web/src/services/dashboards/routes/admin/route-constant.ts
new file mode 100644
index 0000000000..7ebc90d90b
--- /dev/null
+++ b/apps/web/src/services/dashboards/routes/admin/route-constant.ts
@@ -0,0 +1,14 @@
+import { MENU_ID } from '@/lib/menu/config';
+
+export const ADMIN_DASHBOARDS_ROUTE = Object.freeze({
+ _NAME: `admin.${MENU_ID.DASHBOARDS}`,
+ ALL: {
+ _NAME: `admin.${MENU_ID.DASHBOARDS}.all`,
+ },
+ DETAIL: {
+ _NAME: `admin.${MENU_ID.DASHBOARDS}.detail`,
+ },
+ CREATE: {
+ _NAME: `admin.${MENU_ID.DASHBOARDS}.create`,
+ },
+});
diff --git a/apps/web/src/services/dashboards/routes/admin/routes.ts b/apps/web/src/services/dashboards/routes/admin/routes.ts
index 4d1b8d9211..5aee451e6e 100644
--- a/apps/web/src/services/dashboards/routes/admin/routes.ts
+++ b/apps/web/src/services/dashboards/routes/admin/routes.ts
@@ -1,11 +1,9 @@
import type { RouteConfig } from 'vue-router';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { MENU_ID } from '@/lib/menu/config';
import { MENU_INFO_MAP } from '@/lib/menu/menu-info';
-import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant';
+import { ADMIN_DASHBOARDS_ROUTE } from '@/services/dashboards/routes/admin/route-constant';
const DashboardsContainer = () => import('@/services/dashboards/DashboardsContainer.vue');
const DashboardsMainPage = () => import('@/services/dashboards/pages/DashboardsMainPage.vue');
@@ -22,13 +20,13 @@ const adminDashboardsRoute: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(DASHBOARDS_ROUTE._NAME),
+ name: ADMIN_DASHBOARDS_ROUTE._NAME,
meta: { lsbVisible: true, menuId: MENU_ID.DASHBOARDS },
component: DashboardsMainPage,
},
{
path: 'create',
- name: makeAdminRouteName(DASHBOARDS_ROUTE.CREATE._NAME),
+ name: ADMIN_DASHBOARDS_ROUTE.CREATE._NAME,
meta: {
translationId: 'DASHBOARDS.CREATE.TITLE',
},
@@ -36,7 +34,7 @@ const adminDashboardsRoute: RouteConfig = {
},
{
path: 'detail/:dashboardId',
- name: makeAdminRouteName(DASHBOARDS_ROUTE.DETAIL._NAME),
+ name: ADMIN_DASHBOARDS_ROUTE.DETAIL._NAME,
meta: { lsbVisible: true, label: ({ params }) => params.dashboardId, copiable: true },
props: true,
component: DashboardDetailPage,
diff --git a/apps/web/src/services/dashboards/routes/route-constant.ts b/apps/web/src/services/dashboards/routes/route-constant.ts
index f395f21aad..9041154742 100644
--- a/apps/web/src/services/dashboards/routes/route-constant.ts
+++ b/apps/web/src/services/dashboards/routes/route-constant.ts
@@ -8,9 +8,6 @@ export const DASHBOARDS_ROUTE = Object.freeze({
DETAIL: {
_NAME: `${MENU_ID.DASHBOARDS}.detail`,
},
- CUSTOMIZE: {
- _NAME: `${MENU_ID.DASHBOARDS}.customize`,
- },
CREATE: {
_NAME: `${MENU_ID.DASHBOARDS}.create`,
},
diff --git a/apps/web/src/services/iam/components/RoleManagementTable.vue b/apps/web/src/services/iam/components/RoleManagementTable.vue
index 871128cf59..a71bdb6ee6 100644
--- a/apps/web/src/services/iam/components/RoleManagementTable.vue
+++ b/apps/web/src/services/iam/components/RoleManagementTable.vue
@@ -22,7 +22,6 @@ import { FILE_NAME_PREFIX } from '@/lib/excel-export/constant';
import { downloadExcel } from '@/lib/helper/file-download-helper';
import ErrorHandler from '@/common/composables/error/errorHandler';
-import { useProperRouteLocation } from '@/common/composables/proper-route-location';
import { useQueryTags } from '@/common/composables/query-tags';
import RoleDeleteModal
@@ -33,7 +32,7 @@ import {
EXCEL_TABLE_FIELDS,
ROLE_SEARCH_HANDLERS,
} from '@/services/iam/constants/role-constant';
-import { IAM_ROUTE } from '@/services/iam/routes/route-constant';
+import { ADMIN_IAM_ROUTE } from '@/services/iam/routes/admin/route-constant';
import { useRolePageStore } from '@/services/iam/store/role-page-store';
interface Props {
@@ -48,7 +47,6 @@ const props = withDefaults(defineProps(), {
const userStore = useUserStore();
const rolePageStore = useRolePageStore();
const rolePageState = rolePageStore.$state;
-const { getProperRouteLocation } = useProperRouteLocation();
const router = useRouter();
@@ -117,7 +115,7 @@ const dropdownMenu = computed
-
+
@@ -467,7 +463,7 @@ watch(() => state.proxyIsSetAdminRole, () => {
>
-
+
diff --git a/apps/web/src/services/iam/components/UserManagementFormAdminRole.vue b/apps/web/src/services/iam/components/UserManagementFormAdminRole.vue
index 2e627f606d..7f5ad10eba 100644
--- a/apps/web/src/services/iam/components/UserManagementFormAdminRole.vue
+++ b/apps/web/src/services/iam/components/UserManagementFormAdminRole.vue
@@ -24,7 +24,7 @@ import ErrorHandler from '@/common/composables/error/errorHandler';
import { useProxyValue } from '@/common/composables/proxy-state';
import { useRoleFormatter } from '@/services/iam/composables/refined-table-data';
-import { IAM_ROUTE } from '@/services/iam/routes/route-constant';
+import { ADMIN_IAM_ROUTE } from '@/services/iam/routes/admin/route-constant';
import { useUserPageStore } from '@/services/iam/store/user-page-store';
import type { AddModalMenuItem, UserListItemType } from '@/services/iam/types/user-type';
@@ -181,7 +181,7 @@ watch(() => roleState.proxySelectedItems, (role) => {
>
-
+
diff --git a/apps/web/src/services/iam/components/UserManagementRemoveModal/UserManagementOnlyRemoveWorkspaceGroupTypeModal.vue b/apps/web/src/services/iam/components/UserManagementRemoveModal/UserManagementOnlyRemoveWorkspaceGroupTypeModal.vue
index 10c8d0a895..91b9da5304 100644
--- a/apps/web/src/services/iam/components/UserManagementRemoveModal/UserManagementOnlyRemoveWorkspaceGroupTypeModal.vue
+++ b/apps/web/src/services/iam/components/UserManagementRemoveModal/UserManagementOnlyRemoveWorkspaceGroupTypeModal.vue
@@ -9,11 +9,9 @@ import {
PStatus, PButtonModal, PDataTable, PI, PLink, PBadge,
} from '@cloudforet/mirinae';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useUserStore } from '@/store/user/user-store';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
import { userStateFormatter } from '@/services/iam/composables/refined-table-data';
import { useUserPageStore } from '@/services/iam/store/user-page-store';
@@ -73,7 +71,7 @@ const handleClose = () => {
action-icon="internal-link"
new-tab
highlight
- :to="{ name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACE_GROUP._NAME)}"
+ :to="{ name: ADMIN_ADVANCED_ROUTE.WORKSPACE_GROUP._NAME}"
/>
diff --git a/apps/web/src/services/iam/pages/admin/AdminRolePage.vue b/apps/web/src/services/iam/pages/admin/AdminRolePage.vue
index c67bb3117c..df5b83a365 100644
--- a/apps/web/src/services/iam/pages/admin/AdminRolePage.vue
+++ b/apps/web/src/services/iam/pages/admin/AdminRolePage.vue
@@ -7,24 +7,22 @@ import {
} from '@cloudforet/mirinae';
import { usePageEditableStatus } from '@/common/composables/page-editable-status';
-import { useProperRouteLocation } from '@/common/composables/proper-route-location';
import RoleManagementTab from '@/services/iam/components/RoleManagementTab.vue';
import RoleManagementTable from '@/services/iam/components/RoleManagementTable.vue';
-import { IAM_ROUTE } from '@/services/iam/routes/route-constant';
+import { ADMIN_IAM_ROUTE } from '@/services/iam/routes/admin/route-constant';
import { useRolePageStore } from '@/services/iam/store/role-page-store';
const rolePageStore = useRolePageStore();
const rolePageState = rolePageStore.$state;
-const { getProperRouteLocation } = useProperRouteLocation();
const { hasReadWriteAccess } = usePageEditableStatus();
const router = useRouter();
/* Component */
const handleCreateRole = () => {
- router.push(getProperRouteLocation({ name: IAM_ROUTE.ROLE.CREATE._NAME }));
+ router.push({ name: ADMIN_IAM_ROUTE.ROLE.CREATE._NAME });
};
onUnmounted(() => {
diff --git a/apps/web/src/services/iam/routes/admin/route-constant.ts b/apps/web/src/services/iam/routes/admin/route-constant.ts
new file mode 100644
index 0000000000..e4678ad3d1
--- /dev/null
+++ b/apps/web/src/services/iam/routes/admin/route-constant.ts
@@ -0,0 +1,20 @@
+import { MENU_ID } from '@/lib/menu/config';
+
+export const ADMIN_IAM_ROUTE = {
+ _NAME: `admin.${MENU_ID.IAM}`,
+ USER: {
+ _NAME: `admin.${MENU_ID.IAM}.${MENU_ID.USER}`,
+ },
+ APP: {
+ _NAME: `admin.${MENU_ID.IAM}.${MENU_ID.APP}`,
+ },
+ ROLE: {
+ _NAME: `admin.${MENU_ID.IAM}.${MENU_ID.ROLE}`,
+ CREATE: {
+ _NAME: `admin.${MENU_ID.IAM}.${MENU_ID.ROLE}.create`,
+ },
+ EDIT: {
+ _NAME: `admin.${MENU_ID.IAM}.${MENU_ID.ROLE}.edit`,
+ },
+ },
+} as const;
diff --git a/apps/web/src/services/iam/routes/admin/routes.ts b/apps/web/src/services/iam/routes/admin/routes.ts
index e2286f74b3..e8dd6b21ac 100644
--- a/apps/web/src/services/iam/routes/admin/routes.ts
+++ b/apps/web/src/services/iam/routes/admin/routes.ts
@@ -1,11 +1,9 @@
import type { RouteConfig } from 'vue-router';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { MENU_ID } from '@/lib/menu/config';
import { MENU_INFO_MAP } from '@/lib/menu/menu-info';
-import { IAM_ROUTE } from '@/services/iam/routes/route-constant';
+import { ADMIN_IAM_ROUTE } from '@/services/iam/routes/admin/route-constant';
const IamContainer = () => import('@/services/iam/IamContainer.vue');
@@ -17,19 +15,19 @@ const RoleUpdatePage = () => import('@/services/iam/pages/admin/AdminRoleUpdateP
const adminIamRoutes: RouteConfig = {
path: 'iam',
- name: makeAdminRouteName(IAM_ROUTE._NAME),
+ name: ADMIN_IAM_ROUTE._NAME,
meta: {
menuId: MENU_ID.IAM,
translationId: MENU_INFO_MAP[MENU_ID.IAM].translationId,
},
redirect: () => ({
- name: makeAdminRouteName(IAM_ROUTE.USER._NAME),
+ name: ADMIN_IAM_ROUTE.USER._NAME,
}),
component: IamContainer,
children: [
{
path: 'user',
- name: makeAdminRouteName(IAM_ROUTE.USER._NAME),
+ name: ADMIN_IAM_ROUTE.USER._NAME,
meta: {
menuId: MENU_ID.USER,
translationId: MENU_INFO_MAP[MENU_ID.USER].translationId,
@@ -38,7 +36,7 @@ const adminIamRoutes: RouteConfig = {
},
{
path: 'app',
- name: makeAdminRouteName(IAM_ROUTE.APP._NAME),
+ name: ADMIN_IAM_ROUTE.APP._NAME,
meta: {
menuId: MENU_ID.APP,
translationId: MENU_INFO_MAP[MENU_ID.APP].translationId,
@@ -55,19 +53,19 @@ const adminIamRoutes: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(IAM_ROUTE.ROLE._NAME),
+ name: ADMIN_IAM_ROUTE.ROLE._NAME,
props: true,
component: RolePage,
},
{
path: 'create',
- name: makeAdminRouteName(IAM_ROUTE.ROLE.CREATE._NAME),
+ name: ADMIN_IAM_ROUTE.ROLE.CREATE._NAME,
meta: { translationId: 'IAM.ROLE.FORM.CREATE_TITLE' },
component: RoleCreatePage,
},
{
path: 'edit/:id',
- name: makeAdminRouteName(IAM_ROUTE.ROLE.EDIT._NAME),
+ name: ADMIN_IAM_ROUTE.ROLE.EDIT._NAME,
meta: { translationId: 'IAM.ROLE.FORM.EDIT_TITLE' },
props: true,
component: RoleUpdatePage,
diff --git a/apps/web/src/services/iam/routes/route-constant.ts b/apps/web/src/services/iam/routes/route-constant.ts
index a821dc7f57..cfda468a99 100644
--- a/apps/web/src/services/iam/routes/route-constant.ts
+++ b/apps/web/src/services/iam/routes/route-constant.ts
@@ -11,13 +11,4 @@ export const IAM_ROUTE = {
APP: {
_NAME: `${MENU_ID.IAM}.${MENU_ID.APP}`,
},
- ROLE: {
- _NAME: `${MENU_ID.IAM}.${MENU_ID.ROLE}`,
- CREATE: {
- _NAME: `${MENU_ID.IAM}.${MENU_ID.ROLE}.create`,
- },
- EDIT: {
- _NAME: `${MENU_ID.IAM}.${MENU_ID.ROLE}.edit`,
- },
- },
} as const;
diff --git a/apps/web/src/services/info/components/NoticeForm.vue b/apps/web/src/services/info/components/NoticeForm.vue
index f7a0a225c2..b7ae1f80bd 100644
--- a/apps/web/src/services/info/components/NoticeForm.vue
+++ b/apps/web/src/services/info/components/NoticeForm.vue
@@ -34,10 +34,10 @@ import { useEditorContentTransformer } from '@/common/composables/editor-content
import ErrorHandler from '@/common/composables/error/errorHandler';
import { useFileUploader } from '@/common/composables/file-uploader';
import { useFormValidator } from '@/common/composables/form-validator';
-import { useProperRouteLocation } from '@/common/composables/proper-route-location';
+
import NoticeWorkspaceDropdown from '@/services/info/components/NoticeWorkspaceDropdown.vue';
-import { INFO_ROUTE } from '@/services/info/routes/route-constant';
+import { ADMIN_INFO_ROUTE } from '@/services/info/routes/admin/route-constant';
import { useNoticeDetailStore } from '@/services/info/stores/notice-detail-store';
import type { NoticeFormType, WorkspaceDropdownMenuItem } from '@/services/info/types/notice-type';
@@ -122,7 +122,6 @@ const formData = computed>(() => ({
},
}));
-const { getProperRouteLocation } = useProperRouteLocation();
const handleConfirm = () => {
@@ -147,7 +146,7 @@ const handleCreateNotice = async () => {
workspaces: workspaceState.selectedRadioIdx === 0 ? ['*'] : workspaceState.selectedItems.map((item) => item.name),
});
showSuccessMessage(i18n.t('INFO.NOTICE.FORM.ALT_S_CREATE_NOTICE'), '');
- await SpaceRouter.router.push(getProperRouteLocation({ name: INFO_ROUTE.NOTICE._NAME, query: {} }));
+ await SpaceRouter.router.push({ name: ADMIN_INFO_ROUTE.NOTICE._NAME, query: {} });
} catch (e) {
ErrorHandler.handleRequestError(e, i18n.t('INFO.NOTICE.FORM.ALT_E_CREATE_NOTICE'));
}
diff --git a/apps/web/src/services/info/components/NoticeWorkspaceDropdown.vue b/apps/web/src/services/info/components/NoticeWorkspaceDropdown.vue
index 0d84b52c23..8ed483ab3c 100644
--- a/apps/web/src/services/info/components/NoticeWorkspaceDropdown.vue
+++ b/apps/web/src/services/info/components/NoticeWorkspaceDropdown.vue
@@ -14,16 +14,14 @@ 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 ErrorHandler from '@/common/composables/error/errorHandler';
import { useProxyValue } from '@/common/composables/proxy-state';
import WorkspaceLogoIcon from '@/common/modules/navigations/top-bar/modules/top-bar-header/WorkspaceLogoIcon.vue';
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 { INFO_ROUTE } from '@/services/info/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
+import { ADMIN_INFO_ROUTE } from '@/services/info/routes/admin/route-constant';
import type { WorkspaceDropdownMenuItem, NoticeFormType } from '@/services/info/types/notice-type';
interface Props {
@@ -49,7 +47,7 @@ const state = reactive({
proxySelectedItems: useProxyValue('selectedItems', props, emit),
searchText: '',
menuItems: [] as WorkspaceDropdownMenuItem[],
- isMainListPage: computed(() => route.name === makeAdminRouteName(INFO_ROUTE.NOTICE._NAME)),
+ isMainListPage: computed(() => route.name === ADMIN_INFO_ROUTE.NOTICE._NAME),
});
const handleSelectedItem = (value: WorkspaceDropdownMenuItem[]) => {
@@ -175,7 +173,7 @@ const workspaceMenuHandler: AutocompleteHandler = async (inputText: string, page
{{ $t('INFO.NOTICE.FORM.CREATE_WORKSPACE') }}
diff --git a/apps/web/src/services/info/pages/admin/AdminNoticeDetailPage.vue b/apps/web/src/services/info/pages/admin/AdminNoticeDetailPage.vue
index 09069df348..1fbcc19ffe 100644
--- a/apps/web/src/services/info/pages/admin/AdminNoticeDetailPage.vue
+++ b/apps/web/src/services/info/pages/admin/AdminNoticeDetailPage.vue
@@ -35,7 +35,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 NoticeDetail from '@/services/info/components/NoticeDetail.vue';
-import { INFO_ROUTE } from '@/services/info/routes/route-constant';
+import { ADMIN_INFO_ROUTE } from '@/services/info/routes/admin/route-constant';
import { useNoticeDetailStore } from '@/services/info/stores/notice-detail-store';
const props = defineProps<{
@@ -81,7 +81,7 @@ const handleClickEditButton = () => {
return;
}
router.push(getProperRouteLocation({
- name: INFO_ROUTE.NOTICE.UPDATE._NAME,
+ name: ADMIN_INFO_ROUTE.NOTICE.UPDATE._NAME,
params: { postId: props.postId },
}));
};
@@ -95,7 +95,7 @@ const handleDeleteNoticeConfirm = async () => {
if (!props.postId) throw new Error('postId is undefined');
await noticeDetailStore.deleteNoticePost(props.postId);
showSuccessMessage(i18n.t('INFO.NOTICE.FORM.ALT_S_DELETE_NOTICE'), '');
- await router.push(getProperRouteLocation({ name: INFO_ROUTE.NOTICE._NAME }));
+ await router.push({ name: ADMIN_INFO_ROUTE.NOTICE._NAME });
} catch (e) {
ErrorHandler.handleRequestError(e, i18n.t('INFO.NOTICE.FORM.ALT_E_DELETE_NOTICE'));
} finally {
diff --git a/apps/web/src/services/info/pages/admin/AdminNoticeMainPage.vue b/apps/web/src/services/info/pages/admin/AdminNoticeMainPage.vue
index ec25a732a6..5d418cb294 100644
--- a/apps/web/src/services/info/pages/admin/AdminNoticeMainPage.vue
+++ b/apps/web/src/services/info/pages/admin/AdminNoticeMainPage.vue
@@ -6,14 +6,12 @@ import {
PButton, PHeading, PHeadingLayout,
} from '@cloudforet/mirinae';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useUserStore } from '@/store/user/user-store';
import { usePageEditableStatus } from '@/common/composables/page-editable-status';
import NoticeList from '@/services/info/components/NoticeList.vue';
-import { INFO_ROUTE } from '@/services/info/routes/route-constant';
+import { ADMIN_INFO_ROUTE } from '@/services/info/routes/admin/route-constant';
const router = useRouter();
@@ -26,7 +24,7 @@ const storeState = reactive({
});
const handleCreateNotice = () => {
- router.push({ name: makeAdminRouteName(INFO_ROUTE.NOTICE.CREATE._NAME) });
+ router.push({ name: ADMIN_INFO_ROUTE.NOTICE.CREATE._NAME });
};
diff --git a/apps/web/src/services/info/routes/admin/route-constant.ts b/apps/web/src/services/info/routes/admin/route-constant.ts
new file mode 100644
index 0000000000..145862f58e
--- /dev/null
+++ b/apps/web/src/services/info/routes/admin/route-constant.ts
@@ -0,0 +1,11 @@
+import { MENU_ID } from '@/lib/menu/config';
+
+export const ADMIN_INFO_ROUTE = Object.freeze({
+ _NAME: `admin.${MENU_ID.INFO}`,
+ NOTICE: {
+ _NAME: `admin.${MENU_ID.INFO}.${MENU_ID.NOTICE}`,
+ CREATE: { _NAME: `admin.${MENU_ID.INFO}.${MENU_ID.NOTICE}.create` },
+ UPDATE: { _NAME: `admin.${MENU_ID.INFO}.${MENU_ID.NOTICE}.update` },
+ DETAIL: { _NAME: `admin.${MENU_ID.INFO}.${MENU_ID.NOTICE}.detail` },
+ },
+});
diff --git a/apps/web/src/services/info/routes/admin/routes.ts b/apps/web/src/services/info/routes/admin/routes.ts
index 0e076c7e69..60329283f8 100644
--- a/apps/web/src/services/info/routes/admin/routes.ts
+++ b/apps/web/src/services/info/routes/admin/routes.ts
@@ -1,11 +1,11 @@
import type { RouteConfig } from 'vue-router';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
import { MENU_ID } from '@/lib/menu/config';
import { MENU_INFO_MAP } from '@/lib/menu/menu-info';
-import { INFO_ROUTE } from '@/services/info/routes/route-constant';
+import { ADMIN_INFO_ROUTE } from '@/services/info/routes/admin/route-constant';
+
const InfoContainer = () => import('@/services/info/InfoContainer.vue');
@@ -16,12 +16,12 @@ const AdminNoticeUpdatePage = () => import('@/services/info/pages/admin/AdminNot
const infoRoute: RouteConfig = {
path: 'info',
- name: makeAdminRouteName(INFO_ROUTE._NAME),
+ name: ADMIN_INFO_ROUTE._NAME,
meta: {
menuId: MENU_ID.INFO,
translationId: MENU_INFO_MAP[MENU_ID.INFO].translationId,
},
- redirect: () => ({ name: makeAdminRouteName(INFO_ROUTE.NOTICE._NAME) }),
+ redirect: () => ({ name: ADMIN_INFO_ROUTE.NOTICE._NAME }),
component: InfoContainer,
children: [
{
@@ -30,23 +30,23 @@ const infoRoute: RouteConfig = {
menuId: MENU_ID.NOTICE,
translationId: MENU_INFO_MAP[MENU_ID.NOTICE].translationId,
},
- redirect: () => ({ name: makeAdminRouteName(INFO_ROUTE.NOTICE._NAME) }),
+ redirect: () => ({ name: ADMIN_INFO_ROUTE.NOTICE._NAME }),
component: { template: '' },
children: [
{
path: '/',
- name: makeAdminRouteName(INFO_ROUTE.NOTICE._NAME),
+ name: ADMIN_INFO_ROUTE.NOTICE._NAME,
component: AdminNoticeMainPage as any,
},
{
path: 'create',
- name: makeAdminRouteName(INFO_ROUTE.NOTICE.CREATE._NAME),
+ name: ADMIN_INFO_ROUTE.NOTICE.CREATE._NAME,
meta: { translationId: 'INFO.NOTICE.FORM.CREATE_NOTICE' },
component: AdminNoticeCreatePage as any,
},
{
path: ':postId',
- name: makeAdminRouteName(INFO_ROUTE.NOTICE.DETAIL._NAME),
+ name: ADMIN_INFO_ROUTE.NOTICE.DETAIL._NAME,
meta: {
translationId: 'INFO.NOTICE.DETAIL.DETAIL_TITLE', label: ({ params }) => params.postId, copiable: true,
},
@@ -55,7 +55,7 @@ const infoRoute: RouteConfig = {
},
{
path: 'update/:postId',
- name: makeAdminRouteName(INFO_ROUTE.NOTICE.UPDATE._NAME),
+ name: ADMIN_INFO_ROUTE.NOTICE.UPDATE._NAME,
meta: { translationId: 'INFO.NOTICE.FORM.EDIT_TITLE' },
component: AdminNoticeUpdatePage as any,
props: true,
diff --git a/apps/web/src/services/info/routes/route-constant.ts b/apps/web/src/services/info/routes/route-constant.ts
index de79e5ed6b..d480eec74c 100644
--- a/apps/web/src/services/info/routes/route-constant.ts
+++ b/apps/web/src/services/info/routes/route-constant.ts
@@ -4,8 +4,6 @@ export const INFO_ROUTE = Object.freeze({
_NAME: MENU_ID.INFO,
NOTICE: {
_NAME: `${MENU_ID.INFO}.${MENU_ID.NOTICE}`,
- CREATE: { _NAME: `${MENU_ID.INFO}.${MENU_ID.NOTICE}.create` },
- UPDATE: { _NAME: `${MENU_ID.INFO}.${MENU_ID.NOTICE}.update` },
DETAIL: { _NAME: `${MENU_ID.INFO}.${MENU_ID.NOTICE}.detail` },
},
});
diff --git a/apps/web/src/services/landing/components/workspace-landing/LandingContents.vue b/apps/web/src/services/landing/components/workspace-landing/LandingContents.vue
index 6bce542348..8b03f486cb 100644
--- a/apps/web/src/services/landing/components/workspace-landing/LandingContents.vue
+++ b/apps/web/src/services/landing/components/workspace-landing/LandingContents.vue
@@ -13,8 +13,6 @@ import {
import type { WorkspaceModel } from '@/schema/identity/workspace/model';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store';
import { useUserStore } from '@/store/user/user-store';
@@ -27,7 +25,7 @@ import { RECENT_TYPE } from '@/common/modules/navigations/type';
import { gray } from '@/styles/colors';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
import LandingGroupWorkspaces from '@/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue';
import LandingAllWorkspaces from '@/services/landing/components/workspace-landing/LandingAllWorkspaces.vue';
import LandingEmptyContents from '@/services/landing/components/workspace-landing/LandingEmptyContents.vue';
@@ -78,7 +76,7 @@ const handleSearch = (value: string) => {
};
const handleClickButton = () => {
window.open(router.resolve({
- name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME),
+ name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME,
query: {
hasNoWorkspace: 'true',
},
diff --git a/apps/web/src/services/landing/components/workspace-landing/LandingEmptyContents.vue b/apps/web/src/services/landing/components/workspace-landing/LandingEmptyContents.vue
index c2340a5c7a..5e48817523 100644
--- a/apps/web/src/services/landing/components/workspace-landing/LandingEmptyContents.vue
+++ b/apps/web/src/services/landing/components/workspace-landing/LandingEmptyContents.vue
@@ -6,11 +6,9 @@ import { PEmpty, PButton } from '@cloudforet/mirinae';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useAppContextStore } from '@/store/app-context/app-context-store';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
interface Props {
isDomainAdmin: boolean;
@@ -27,7 +25,7 @@ const router = useRouter();
const handleCreateWorkspace = () => {
appContextStore.enterAdminMode();
window.open(router.resolve({
- name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME),
+ name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME,
query: {
hasNoWorkspace: 'true',
},
diff --git a/apps/web/src/services/landing/components/workspace-landing/LandingWorkspaceRecentList.vue b/apps/web/src/services/landing/components/workspace-landing/LandingWorkspaceRecentList.vue
index 6b112c912b..2b6802b665 100644
--- a/apps/web/src/services/landing/components/workspace-landing/LandingWorkspaceRecentList.vue
+++ b/apps/web/src/services/landing/components/workspace-landing/LandingWorkspaceRecentList.vue
@@ -13,8 +13,6 @@ import WorkspaceOwnerImage from '@/assets/images/role/img_avatar_workspace-owner
import { ROLE_TYPE } from '@/schema/identity/role/constant';
import type { RoleType } from '@/schema/identity/role/type';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store';
import FavoriteButton from '@/common/modules/favorites/favorite-button/FavoriteButton.vue';
@@ -23,7 +21,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';
import { useLandingPageStore } from '@/services/landing/store/landing-page-store';
import type { WorkspaceBoardSet } from '@/services/landing/type/type';
import { WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/route-constant';
@@ -136,7 +134,7 @@ const handleClickBoardItem = (item: WorkspaceBoardSet) => {
diff --git a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue
index c4811b9108..e79f1d684a 100644
--- a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue
+++ b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingGroupWorkspaces.vue
@@ -16,15 +16,13 @@ import type { WorkspaceGroupModel } from '@/schema/identity/workspace-group/mode
import type { WorkspaceModel } from '@/schema/identity/workspace/model';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useUserWorkspaceGroupStore } from '@/store/app-context/workspace/user-workspace-group-store';
import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store';
import ErrorHandler from '@/common/composables/error/errorHandler';
import type { FavoriteItem } from '@/common/modules/favorites/favorite-button/type';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
import LandingWorkspaceBoard from '@/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceBoard.vue';
import LandingWorkspaceGroupManageOverlay from '@/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceGroupManageOverlay.vue';
import { BOARD_TYPE } from '@/services/landing/constants/landing-constants';
@@ -146,7 +144,7 @@ watch(() => landingPageStoreState.selectedWorkspaceGroup, (groupId) => {
style-type="tertiary"
size="sm"
class="ml-1"
- @click="() => { router.push({ name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACE_GROUP._NAME)})}"
+ @click="() => { router.push({ name: ADMIN_ADVANCED_ROUTE.WORKSPACE_GROUP._NAME})}"
/>
diff --git a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceBoard.vue b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceBoard.vue
index 612bb87bd7..3aa104b635 100644
--- a/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceBoard.vue
+++ b/apps/web/src/services/landing/components/workspace-landing/landing-group-workspaces/LandingWorkspaceBoard.vue
@@ -15,8 +15,6 @@ import WorkspaceOwnerImage from '@/assets/images/role/img_avatar_workspace-owner
import { ROLE_TYPE } from '@/schema/identity/role/constant';
import type { RoleType } from '@/schema/identity/role/type';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store';
import { useProperRouteLocation } from '@/common/composables/proper-route-location';
@@ -28,7 +26,7 @@ import { gray } from '@/styles/colors';
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';
import { BOARD_TYPE } from '@/services/landing/constants/landing-constants';
import { useLandingPageStore } from '@/services/landing/store/landing-page-store';
import type { WorkspaceBoardSet, BoardType } from '@/services/landing/type/type';
@@ -151,7 +149,7 @@ const handleClickBoardItem = (item: WorkspaceBoardSet) => {
diff --git a/apps/web/src/services/ops-flow/components/TaskCategoryPanel.vue b/apps/web/src/services/ops-flow/components/TaskCategoryPanel.vue
index f36060bb60..1b9467c067 100644
--- a/apps/web/src/services/ops-flow/components/TaskCategoryPanel.vue
+++ b/apps/web/src/services/ops-flow/components/TaskCategoryPanel.vue
@@ -8,11 +8,11 @@ import type { DataTableField } from '@cloudforet/mirinae/src/data-display/tables
import { getParticle, i18n as _i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
import ActionMenuButton from '@/common/components/buttons/ActionMenuButton.vue';
-import { OPS_FLOW_ROUTE } from '@/services/ops-flow/routes/route-constant';
+
+import { ADMIN_OPS_FLOW_ROUTE } from '@/services/ops-flow/routes/admin/route-constant';
import { usePackageStore } from '@/services/ops-flow/stores/admin/package-store';
import { useTaskManagementPageStore } from '@/services/ops-flow/stores/admin/task-management-page-store';
import { useTaskCategoryStore } from '@/services/ops-flow/stores/task-category-store';
@@ -100,7 +100,7 @@ onMounted(() => {
[]>(() => [
},
]);
const activeTab = computed(() => {
- if (route.name === makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.TASK_TYPE._NAME)) return 'taskType';
+ if (route.name === ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.TASK_TYPE._NAME) return 'taskType';
return 'status';
});
const handleUpdateActiveTab = (tab: string) => {
if (tab === 'taskType') {
router.replace({
- name: makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.TASK_TYPE._NAME),
+ name: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.TASK_TYPE._NAME,
params: {
taskCategoryId: props.taskCategoryId,
},
});
} else {
router.replace({
- name: makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.STATUS._NAME),
+ name: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.STATUS._NAME,
params: {
taskCategoryId: props.taskCategoryId,
},
diff --git a/apps/web/src/services/ops-flow/routes/admin/route-constant.ts b/apps/web/src/services/ops-flow/routes/admin/route-constant.ts
new file mode 100644
index 0000000000..369ddf0ea3
--- /dev/null
+++ b/apps/web/src/services/ops-flow/routes/admin/route-constant.ts
@@ -0,0 +1,15 @@
+import { MENU_ID } from '@/lib/menu/config';
+
+export const ADMIN_OPS_FLOW_ROUTE = Object.freeze({
+ _NAME: `admin.${MENU_ID.OPS_FLOW}`,
+ TASK_MANAGEMENT: {
+ _NAME: `admin.${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}`,
+ TASK_CATEGORY: {
+ DETAIL: {
+ _NAME: `admin.${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}.task_category.detail`,
+ STATUS: { _NAME: `admin.${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}.task_category.detail.status` },
+ TASK_TYPE: { _NAME: `admin.${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}.task_category.detail.task_type` },
+ },
+ },
+ },
+});
diff --git a/apps/web/src/services/ops-flow/routes/admin/routes.ts b/apps/web/src/services/ops-flow/routes/admin/routes.ts
index a0d5173076..d7eaa44a5d 100644
--- a/apps/web/src/services/ops-flow/routes/admin/routes.ts
+++ b/apps/web/src/services/ops-flow/routes/admin/routes.ts
@@ -1,11 +1,9 @@
import type { RouteConfig } from 'vue-router';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { MENU_ID } from '@/lib/menu/config';
import { MENU_INFO_MAP } from '@/lib/menu/menu-info';
-import { OPS_FLOW_ROUTE } from '@/services/ops-flow/routes/route-constant';
+import { ADMIN_OPS_FLOW_ROUTE } from '@/services/ops-flow/routes/admin/route-constant';
const OpsFlowContainer = () => import('@/services/ops-flow/OpsFlowContainer.vue');
@@ -16,12 +14,12 @@ const AdminTaskCategoryDetailPageTaskTypeTab = () => import('@/services/ops-flow
const adminOpsFlowRoutes: RouteConfig = {
path: 'ops-flow',
- name: makeAdminRouteName(OPS_FLOW_ROUTE._NAME),
+ name: ADMIN_OPS_FLOW_ROUTE._NAME,
meta: {
menuId: MENU_ID.OPS_FLOW,
translationId: MENU_INFO_MAP[MENU_ID.OPS_FLOW].translationId,
},
- redirect: () => ({ name: makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT._NAME) }),
+ redirect: () => ({ name: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT._NAME }),
component: OpsFlowContainer,
children: [
{
@@ -34,25 +32,25 @@ const adminOpsFlowRoutes: RouteConfig = {
children: [
{
path: '/',
- name: makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT._NAME),
+ name: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT._NAME,
component: AdminTaskManagementPage as any,
},
{
path: 'task-category/:taskCategoryId',
- name: makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL._NAME),
+ name: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL._NAME,
props: true,
- redirect: { name: makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.STATUS._NAME) },
+ redirect: { name: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.STATUS._NAME },
component: AdminTaskCategoryDetailPage as any,
children: [
{
path: 'status',
- name: makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.STATUS._NAME),
+ name: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.STATUS._NAME,
props: true,
component: AdminTaskCategoryDetailPageStatusTab as any,
},
{
path: 'task-type',
- name: makeAdminRouteName(OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.TASK_TYPE._NAME),
+ name: ADMIN_OPS_FLOW_ROUTE.TASK_MANAGEMENT.TASK_CATEGORY.DETAIL.TASK_TYPE._NAME,
props: true,
component: AdminTaskCategoryDetailPageTaskTypeTab as any,
},
diff --git a/apps/web/src/services/ops-flow/routes/route-constant.ts b/apps/web/src/services/ops-flow/routes/route-constant.ts
index fd6db46134..e13c441d99 100644
--- a/apps/web/src/services/ops-flow/routes/route-constant.ts
+++ b/apps/web/src/services/ops-flow/routes/route-constant.ts
@@ -8,15 +8,4 @@ export const OPS_FLOW_ROUTE = Object.freeze({
TASK_DETAIL: { _NAME: `${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_BOARD}.task_detail` },
TASK_CREATE: { _NAME: `${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_BOARD}.task_create` },
},
- TASK_MANAGEMENT: {
- _NAME: `${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}`,
- TASK_CATEGORY: {
- DETAIL: {
- _NAME: `${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}.task_category.detail`,
- STATUS: { _NAME: `${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}.task_category.detail.status` },
- TASK_TYPE: { _NAME: `${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}.task_category.detail.task_type` },
- },
- CREATE: { _NAME: `${MENU_ID.OPS_FLOW}.${MENU_ID.TASK_MANAGEMENT}.task_category.create` },
- },
- },
});
diff --git a/apps/web/src/services/workspace-home/components/WorkspaceInfo.vue b/apps/web/src/services/workspace-home/components/WorkspaceInfo.vue
index 547001da53..cc0e5776ae 100644
--- a/apps/web/src/services/workspace-home/components/WorkspaceInfo.vue
+++ b/apps/web/src/services/workspace-home/components/WorkspaceInfo.vue
@@ -13,8 +13,6 @@ import {
import type { WorkspaceModel } from '@/schema/identity/workspace/model';
import { i18n } from '@/translations';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
-
import { useAppContextStore } from '@/store/app-context/app-context-store';
import { useUserWorkspaceStore } from '@/store/app-context/workspace/user-workspace-store';
import { useUserStore } from '@/store/user/user-store';
@@ -29,7 +27,7 @@ import WorkspaceLogoIcon from '@/common/modules/navigations/top-bar/modules/top-
import { gray } from '@/styles/colors';
-import { ADVANCED_ROUTE } from '@/services/advanced/routes/route-constant';
+import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
import { APP_DROPDOWN_MODAL_TYPE } from '@/services/iam/constants/app-constant';
import { USER_MODAL_TYPE } from '@/services/iam/constants/user-constant';
import { IAM_ROUTE } from '@/services/iam/routes/route-constant';
@@ -93,7 +91,7 @@ const actionWorkspace = (type: string, workspaceId: string) => {
speed: 1,
});
router.push({
- name: makeAdminRouteName(ADVANCED_ROUTE.WORKSPACES._NAME),
+ name: ADMIN_ADVANCED_ROUTE.WORKSPACES._NAME,
query: {
modalType: type,
selectedWorkspaceId: workspaceId,
diff --git a/apps/web/src/services/workspace-home/routes/admin/route-constant.ts b/apps/web/src/services/workspace-home/routes/admin/route-constant.ts
new file mode 100644
index 0000000000..1a4320cae2
--- /dev/null
+++ b/apps/web/src/services/workspace-home/routes/admin/route-constant.ts
@@ -0,0 +1,5 @@
+import { MENU_ID } from '@/lib/menu/config';
+
+export const ADMIN_WORKSPACE_HOME_ROUTE = Object.freeze({
+ _NAME: `admin.${MENU_ID.WORKSPACE_HOME}`,
+});
diff --git a/apps/web/src/services/workspace-home/routes/admin/routes.ts b/apps/web/src/services/workspace-home/routes/admin/routes.ts
index 3ac29ee728..1c070cfbd1 100644
--- a/apps/web/src/services/workspace-home/routes/admin/routes.ts
+++ b/apps/web/src/services/workspace-home/routes/admin/routes.ts
@@ -1,21 +1,20 @@
import type { RouteConfig } from 'vue-router';
-import { makeAdminRouteName } from '@/router/helpers/route-helper';
import { MENU_ID } from '@/lib/menu/config';
-import { IAM_ROUTE } from '@/services/iam/routes/route-constant';
-import { WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/route-constant';
+import { ADMIN_IAM_ROUTE } from '@/services/iam/routes/admin/route-constant';
+import { ADMIN_WORKSPACE_HOME_ROUTE } from '@/services/workspace-home/routes/admin/route-constant';
const WorkspaceHome = () => import('@/services/workspace-home/pages/WorkspaceHomePage.vue');
const adminWorkspaceHomeRoutes: RouteConfig = {
path: 'home',
- name: makeAdminRouteName(WORKSPACE_HOME_ROUTE._NAME),
+ name: ADMIN_WORKSPACE_HOME_ROUTE._NAME,
meta: { menuId: MENU_ID.WORKSPACE_HOME },
// HACK: redirect to user list page for now
redirect: () => ({
- name: makeAdminRouteName(IAM_ROUTE.USER._NAME),
+ name: ADMIN_IAM_ROUTE.USER._NAME,
}),
component: WorkspaceHome,
};