Merge pull request #5764 from skdud4659/feature/_refactor

skdud4659 · web-flow · commit 4e356a532ee6 · 2025-04-11T14:13:37.000+09:00
refactor: refactor generate routes helper
diff --git a/apps/web/src/lib/config/global-config/helpers/generate-routes.ts b/apps/web/src/lib/config/global-config/helpers/generate-routes.ts
@@ -10,19 +10,28 @@ import infoRoutes from '@/services/info/routes/routes';
 import adminWorkspaceHomeRoutes from '@/services/workspace-home/routes/admin/routes';
 import workspaceHomeRoute from '@/services/workspace-home/routes/routes';
 
-export const generateRoutes = (mode: string): RouteConfig[] => {
+interface GeneratedFeatureRouteConfig {
+    routes: RouteConfig[];
+    adminRoutes: RouteConfig[];
+}
+
+export const generateRoutes = (): GeneratedFeatureRouteConfig => {
     const globalConfigStore = useGlobalConfigStore();
     const schema = globalConfigStore.state.schema;
-    const baseRoutes = mode === 'admin'
-        ? [adminWorkspaceHomeRoutes, adminAdvancedRoutes, adminInfoRoutes]
-        : [workspaceHomeRoute, infoRoutes];
+    const baseRoutes: GeneratedFeatureRouteConfig = {
+        routes: [workspaceHomeRoute, infoRoutes],
+        adminRoutes: [adminWorkspaceHomeRoutes, adminAdvancedRoutes, adminInfoRoutes],
+    };
 
     Object.keys(schema).forEach((serviceName) => {
         const configurator = getFeatureConfigurator(serviceName);
         if (configurator) {
-            const route = configurator.getRoutes(mode === 'admin');
-            if (route && !baseRoutes.some((existingRoute) => existingRoute.path === route.path)) {
-                baseRoutes.push(route);
+            const featureRoutes = configurator.getRoutes();
+            if (featureRoutes?.routes) {
+                baseRoutes.routes.push(featureRoutes.routes);
+            }
+            if (featureRoutes?.adminRoutes) {
+                baseRoutes.adminRoutes.push(featureRoutes.adminRoutes);
             }
         }
     });
diff --git a/apps/web/src/lib/config/global-config/types/type.ts b/apps/web/src/lib/config/global-config/types/type.ts
@@ -9,9 +9,14 @@ export type GlobalServiceConfig = Record<string, { ENABLED: boolean; VERSION: Fe
 export type FeatureKeyType = typeof FEATURES[keyof typeof FEATURES];
 
 export interface FeatureMenuConfig {
+    version?: FeatureVersion;
     menu: Menu;
     adminMenu?: Menu|null;
     uiAffects?: Record<string, boolean>;
+}
+export interface FeatureRouteConfig {
+    routes: RouteConfig|null;
+    adminRoutes: RouteConfig|null;
     version?: FeatureVersion;
 }
 
@@ -31,7 +36,7 @@ export type ApiClientsSchemaType = {
 };
 
 export interface FeatureConfiguratorType {
-    getRoutes: (isAdmin?: boolean) => RouteConfig|null;
+    getRoutes: () => FeatureRouteConfig;
     getMenu: (config?: GlobalServiceConfig) => FeatureMenuConfig;
     initialize: (version: FeatureVersion) => void;
     uiAffect: FeatureUiAffect[];
diff --git a/apps/web/src/lib/site-initializer/index.ts b/apps/web/src/lib/site-initializer/index.ts
@@ -17,7 +17,7 @@ import { useUserStore } from '@/store/user/user-store';
 
 import config from '@/lib/config';
 import featureSchemaManager from '@/lib/config/global-config/feature-schema-manager';
-import { generateRoutes } from '@/lib/config/global-config/generate-routes';
+import { generateRoutes } from '@/lib/config/global-config/helpers/generate-routes';
 import { initRequestIdleCallback } from '@/lib/request-idle-callback-polyfill';
 import { initAmcharts5 } from '@/lib/site-initializer/amcharts5';
 import { initGtag, initGtm } from '@/lib/site-initializer/analysis';
@@ -53,14 +53,13 @@ const initRouter = (domainId?: string) => {
         (route) => route.name === ROOT_ROUTE.WORKSPACE._NAME,
     )?.children;
 
+    const featureRoutes = generateRoutes();
     if (adminChildren) {
-        const dynamicAdminRoutes = generateRoutes('admin');
-        adminChildren.push(...dynamicAdminRoutes);
+        adminChildren.push(...featureRoutes.adminRoutes);
     }
 
     if (workspaceChildren) {
-        const dynamicWorkspaceRoutes = generateRoutes('workspace');
-        workspaceChildren.push(...dynamicWorkspaceRoutes);
+        workspaceChildren.push(...featureRoutes.routes);
     }
 
     if (!domainId) {
diff --git a/apps/web/src/router/alert-manager-v1-admin-routes.ts b/apps/web/src/router/alert-manager-v1-admin-routes.ts
diff --git a/apps/web/src/router/alert-manager-v1-workspace-routes.ts b/apps/web/src/router/alert-manager-v1-workspace-routes.ts
diff --git a/apps/web/src/router/type.ts b/apps/web/src/router/type.ts
@@ -1,3 +1,13 @@
 import type { ROUTE_SCOPE } from '@/router/constant';
 
 export type RouteScopeType = keyof typeof ROUTE_SCOPE;
+
+export interface RouteParams {
+    menuId: string;
+    name?: string;
+    route?: any;
+    params?: Record<string, string>;
+    query?: Record<string, string | string[]>;
+}
+
+
diff --git a/apps/web/src/router/workspace-routes.ts b/apps/web/src/router/workspace-routes.ts
diff --git a/apps/web/src/services/alert-manager/configurator.ts b/apps/web/src/services/alert-manager/configurator.ts
@@ -1,6 +1,6 @@
-import type { RouteConfig } from 'vue-router';
-
-import type { FeatureConfiguratorType, FeatureMenuConfig, FeatureUiAffect } from '@/lib/config/global-config/types/type';
+import type {
+    FeatureConfiguratorType, FeatureMenuConfig, FeatureRouteConfig, FeatureUiAffect,
+} from '@/lib/config/global-config/types/type';
 import type { Menu } from '@/lib/menu/config';
 import { MENU_ID } from '@/lib/menu/config';
 
@@ -31,10 +31,12 @@ class AlertManagerConfigurator implements FeatureConfiguratorType {
         this.version = version;
     }
 
-    getRoutes(isAdmin?: boolean): RouteConfig|null {
-        if (isAdmin) return null;
-
-        return this.version === 'V1' ? alertManagerRouteV1 : alertManagerRoute;
+    getRoutes(): FeatureRouteConfig {
+        return {
+            routes: this.version === 'V1' ? alertManagerRouteV1 : alertManagerRoute,
+            adminRoutes: null,
+            version: this.version,
+        };
     }
 
     getMenu(): FeatureMenuConfig {
diff --git a/apps/web/src/services/asset-inventory/configurator.ts b/apps/web/src/services/asset-inventory/configurator.ts
@@ -1,6 +1,6 @@
-import type { RouteConfig } from 'vue-router';
-
-import type { FeatureConfiguratorType, FeatureMenuConfig, FeatureUiAffect } from '@/lib/config/global-config/types/type';
+import type {
+    FeatureConfiguratorType, FeatureMenuConfig, FeatureRouteConfig, FeatureUiAffect,
+} from '@/lib/config/global-config/types/type';
 import type { Menu } from '@/lib/menu/config';
 import { MENU_ID } from '@/lib/menu/config';
 
@@ -26,9 +26,12 @@ class AssetInventoryConfigurator implements FeatureConfiguratorType {
         this.version = version;
     }
 
-    // eslint-disable-next-line class-methods-use-this
-    getRoutes(isAdmin?: boolean): RouteConfig | null {
-        return isAdmin ? adminAssetInventoryRoutes : assetInventoryRoute;
+    getRoutes(): FeatureRouteConfig {
+        return {
+            routes: assetInventoryRoute,
+            adminRoutes: adminAssetInventoryRoutes,
+            version: this.version,
+        };
     }
 
     getMenu(): FeatureMenuConfig {
diff --git a/apps/web/src/services/cost-explorer/configurator.ts b/apps/web/src/services/cost-explorer/configurator.ts
@@ -1,6 +1,6 @@
-import type { RouteConfig } from 'vue-router';
-
-import type { FeatureConfiguratorType, FeatureMenuConfig, FeatureUiAffect } from '@/lib/config/global-config/types/type';
+import type {
+    FeatureConfiguratorType, FeatureMenuConfig, FeatureRouteConfig, FeatureUiAffect,
+} from '@/lib/config/global-config/types/type';
 import type { Menu } from '@/lib/menu/config';
 import { MENU_ID } from '@/lib/menu/config';
 
@@ -26,9 +26,12 @@ class CostExplorerConfigurator implements FeatureConfiguratorType {
         this.version = version;
     }
 
-    // eslint-disable-next-line class-methods-use-this
-    getRoutes(isAdmin?: boolean): RouteConfig | null {
-        return isAdmin ? adminCostExplorerRoutes : costExplorerRoutes;
+    getRoutes(): FeatureRouteConfig {
+        return {
+            routes: costExplorerRoutes,
+            adminRoutes: adminCostExplorerRoutes,
+            version: this.version,
+        };
     }
 
     getMenu(): FeatureMenuConfig {
diff --git a/apps/web/src/services/dashboards/configurator.ts b/apps/web/src/services/dashboards/configurator.ts
@@ -1,7 +1,5 @@
-import type { RouteConfig } from 'vue-router';
-
 import type {
-    FeatureConfiguratorType, FeatureMenuConfig, FeatureUiAffect, FeatureVersion,
+    FeatureConfiguratorType, FeatureMenuConfig, FeatureRouteConfig, FeatureUiAffect, FeatureVersion,
 } from '@/lib/config/global-config/types/type';
 import type { Menu } from '@/lib/menu/config';
 import { MENU_ID } from '@/lib/menu/config';
@@ -18,9 +16,12 @@ class DashboardConfigurator implements FeatureConfiguratorType {
         this.version = version;
     }
 
-    // eslint-disable-next-line class-methods-use-this
-    getRoutes(isAdmin?: boolean): RouteConfig | null {
-        return isAdmin ? adminDashboardsRoute : dashboardsRoute;
+    getRoutes(): FeatureRouteConfig {
+        return {
+            routes: dashboardsRoute,
+            adminRoutes: adminDashboardsRoute,
+            version: this.version,
+        };
     }
 
     getMenu(): FeatureMenuConfig {
diff --git a/apps/web/src/services/iam/configurator.ts b/apps/web/src/services/iam/configurator.ts
@@ -1,7 +1,6 @@
-import type { RouteConfig } from 'vue-router';
-
 import type {
-    FeatureConfiguratorType, FeatureMenuConfig, FeatureUiAffect, GlobalServiceConfig,
+    FeatureConfiguratorType, FeatureMenuConfig, FeatureRouteConfig, FeatureUiAffect,
+    GlobalServiceConfig,
 } from '@/lib/config/global-config/types/type';
 import type { Menu } from '@/lib/menu/config';
 import { MENU_ID } from '@/lib/menu/config';
@@ -18,9 +17,12 @@ class IamConfigurator implements FeatureConfiguratorType {
         this.version = version;
     }
 
-    // eslint-disable-next-line class-methods-use-this
-    getRoutes(isAdmin?: boolean): RouteConfig | null {
-        return isAdmin ? adminIamRoutes : iamRoutes;
+    getRoutes(): FeatureRouteConfig {
+        return {
+            routes: iamRoutes,
+            adminRoutes: adminIamRoutes,
+            version: this.version,
+        };
     }
 
     getMenu(config?: GlobalServiceConfig): FeatureMenuConfig {
diff --git a/apps/web/src/services/ops-flow/configurator.ts b/apps/web/src/services/ops-flow/configurator.ts
@@ -1,6 +1,6 @@
-import type { RouteConfig } from 'vue-router';
-
-import type { FeatureConfiguratorType, FeatureMenuConfig, FeatureUiAffect } from '@/lib/config/global-config/types/type';
+import type {
+    FeatureConfiguratorType, FeatureMenuConfig, FeatureRouteConfig, FeatureUiAffect,
+} from '@/lib/config/global-config/types/type';
 import type { Menu } from '@/lib/menu/config';
 import { MENU_ID } from '@/lib/menu/config';
 
@@ -16,9 +16,12 @@ class OpsFlowConfigurator implements FeatureConfiguratorType {
         this.version = version;
     }
 
-    // eslint-disable-next-line class-methods-use-this
-    getRoutes(isAdmin?: boolean): RouteConfig {
-        return isAdmin ? adminOpsFlowRoutes : opsFlowRoutes;
+    getRoutes(): FeatureRouteConfig {
+        return {
+            routes: opsFlowRoutes,
+            adminRoutes: adminOpsFlowRoutes,
+            version: this.version,
+        };
     }
 
     getMenu(): FeatureMenuConfig {
diff --git a/apps/web/src/services/project/configurator.ts b/apps/web/src/services/project/configurator.ts
@@ -1,6 +1,6 @@
-import type { RouteConfig } from 'vue-router';
-
-import type { FeatureConfiguratorType, FeatureMenuConfig, FeatureUiAffect } from '@/lib/config/global-config/types/type';
+import type {
+    FeatureConfiguratorType, FeatureMenuConfig, FeatureRouteConfig, FeatureUiAffect,
+} from '@/lib/config/global-config/types/type';
 import { MENU_ID } from '@/lib/menu/config';
 
 import projectRoutesV1 from '@/services/project/v1/routes/routes';
@@ -25,9 +25,12 @@ class ProjectConfigurator implements FeatureConfiguratorType {
         this.version = version;
     }
 
-    getRoutes(isAdmin?: boolean): RouteConfig|null {
-        if (isAdmin) return null;
-        return this.version === 'V1' ? projectRoutesV1 : projectRoutes;
+    getRoutes(): FeatureRouteConfig {
+        return {
+            routes: this.version === 'V1' ? projectRoutesV1 : projectRoutes,
+            adminRoutes: null,
+            version: this.version,
+        };
     }
 
     getMenu(): FeatureMenuConfig {
diff --git a/apps/web/src/services/service-account/configurator.ts b/apps/web/src/services/service-account/configurator.ts
@@ -1,6 +1,6 @@
-import type { RouteConfig } from 'vue-router';
-
-import type { FeatureConfiguratorType, FeatureMenuConfig, FeatureUiAffect } from '@/lib/config/global-config/types/type';
+import type {
+    FeatureConfiguratorType, FeatureMenuConfig, FeatureRouteConfig, FeatureUiAffect,
+} from '@/lib/config/global-config/types/type';
 import { MENU_ID } from '@/lib/menu/config';
 
 import adminServiceAccountRoute from '@/services/service-account/routes/admin/routes';
@@ -15,9 +15,12 @@ class ServiceAccountConfigurator implements FeatureConfiguratorType {
         this.version = version;
     }
 
-    // eslint-disable-next-line class-methods-use-this
-    getRoutes(isAdmin?: boolean): RouteConfig|null {
-        return isAdmin ? adminServiceAccountRoute : serviceAccountRoute;
+    getRoutes(): FeatureRouteConfig {
+        return {
+            routes: serviceAccountRoute,
+            adminRoutes: adminServiceAccountRoute,
+            version: this.version,
+        };
     }
 
     getMenu(): FeatureMenuConfig {
