[#12419] Cleanup duplicate Agent field in ServerMap

jihea-park · jihea-park · commit d46ac60284f0 · 2025-05-13T11:42:01.000+09:00
diff --git a/web-frontend/src/main/v3/packages/ui/src/constants/types/FilteredMap.ts b/web-frontend/src/main/v3/packages/ui/src/constants/types/FilteredMap.ts
@@ -1,5 +1,9 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 export namespace FilteredMapType {
+  export interface Agent {
+    id: string;
+    name: string;
+  }
   export interface FilterState {
     fromApplication?: SearchParameters['fa']; // from applicationName
     fromServiceType?: SearchParameters['fst']; // from serviceType
@@ -106,10 +110,12 @@ export namespace FilteredMapType {
     key: string;
     from: string;
     to: string;
-    fromAgent?: string[];
-    toAgent?: string[];
-    fromAgentIdNameMap?: FromAgentIdNameMap;
-    toAgentIdNameMap?: ToAgentIdNameMap;
+    // fromAgent?: string[]; // Deprecated;
+    // toAgent?: string[]; // Deprecated;
+    fromAgents: Agent[];
+    toAgents: Agent[];
+    // fromAgentIdNameMap?: FromAgentIdNameMap;
+    // toAgentIdNameMap?: ToAgentIdNameMap;
     sourceInfo: SourceInfo;
     targetInfo: TargetInfo;
     filterApplicationName: string;
@@ -221,8 +227,8 @@ export namespace FilteredMapType {
     agentTimeSeriesHistogram: AgentTimeSeriesHistogram;
     instanceCount: number;
     instanceErrorCount: number;
-    agentIds: string[];
-    agentIdNameMap: AgentIdNameMap;
+    // agentIds: string[];
+    agents: Agent[];
     serverList: ServerList;
   }
 
diff --git a/web-frontend/src/main/v3/packages/ui/src/constants/types/GetServerMap.ts b/web-frontend/src/main/v3/packages/ui/src/constants/types/GetServerMap.ts
@@ -30,14 +30,19 @@ export namespace GetServerMap {
     toDateTime: string;
   }
 
+  export interface Agent {
+    id: string;
+    name: string;
+  }
+
   export interface LinkData {
     key: string;
     from: string;
     to: string;
-    fromAgent?: string[];
-    toAgent?: string[];
-    fromAgentIdNameMap?: FromAgentIdNameMap;
-    toAgentIdNameMap?: ToAgentIdNameMap;
+    // fromAgent?: string[]; // Deprecated
+    // toAgent?: string[]; // Deprecated
+    fromAgents: Agent[];
+    toAgents: Agent[];
     sourceInfo: SourceInfo;
     targetInfo: TargetInfo;
     filterApplicationName: string;
@@ -121,8 +126,8 @@ export namespace GetServerMap {
     timeSeriesHistogram: TimeSeriesHistogram[];
     instanceCount: number;
     instanceErrorCount: number;
-    agentIds: string[];
-    agentIdNameMap: AgentIdNameMap;
+    // agentIds: string[]; // Deprecated
+    agents: Agent[];
     isMerged?: boolean;
     mergedNodes?: any[];
     topCountNodes?: any[];
diff --git a/web-frontend/src/main/v3/packages/ui/src/pages/FilteredMap.tsx b/web-frontend/src/main/v3/packages/ui/src/pages/FilteredMap.tsx
@@ -106,10 +106,9 @@ export const FilteredMapPage = ({
         if (prevFilter.applicationName && prevFilter.serviceType) {
           return {
             ...prevFilter,
-            agents: (
-              serverMapData?.applicationMapData.nodeDataArray as FilteredMap.NodeData[]
-            )?.find((n) => n.key === `${prevFilter.applicationName}^${prevFilter.serviceType}`)
-              ?.agentIds,
+            agents: (serverMapData?.applicationMapData.nodeDataArray as FilteredMap.NodeData[])
+              ?.find((n) => n.key === `${prevFilter.applicationName}^${prevFilter.serviceType}`)
+              ?.agents?.map((agent) => agent.id),
           };
         } else if (
           prevFilter.fromApplication &&
@@ -127,8 +126,8 @@ export const FilteredMapPage = ({
 
           return {
             ...prevFilter,
-            fromAgents: linkData?.fromAgent,
-            toAgents: linkData?.toAgent,
+            fromAgents: linkData?.fromAgents?.map((agent) => agent.id),
+            toAgents: linkData?.toAgents?.map((agent) => agent.id),
           };
         }
         return prevFilter;
@@ -354,7 +353,7 @@ export const FilteredMapPage = ({
                               .nodeDataArray as FilteredMap.NodeData[]
                           ).find((n) => n.key === nodeData.id);
                           serverInfos = {
-                            agents: node?.agentIds,
+                            agents: node?.agents?.map((agent) => agent.id),
                           };
                         } else if ('source' in data) {
                           const edgeData = data as Edge;
@@ -363,8 +362,8 @@ export const FilteredMapPage = ({
                               .linkDataArray as FilteredMap.LinkData[]
                           ).find((l) => l.key === edgeData.id);
                           serverInfos = {
-                            fromAgents: link?.fromAgent,
-                            toAgents: link?.toAgent,
+                            fromAgents: link?.fromAgents?.map((agent) => agent.id),
+                            toAgents: link?.toAgents?.map((agent) => agent.id),
                           };
                         }
                         setFilter(getDefaultFilters(data, serverInfos));
diff --git a/web-frontend/src/main/v3/packages/ui/src/pages/ServerMap.tsx b/web-frontend/src/main/v3/packages/ui/src/pages/ServerMap.tsx
@@ -332,7 +332,7 @@ export const ServerMapPage = ({
                               .nodeDataArray as GetServerMap.NodeData[]
                           ).find((n) => n.key === nodeData.id);
                           serverInfos = {
-                            agents: node?.agentIds,
+                            agents: node?.agents?.map((agent) => agent?.id),
                           };
                         } else if ('source' in data) {
                           const edgeData = data as Edge;
@@ -341,8 +341,8 @@ export const ServerMapPage = ({
                               .linkDataArray as GetServerMap.LinkData[]
                           ).find((l) => l.key === edgeData.id);
                           serverInfos = {
-                            fromAgents: link?.fromAgent,
-                            toAgents: link?.toAgent,
+                            fromAgents: link?.fromAgents?.map((agent) => agent?.id),
+                            toAgents: link?.toAgents?.map((agent) => agent?.id),
                           };
                         }
                         setShowFilter(true);
diff --git a/web-frontend/src/main/v3/packages/ui/src/utils/helper/filteredMap/merge.ts b/web-frontend/src/main/v3/packages/ui/src/utils/helper/filteredMap/merge.ts
@@ -21,7 +21,7 @@ export const mergeFilteredMapNodeData = (
   acc.instanceErrorCount = Math.max(acc.instanceErrorCount, neo.instanceErrorCount);
 
   mergeAgentIds(acc, neo);
-  mergeNodeAgentIdNameMap(acc, neo);
+  // mergeNodeAgentIdNameMap(acc, neo);
   mergeHistogram(acc, neo);
   mergeResponseStatistics(acc, neo);
   mergeAgentHistogram(acc, neo);
@@ -59,11 +59,11 @@ export const mergeFilteredMapLinkData = (
   acc.errorCount += neo.errorCount;
   acc.totalCount += neo.totalCount;
 
-  mergeLinkAgentIdNameMap(acc, neo, 'fromAgentIdNameMap');
-  mergeLinkAgentIdNameMap(acc, neo, 'toAgentIdNameMap');
+  // mergeLinkAgentIdNameMap(acc, neo, 'fromAgentIdNameMap');
+  // mergeLinkAgentIdNameMap(acc, neo, 'toAgentIdNameMap');
   mergeHistogram(acc, neo);
-  mergeLinkAgentIds(acc, neo, 'fromAgent');
-  mergeLinkAgentIds(acc, neo, 'toAgent');
+  mergeLinkAgentIds(acc, neo, 'fromAgents');
+  mergeLinkAgentIds(acc, neo, 'toAgents');
   mergeResponseStatistics(acc, neo);
   mergeTimeSeriesHistogram(current, newNode);
   mergeAgentTimeSeriesHistogramByType(
@@ -85,54 +85,26 @@ export const mergeFilteredMapLinkData = (
 };
 
 function mergeAgentIds(old: FilteredMap.NodeData, neo: FilteredMap.NodeData): void {
-  neo.agentIds.forEach((agentId: string) => {
-    if (old.agentIds.indexOf(agentId) === -1) {
-      old.agentIds.push(agentId);
+  neo.agents.forEach((agent: FilteredMap.Agent) => {
+    const oldAgentIndex = old.agents.findIndex((oldAgent) => oldAgent.id === agent.id);
+    if (oldAgentIndex === -1) {
+      old.agents.push(agent);
     }
   });
 }
 
-function mergeLinkAgentIdNameMap(
-  old: FilteredMap.LinkData,
-  neo: FilteredMap.LinkData,
-  type: keyof FilteredMap.LinkData,
-): void {
-  const oldMap = old[type] as FilteredMap.FromAgentIdNameMap | FilteredMap.ToAgentIdNameMap;
-  const newMap = neo[type] as FilteredMap.FromAgentIdNameMap | FilteredMap.ToAgentIdNameMap;
-  if (newMap) {
-    const oldIds = Object.keys(oldMap!);
-    const newIds = Object.keys(newMap);
-    newIds.forEach((agentId: string) => {
-      if (oldIds.indexOf(agentId) === -1) {
-        oldMap[agentId] = newMap[agentId];
-      }
-    });
-  }
-}
-
-function mergeNodeAgentIdNameMap(old: FilteredMap.NodeData, neo: FilteredMap.NodeData): void {
-  if (neo.agentIdNameMap) {
-    const oldIds = Object.keys(old.agentIdNameMap);
-    const newIds = Object.keys(neo.agentIdNameMap);
-    newIds.forEach((agentId: string) => {
-      if (oldIds.indexOf(agentId) === -1) {
-        old.agentIdNameMap[agentId] = neo.agentIdNameMap[agentId];
-      }
-    });
-  }
-}
-
 function mergeLinkAgentIds(
   old: FilteredMap.LinkData,
   neo: FilteredMap.LinkData,
-  type: 'fromAgent' | 'toAgent',
+  type: 'fromAgents' | 'toAgents',
 ): void {
-  const oldIds = old[type];
-  const newIds = neo[type];
-  if (newIds) {
-    newIds?.forEach((agentId: string) => {
-      if (oldIds?.indexOf(agentId) === -1) {
-        old[type]?.push(agentId);
+  const oldAgents = old[type];
+  const newAgents = neo[type];
+  if (newAgents) {
+    newAgents?.forEach((agent: FilteredMap.Agent) => {
+      const oldAgentIndex = oldAgents.findIndex((oldAgent) => oldAgent.id === agent.id);
+      if (oldAgentIndex === -1) {
+        old[type]?.push(agent);
       }
     });
   }
diff --git a/web-frontend/src/main/v3/packages/ui/src/utils/helper/filteredMap/mergeMock.ts b/web-frontend/src/main/v3/packages/ui/src/utils/helper/filteredMap/mergeMock.ts
