fix(jmcagent): correct notification handling

cryostatio · Apr 19, 2024 · 0f6ced3 · 0f6ced3
1 parent 89e2786
commit 0f6ced3
Showing 1 changed file with 9 additions and 2 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]);