[#12419] Grouping Filter field in ServerMap

jihea-park · jihea-park · commit 8c9c455d4de5 · 2025-05-13T11:42:01.000+09:00
diff --git a/web-frontend/src/main/v3/packages/ui/src/atoms/serverMapMock.ts b/web-frontend/src/main/v3/packages/ui/src/atoms/serverMapMock.ts
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
@@ -110,18 +110,16 @@ export namespace FilteredMapType {
     key: string;
     from: string;
     to: string;
-    // fromAgent?: string[]; // Deprecated;
-    // toAgent?: string[]; // Deprecated;
-    fromAgents: Agent[];
-    toAgents: Agent[];
-    // fromAgentIdNameMap?: FromAgentIdNameMap;
-    // toAgentIdNameMap?: ToAgentIdNameMap;
+    fromAgents?: Agent[];
+    toAgents?: Agent[];
     sourceInfo: SourceInfo;
     targetInfo: TargetInfo;
-    filterApplicationName: string;
-    filterApplicationServiceTypeCode: number;
-    filterApplicationServiceTypeName: string;
-    filterTargetRpcList?: FilterTargetRpcList[];
+    filter: {
+      applicationName: string;
+      serviceTypeCode: number;
+      serviceTypeName: string;
+      outRpcList?: FilterTargetRpcList[];
+    };
     totalCount: number;
     errorCount: number;
     slowCount: number;
@@ -227,7 +225,6 @@ export namespace FilteredMapType {
     agentTimeSeriesHistogram: AgentTimeSeriesHistogram;
     instanceCount: number;
     instanceErrorCount: number;
-    // 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
@@ -39,16 +39,16 @@ export namespace GetServerMap {
     key: string;
     from: string;
     to: string;
-    // fromAgent?: string[]; // Deprecated
-    // toAgent?: string[]; // Deprecated
-    fromAgents: Agent[];
-    toAgents: Agent[];
+    fromAgents?: Agent[];
+    toAgents?: Agent[];
     sourceInfo: SourceInfo;
     targetInfo: TargetInfo;
-    filterApplicationName: string;
-    filterApplicationServiceTypeCode: number;
-    filterApplicationServiceTypeName: string;
-    filterTargetRpcList?: FilterTargetRpcList[];
+    filter: {
+      applicationName: string;
+      serviceTypeCode: number;
+      serviceTypeName: string;
+      outRpcList?: FilterTargetRpcList[];
+    };
     totalCount: number;
     errorCount: number;
     slowCount: number;
@@ -126,7 +126,6 @@ export namespace GetServerMap {
     timeSeriesHistogram: TimeSeriesHistogram[];
     instanceCount: number;
     instanceErrorCount: number;
-    // agentIds: string[]; // Deprecated
     agents: Agent[];
     isMerged?: boolean;
     mergedNodes?: any[];
diff --git a/web-frontend/src/main/v3/packages/ui/src/constants/types/TransactionInfo.ts b/web-frontend/src/main/v3/packages/ui/src/constants/types/TransactionInfo.ts
@@ -179,9 +179,11 @@ export namespace TransactionInfoType {
     fromAgentIdNameMap?: FromAgentIdNameMap;
     sourceInfo: SourceInfo;
     targetInfo: TargetInfo;
-    filterApplicationName: string;
-    filterApplicationServiceTypeCode: number;
-    filterApplicationServiceTypeName: string;
+    filter: {
+      applicationName: string;
+      serviceTypeCode: number;
+      serviceTypeName: string;
+    };
     totalCount: number;
     errorCount: number;
     slowCount: number;
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
@@ -307,7 +307,7 @@ export const FilteredMapPage = ({
                             addedHint =
                               link.sourceInfo.isWas && link.targetInfo.isWas
                                 ? {
-                                    [link.targetInfo.applicationName]: link.filterTargetRpcList,
+                                    [link.targetInfo.applicationName]: link.filter?.outRpcList,
                                   }
                                 : {};
                           }
@@ -376,7 +376,7 @@ export const FilteredMapPage = ({
                         const addedHint =
                           link?.sourceInfo.isWas && link.targetInfo.isWas
                             ? {
-                                [link.targetInfo.applicationName]: link.filterTargetRpcList,
+                                [link.targetInfo.applicationName]: link.filter?.outRpcList,
                               }
                             : // eslint-disable-next-line @typescript-eslint/no-explicit-any
                               ({} as any);
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
@@ -290,7 +290,7 @@ export const ServerMapPage = ({
                               addedHint =
                                 link.sourceInfo.isWas && link.targetInfo.isWas
                                   ? {
-                                      [link.targetInfo.applicationName]: link.filterTargetRpcList,
+                                      [link.targetInfo.applicationName]: link.filter?.outRpcList,
                                     }
                                   : {};
                             }
@@ -355,7 +355,7 @@ export const ServerMapPage = ({
                         const addedHint =
                           link?.sourceInfo.isWas && link.targetInfo.isWas
                             ? {
-                                [link.targetInfo.applicationName]: link.filterTargetRpcList,
+                                [link.targetInfo.applicationName]: link.filter?.outRpcList,
                               }
                             : // eslint-disable-next-line @typescript-eslint/no-explicit-any
                               ({} as any);
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
@@ -102,7 +102,7 @@ function mergeLinkAgentIds(
   const newAgents = neo[type];
   if (newAgents) {
     newAgents?.forEach((agent: FilteredMap.Agent) => {
-      const oldAgentIndex = oldAgents.findIndex((oldAgent) => oldAgent.id === agent.id);
+      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
@@ -346,10 +346,12 @@ export const prevLink: FilteredMap.LinkData = {
     serviceTypeCode: 1007,
     isWas: true,
   },
-  filterApplicationName: 'app3',
-  filterApplicationServiceTypeCode: 1050,
-  filterApplicationServiceTypeName: 'VERTX',
-  filterTargetRpcList: [],
+  filter: {
+    applicationName: 'app3',
+    serviceTypeCode: 1050,
+    serviceTypeName: 'VERTX',
+    outRpcList: [],
+  },
   totalCount: 1,
   errorCount: 0,
   slowCount: 0,
@@ -443,10 +445,12 @@ export const newLink: FilteredMap.LinkData = {
     serviceTypeCode: 1007,
     isWas: true,
   },
-  filterApplicationName: 'app3',
-  filterApplicationServiceTypeCode: 1050,
-  filterApplicationServiceTypeName: 'VERTX',
-  filterTargetRpcList: [],
+  filter: {
+    applicationName: 'app3',
+    serviceTypeCode: 1050,
+    serviceTypeName: 'VERTX',
+    outRpcList: [],
+  },
   totalCount: 2,
   errorCount: 0,
   slowCount: 0,
@@ -541,10 +545,12 @@ export const resultLink: FilteredMap.LinkData = {
     serviceTypeCode: 1007,
     isWas: true,
   },
-  filterApplicationName: 'app3',
-  filterApplicationServiceTypeCode: 1050,
-  filterApplicationServiceTypeName: 'VERTX',
-  filterTargetRpcList: [],
+  filter: {
+    applicationName: 'app3',
+    serviceTypeCode: 1050,
+    serviceTypeName: 'VERTX',
+    outRpcList: [],
+  },
   totalCount: 3,
   errorCount: 0,
   slowCount: 0,

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ export const FilteredMapPage = ({`
`307`	`307`	`addedHint =`
`308`	`308`	`link.sourceInfo.isWas && link.targetInfo.isWas`
`309`	`309`	`? {`
`310`		`- [link.targetInfo.applicationName]: link.filterTargetRpcList,`
	`310`	`+ [link.targetInfo.applicationName]: link.filter?.outRpcList,`
`311`	`311`	`}`
`312`	`312`	`: {};`
`313`	`313`	`}`
`@@ -376,7 +376,7 @@ export const FilteredMapPage = ({`
`376`	`376`	`const addedHint =`
`377`	`377`	`link?.sourceInfo.isWas && link.targetInfo.isWas`
`378`	`378`	`? {`
`379`		`- [link.targetInfo.applicationName]: link.filterTargetRpcList,`
	`379`	`+ [link.targetInfo.applicationName]: link.filter?.outRpcList,`
`380`	`380`	`}`
`381`	`381`	`: // eslint-disable-next-line @typescript-eslint/no-explicit-any`
`382`	`382`	`({} as any);`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ export const ServerMapPage = ({`
`290`	`290`	`addedHint =`
`291`	`291`	`link.sourceInfo.isWas && link.targetInfo.isWas`
`292`	`292`	`? {`
`293`		`- [link.targetInfo.applicationName]: link.filterTargetRpcList,`
	`293`	`+ [link.targetInfo.applicationName]: link.filter?.outRpcList,`
`294`	`294`	`}`
`295`	`295`	`: {};`
`296`	`296`	`}`
`@@ -355,7 +355,7 @@ export const ServerMapPage = ({`
`355`	`355`	`const addedHint =`
`356`	`356`	`link?.sourceInfo.isWas && link.targetInfo.isWas`
`357`	`357`	`? {`
`358`		`- [link.targetInfo.applicationName]: link.filterTargetRpcList,`
	`358`	`+ [link.targetInfo.applicationName]: link.filter?.outRpcList,`
`359`	`359`	`}`
`360`	`360`	`: // eslint-disable-next-line @typescript-eslint/no-explicit-any`
`361`	`361`	`({} as any);`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ function mergeLinkAgentIds(`
`102`	`102`	`const newAgents = neo[type];`
`103`	`103`	`if (newAgents) {`
`104`	`104`	`newAgents?.forEach((agent: FilteredMap.Agent) => {`
`105`		`- const oldAgentIndex = oldAgents.findIndex((oldAgent) => oldAgent.id === agent.id);`
	`105`	`+ const oldAgentIndex = oldAgents?.findIndex((oldAgent) => oldAgent.id === agent.id);`
`106`	`106`	`if (oldAgentIndex === -1) {`
`107`	`107`	`old[type]?.push(agent);`
`108`	`108`	`}`