In app notifications (#1509)

* handle in app notification test
bcgov · Dec 15, 2023 · 5a9813c · 5a9813c
1 parent 9d13aba
commit 5a9813c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/.../main/angular/src/app/components/notification-snackbar/notification-snackbar.component.ts b/.../main/angular/src/app/components/notification-snackbar/notification-snackbar.component.ts
@@ -1,5 +1,7 @@
 import { Component, Inject } from "@angular/core";
 import { MatSnackBarRef, MAT_SNACK_BAR_DATA } from "@angular/material/snack-bar";
+import { Router } from "@angular/router";
+import { ResourcesRoutes } from "@app/utils";
 
 export type NotificationConfig = {
     title: string
@@ -11,7 +13,7 @@ export type NotificationConfig = {
     template: `
         <div matSnackBarActions>
             <span matSnackBarAction matSnackBarLabel class="snackbar"
-                (click)="snackBarRef.dismissWithAction()"
+                (click)="selectNotification()"
             >
                 <span class="icon"></span>
                 <span class="content">
@@ -30,14 +32,34 @@ export type NotificationConfig = {
 export class NotificationSnackbarComponent {
     constructor(
         public snackBarRef: MatSnackBarRef<NotificationSnackbarComponent>,
-        @Inject(MAT_SNACK_BAR_DATA) public data: NotificationConfig
+        protected router: Router,
+        @Inject(MAT_SNACK_BAR_DATA) public data: any
     ) { }
 
     get title() {
-        return this.data.title
+        return this.data.notification.title
     }
 
     get body() {
-        return this.data.body
+        return this.data.notification.body
+    }
+
+    selectNotification() {
+        const notification = this.data.notification
+        let c = JSON.parse(notification.data['coords']),
+        r = JSON.parse(notification.data['radius'])
+        this.router.navigate([ResourcesRoutes.ACTIVEWILDFIREMAP], {
+            queryParams: {
+                latitude: c[0],
+                longitude: c[1],
+                radius: r,
+                featureId: notification.data['messageID'],
+                featureType: notification.data['topicKey'],
+                identify:true,
+                notification:true,
+                time: Date.now()
+            }
+          });
+          this.snackBarRef.dismiss();
     }
 }
diff --git a/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts b/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts
@@ -243,7 +243,7 @@ export class CapacitorService {
 
         this.notificationSnackbarPromise = this.notificationSnackbarPromise.then( () => {
             return new Promise( ( res, rej ) => {
-                let sb = this.showNotificationSnackbar( notification.title, notification.body )
+                let sb = this.showNotificationSnackbar(notification)
 
                 sb.onAction().subscribe( () => {
                     this.emitLocationNotification(notification.body )
@@ -276,7 +276,7 @@ export class CapacitorService {
 
         this.notificationSnackbarPromise = this.notificationSnackbarPromise.then( () => {
             return new Promise( ( res, rej ) => {
-                let sb = this.showNotificationSnackbar( notification.title, notification.body )
+                let sb = this.showNotificationSnackbar(notification)
 
                 sb.onAction().subscribe( () => {
                     let c = JSON.parse(notification.data['coords']),
@@ -326,9 +326,9 @@ export class CapacitorService {
         }, this.locationNotificationsDelay );
     }
 
-    showNotificationSnackbar( title: string, body: string ) {
-        let cfg: MatSnackBarConfig<NotificationConfig> = {
-            data: { title, body },
+    showNotificationSnackbar( notification: any) {
+        let cfg: MatSnackBarConfig<any> = {
+            data: {notification},
             // need to change back to 10 sec. Using 60 sec for testing purpose in case QA missed it.
             duration: 60 * 1000,
             verticalPosition: 'top'