Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(notifications): service handles and displays all incoming WS messages #367

Merged
merged 6 commits into from
Feb 9, 2022
Merged

feat(notifications): service handles and displays all incoming WS messages #367

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f069214
refactor notification message handling
andrewazores Feb 4, 2022
32e038f
feat(notifications): service handles and displays all incoming WS mes…
andrewazores Feb 4, 2022
84a6b99
add ability to configure notifications to not display alert
andrewazores Feb 4, 2022
2d059bc
rebase typo fix
andrewazores Feb 7, 2022
5607fd8
invoke function directly
andrewazores Feb 9, 2022
1450b6f
correct active recording stoppage category
andrewazores Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 91 additions & 39 deletions src/app/Shared/Services/NotificationChannel.service.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,13 @@
* SOFTWARE.
*/
import { Notifications } from '@app/Notifications/Notifications';
import _ from 'lodash';
import { BehaviorSubject, combineLatest, Observable, Subject, timer } from 'rxjs';
import { fromFetch } from 'rxjs/fetch';
import { webSocket, WebSocketSubject } from 'rxjs/webSocket';
import { AlertVariant } from '@patternfly/react-core';
import { concatMap, distinctUntilChanged, filter } from 'rxjs/operators';
import * as _ from 'lodash';
import { AuthMethod, LoginService, SessionState } from './Login.service';
import { ArchivedRecording } from '@app/Shared/Services/Api.service';

interface RecordingNotificationEvent {
recording: ArchivedRecording;
target: string;
}

export enum NotificationCategory {
WsClientActivity = 'WsClientActivity',
Expand All @@ -72,6 +67,74 @@ interface ReadyState {
code?: CloseStatus;
}

const messageKeys = new Map([
[
// explicitly configure this category with a null mapper.
// This is a special case because we do not want to display an alert,
// the Targets.service already handles this
NotificationCategory.JvmDiscovery, null
],
[
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}`
}
} as NotificationMessageMapper
],
[
NotificationCategory.ActiveRecordingCreated, {
variant: AlertVariant.success,
title: 'Recording Created',
body: evt => `${evt.message.recording} created in target: ${evt.message.target}`,
} as NotificationMessageMapper
],
[
NotificationCategory.ActiveRecordingStopped, {
andrewazores marked this conversation as resolved.
Show resolved Hide resolved
variant: AlertVariant.success,
title: 'Recording Stopped',
body: evt => `${evt.message.recording} was stopped`
} as NotificationMessageMapper
],
[
NotificationCategory.ActiveRecordingSaved, {
variant: AlertVariant.success,
title: 'Recording Saved',
body: evt => `${evt.message.recording.name} was archived`
} as NotificationMessageMapper
],
[
NotificationCategory.ActiveRecordingDeleted, {
variant: AlertVariant.success,
title: 'Recording Deleted',
body: evt => `${evt.message.recording} was deleted`
} as NotificationMessageMapper
],
[
NotificationCategory.ArchivedRecordingCreated, {
variant: AlertVariant.success,
title: 'Recording Archived',
body: evt => `${evt.message.recording.name} was uploaded into archives`
} as NotificationMessageMapper
],
[
NotificationCategory.ArchivedRecordingDeleted, {
variant: AlertVariant.success,
title: 'Recording Deleted',
body: evt => `${evt.message.recording.name} was deleted`
} as NotificationMessageMapper
],
]);

interface NotificationMessageMapper {
title: string;
body: (evt: NotificationMessage) => string;
variant: AlertVariant;
}

export class NotificationChannel {

private ws: WebSocketSubject<any> | null = null;
Expand All @@ -82,40 +145,29 @@ export class NotificationChannel {
private readonly notifications: Notifications,
private readonly login: LoginService
) {
this.messages(NotificationCategory.WsClientActivity).subscribe(v => {
const addr = Object.keys(v.message)[0];
const status = v.message[addr];
notifications.info('WebSocket Client Activity', `Client at ${addr} ${status}`, NotificationCategory.WsClientActivity);
});

this.messages(NotificationCategory.ActiveRecordingCreated).subscribe(v => {
const event: RecordingNotificationEvent = v.message;
notifications.success('Recording Created', `${event.recording} created in target: ${event.target}`);
});

this.messages(NotificationCategory.ActiveRecordingStopped).subscribe(v => {
const event: RecordingNotificationEvent = v.message;
notifications.success('Recording Stopped', `${event.recording} was stopped`);
});

this.messages(NotificationCategory.ActiveRecordingSaved).subscribe(v => {
const event: RecordingNotificationEvent = v.message;
notifications.success('Recording Archived', `${event.recording.name} was archived`);
});

this.messages(NotificationCategory.ActiveRecordingDeleted).subscribe(v => {
const event: RecordingNotificationEvent = v.message;
notifications.success('Recording Deleted', `${event.recording} was deleted`);
});

this.messages(NotificationCategory.ArchivedRecordingCreated).subscribe(v => {
const event: RecordingNotificationEvent = v.message;
notifications.success('Recording Archived', `${event.recording.name} was uploaded into archives`);
messageKeys.forEach((value, key) => {
if (!value) {
return;
}
this.messages(key).subscribe((msg: NotificationMessage) => {
const message = value.body(msg);
notifications.notify({ title: value.title, message, category: key, variant: value.variant })
});
});
this._messages.pipe(
filter(msg => !messageKeys.has(msg.meta.category as NotificationCategory))
jan-law marked this conversation as resolved.
Show resolved Hide resolved
).subscribe(msg => {
const category = NotificationCategory[msg.meta.category as keyof typeof NotificationCategory];
hareetd marked this conversation as resolved.
Show resolved Hide resolved

this.messages(NotificationCategory.ArchivedRecordingDeleted).subscribe(v => {
const event: RecordingNotificationEvent = v.message;
notifications.success('Recording Deleted', `${event.recording.name} was deleted`);
var variant: AlertVariant;
if (category == NotificationCategory.WsClientActivity) {
variant = AlertVariant.info;
} else if (category == NotificationCategory.JvmDiscovery) {
variant = AlertVariant.info;
} else {
variant = AlertVariant.success;
}
notifications.notify({ title: msg.meta.category, message: msg.message, category, variant });
});

const notificationsUrl = fromFetch(`${this.login.authority}/api/v1/notifications_url`)
Expand Down