fix(jmcagent): correct notification handling (#1248)

cryostatio · Apr 23, 2024 · c2f01e0 · c2f01e0
1 parent a66caeb
commit c2f01e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/app/Agent/AgentLiveProbes.tsx b/src/app/Agent/AgentLiveProbes.tsx
@@ -210,7 +210,7 @@ export const AgentLiveProbes: React.FC<AgentLiveProbesProps> = (_) => {
         context.target.target(),
         context.notificationChannel.messages(NotificationCategory.ProbeTemplateApplied),
       ]).subscribe(([currentTarget, e]) => {
-        if (currentTarget?.connectUrl != e.message.targetId && currentTarget?.jvmId != e.message.jvmId) {
+        if (currentTarget?.jvmId != e.message.jvmId) {
           return;
         }
         setProbes((old) => {
@@ -227,7 +227,14 @@ export const AgentLiveProbes: React.FC<AgentLiveProbesProps> = (_) => {
 
   React.useEffect(() => {
     addSubscription(
-      context.notificationChannel.messages(NotificationCategory.ProbesRemoved).subscribe((_) => setProbes([])),
+      combineLatest([
+        context.target.target(),
+        context.notificationChannel.messages(NotificationCategory.ProbesRemoved),
+      ]).subscribe(([currentTarget, e]) => {
+        if (currentTarget?.jvmId == e.message.jvmId) {
+          setProbes([]);
+        }
+      }),
     );
   }, [addSubscription, context, context.notificationChannel, setProbes]);
 

diff --git a/src/test/Agent/AgentLiveProbes.test.tsx b/src/test/Agent/AgentLiveProbes.test.tsx
@@ -68,9 +68,8 @@ const mockApplyTemplateNotification = {
     type: mockMessageType,
   } as MessageMeta,
   message: {
-    targetId: mockConnectUrl,
-    events: [mockAnotherProbe],
     jvmId: mockJvmId,
+    events: [mockAnotherProbe],
   },
 } as NotificationMessage;
 
@@ -80,7 +79,7 @@ const mockRemoveProbesNotification = {
     type: mockMessageType,
   } as MessageMeta,
   message: {
-    target: mockTarget,
+    jvmId: mockJvmId,
   },
 } as NotificationMessage;