Revert "remove WsClientActivity notifications"

This reverts commit 0375352.
cryostatio · Dec 14, 2023 · 3574720 · 3574720
1 parent 0375352
commit 3574720
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 34 deletions.
diff --git a/src/app/Shared/Services/NotificationChannel.service.tsx b/src/app/Shared/Services/NotificationChannel.service.tsx
@@ -127,7 +127,7 @@ export class NotificationChannel {
                 fn.apply(this.notifications, [
                   'WebSocket connection lost',
                   msg,
-                  'Client Status',
+                  NotificationCategory.WsClientActivity,
                   fn === this.notifications.info,
                 ]);
               },

diff --git a/src/app/Shared/Services/Notifications.service.tsx b/src/app/Shared/Services/Notifications.service.tsx
@@ -98,7 +98,12 @@ export class NotificationService {
 
   cryostatStatusNotifications(): Observable<Notification[]> {
     return this.notifications().pipe(
-      map((a) => a.filter((n) => this.isJvmDiscovery(n) && !NotificationService.isProblemNotification(n))),
+      map((a) =>
+        a.filter(
+          (n) =>
+            (this.isWsClientActivity(n) || this.isJvmDiscovery(n)) && !NotificationService.isProblemNotification(n),
+        ),
+      ),
     );
   }
 
@@ -148,7 +153,11 @@ export class NotificationService {
   }
 
   private isActionNotification(n: Notification): boolean {
-    return !this.isJvmDiscovery(n) && !NotificationService.isProblemNotification(n);
+    return !this.isWsClientActivity(n) && !this.isJvmDiscovery(n) && !NotificationService.isProblemNotification(n);
+  }
+
+  private isWsClientActivity(n: Notification): boolean {
+    return n.category === NotificationCategory.WsClientActivity;
   }
 
   private isJvmDiscovery(n: Notification): boolean {

diff --git a/src/app/Shared/Services/api.types.ts b/src/app/Shared/Services/api.types.ts
@@ -537,6 +537,7 @@ export interface Notification {
 }
 
 export enum NotificationCategory {
+  WsClientActivity = 'WsClientActivity',
   TargetJvmDiscovery = 'TargetJvmDiscovery',
   ActiveRecordingCreated = 'ActiveRecordingCreated',
   ActiveRecordingStopped = 'ActiveRecordingStopped',

diff --git a/src/app/Shared/Services/api.utils.ts b/src/app/Shared/Services/api.utils.ts
@@ -222,6 +222,19 @@ export const messageKeys = new Map([
       },
     } as NotificationMessageMapper,
   ],
+  [
+    NotificationCategory.WsClientActivity,
+    {
+      variant: AlertVariant.info,
+      title: 'WebSocket Client Activity',
+      body: (evt) => {
+        const addr = Object.keys(evt.message)[0];
+        const status = evt.message[addr];
+        return `Client at ${addr} ${status}`;
+      },
+      hidden: true,
+    } as NotificationMessageMapper,
+  ],
   [
     NotificationCategory.ActiveRecordingCreated,
     {

diff --git a/src/mirage/index.ts b/src/mirage/index.ts
@@ -27,7 +27,25 @@ export const startMirage = ({ environment = 'development' } = {}) => {
 
   // Create a mock server socket to send notifications
   let websocket: Client;
-  wsServer.on('connection', (_) => {});
+  wsServer.on('connection', (socket) => {
+    websocket = socket;
+    socket.on('message', (_) => {
+      socket.send(
+        JSON.stringify({
+          meta: {
+            category: 'WsClientActivity',
+            type: {
+              type: 'application',
+              subtype: 'json',
+            },
+          },
+          message: {
+            '127.0.0.1': 'accepted',
+          },
+        }),
+      );
+    });
+  });
 
   // Create a MirageJS Server to intercept network requests
   return createServer({

diff --git a/src/test/Settings/NotificationControl.test.tsx b/src/test/Settings/NotificationControl.test.tsx
@@ -147,14 +147,14 @@ describe('<NotificationControl/>', () => {
 
     await user.click(expandButton);
 
-    const targetDiscovery = screen.getByLabelText('Target JVM Discovery');
-    expect(targetDiscovery).toBeInTheDocument();
-    expect(targetDiscovery).toBeVisible();
-    expect(targetDiscovery).toBeChecked();
+    const webSocketAct = screen.getByLabelText('WebSocket Client Activity');
+    expect(webSocketAct).toBeInTheDocument();
+    expect(webSocketAct).toBeVisible();
+    expect(webSocketAct).toBeChecked();
 
-    await user.click(targetDiscovery);
+    await user.click(webSocketAct);
 
-    expect(targetDiscovery).not.toBeChecked();
+    expect(webSocketAct).not.toBeChecked();
     expect(enableSwitch).not.toBeChecked();
   });
 });
diff --git a/src/test/Settings/__snapshots__/NotificationControl.test.tsx.snap b/src/test/Settings/__snapshots__/NotificationControl.test.tsx.snap
@@ -239,6 +239,45 @@ exports[`<NotificationControl/> renders correctly 1`] = `
             data-ouia-component-id="OUIA-Generated-Switch-2"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
+            htmlFor="WsClientActivity"
+          >
+            <input
+              aria-label=""
+              aria-labelledby="WsClientActivity-on"
+              checked={true}
+              className="pf-c-switch__input"
+              disabled={false}
+              id="WsClientActivity"
+              onChange={[Function]}
+              type="checkbox"
+            />
+            <span
+              className="pf-c-switch__toggle"
+            />
+            <span
+              aria-hidden="true"
+              className="pf-c-switch__label pf-m-on"
+              id="WsClientActivity-on"
+            >
+              WebSocket Client Activity
+            </span>
+            <span
+              aria-hidden="true"
+              className="pf-c-switch__label pf-m-off"
+              id="WsClientActivity-off"
+            >
+              WebSocket Client Activity
+            </span>
+          </label>
+        </div>
+        <div
+          className="pf-l-stack__item"
+        >
+          <label
+            className="pf-c-switch"
+            data-ouia-component-id="OUIA-Generated-Switch-3"
+            data-ouia-component-type="PF4/Switch"
+            data-ouia-safe={true}
             htmlFor="TargetJvmDiscovery"
           >
             <input
@@ -275,7 +314,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-3"
+            data-ouia-component-id="OUIA-Generated-Switch-4"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ActiveRecordingCreated"
@@ -314,7 +353,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-4"
+            data-ouia-component-id="OUIA-Generated-Switch-5"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ActiveRecordingStopped"
@@ -353,7 +392,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-5"
+            data-ouia-component-id="OUIA-Generated-Switch-6"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ActiveRecordingSaved"
@@ -392,7 +431,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-6"
+            data-ouia-component-id="OUIA-Generated-Switch-7"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ActiveRecordingDeleted"
@@ -431,7 +470,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-7"
+            data-ouia-component-id="OUIA-Generated-Switch-8"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="SnapshotCreated"
@@ -470,7 +509,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-8"
+            data-ouia-component-id="OUIA-Generated-Switch-9"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="SnapshotDeleted"
@@ -509,7 +548,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-9"
+            data-ouia-component-id="OUIA-Generated-Switch-10"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ArchivedRecordingCreated"
@@ -548,7 +587,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-10"
+            data-ouia-component-id="OUIA-Generated-Switch-11"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ArchivedRecordingDeleted"
@@ -587,7 +626,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-11"
+            data-ouia-component-id="OUIA-Generated-Switch-12"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="TemplateUploaded"
@@ -626,7 +665,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-12"
+            data-ouia-component-id="OUIA-Generated-Switch-13"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="TemplateDeleted"
@@ -665,7 +704,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-13"
+            data-ouia-component-id="OUIA-Generated-Switch-14"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ProbeTemplateUploaded"
@@ -704,7 +743,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-14"
+            data-ouia-component-id="OUIA-Generated-Switch-15"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ProbeTemplateDeleted"
@@ -743,7 +782,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-15"
+            data-ouia-component-id="OUIA-Generated-Switch-16"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ProbeTemplateApplied"
@@ -782,7 +821,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-16"
+            data-ouia-component-id="OUIA-Generated-Switch-17"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="ProbesRemoved"
@@ -821,7 +860,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-17"
+            data-ouia-component-id="OUIA-Generated-Switch-18"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="RuleCreated"
@@ -860,7 +899,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-18"
+            data-ouia-component-id="OUIA-Generated-Switch-19"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="RuleUpdated"
@@ -899,7 +938,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-19"
+            data-ouia-component-id="OUIA-Generated-Switch-20"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="RuleDeleted"
@@ -938,7 +977,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-20"
+            data-ouia-component-id="OUIA-Generated-Switch-21"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="RecordingMetadataUpdated"
@@ -977,7 +1016,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-21"
+            data-ouia-component-id="OUIA-Generated-Switch-22"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="GrafanaConfiguration"
@@ -1016,7 +1055,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-22"
+            data-ouia-component-id="OUIA-Generated-Switch-23"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="LayoutTemplateCreated"
@@ -1055,7 +1094,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-23"
+            data-ouia-component-id="OUIA-Generated-Switch-24"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="TargetCredentialsStored"
@@ -1094,7 +1133,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-24"
+            data-ouia-component-id="OUIA-Generated-Switch-25"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="TargetCredentialsDeleted"
@@ -1133,7 +1172,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-25"
+            data-ouia-component-id="OUIA-Generated-Switch-26"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="CredentialsStored"
@@ -1172,7 +1211,7 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         >
           <label
             className="pf-c-switch"
-            data-ouia-component-id="OUIA-Generated-Switch-26"
+            data-ouia-component-id="OUIA-Generated-Switch-27"
             data-ouia-component-type="PF4/Switch"
             data-ouia-safe={true}
             htmlFor="CredentialsDeleted"