Merge latest main with optimized multi-branch features into server_dashboard

src/core/dummyDataGenerator.ts

@@ -196,5 +196,5 @@ export function generateDummyData(): MasterAssetData {
     });
   }
 
-  return { pc, server, storage, equip, mobile, subSw, permSw, swUsers, logs };
+  return { pc, server, storage, equip, mobile, subSw, permSw, cloud: [], swUsers, logs, sw: [], hw: [] };
 }

src/core/state.ts

@@ -16,12 +16,14 @@ export interface MasterAssetData {
   // 동료 코드 호환용 통합 배열 (프론트엔드 로직용)
   hw: HardwareAsset[];
   sw: SoftwareAsset[];
+  hw: HardwareAsset[];
 }
 
 export interface AppState {
-  activeCategory: 'dashboard' | 'hw' | 'sw';
-  activeSubTab: string; // '대시보드', '개인PC', '서버', '스토리지', '전산비품', '구독SW', '영구SW', '클라우드'
+  activeCategory: 'dashboard' | 'hw' | 'sw' | 'ops';
+  activeSubTab: string; 
   masterData: MasterAssetData;
+  activeCharts: any[];
 }
 
 // 초기 상태
@@ -40,8 +42,10 @@ export const state: AppState = {
     hw: [], // 호환용
     sw: [], // 호환용
     swUsers: [],
-    logs: []
-  }
+    logs: [],
+    hw: []
+  },
+  activeCharts: []
 };
 
 /**
@@ -85,12 +89,19 @@ export async function loadMasterDataFromDB() {
       }
     }
 
-    // 동료 코드 호환을 위한 통합 sw 배열 생성
+    // 동료 코드 호환을 위한 통합 sw/hw 배열 생성
     state.masterData.sw = [
       ...state.masterData.subSw,
       ...state.masterData.permSw,
       ...state.masterData.cloud
     ];
+    state.masterData.hw = [
+      ...state.masterData.pc,
+      ...state.masterData.server,
+      ...state.masterData.storage,
+      ...state.masterData.equip,
+      ...state.masterData.mobile
+    ];
 
     // 하드웨어 통합 배열 생성 (대시보드 등에서 사용)
     state.masterData.hw = [