merge: merge origin/main into HW_Dashboard and resolve conflicts

src/core/state.ts

@@ -37,6 +37,7 @@ export interface MasterAssetData {
 export interface AppState {
   activeCategory: 'dashboard' | 'hw' | 'sw' | 'ops' | 'vip' | 'fac' | 'users' | 'etc';
   activeSubTab: string;
+  viewMode: 'location' | 'legacy' | 'list';
   masterData: MasterAssetData;
   activeCharts: any[];
   currentUserRole: 'admin' | 'user';
@@ -46,6 +47,7 @@ export interface AppState {
 export const state: AppState = {
   activeCategory: 'hw',
   activeSubTab: '대시보드',
+  viewMode: 'location',
   activeCharts: [],
   currentUserRole: 'user',
   masterData: {