Merge remote-tracking branch 'origin/129-hot-bugfixes' into 129-hot-bugfixes

Author: igorstojanovic91

src/app/core/header/navigation/notification/notification.component.html

@@ -46,7 +46,9 @@ <h2 mat-dialog-title><span class="underline">Notifications</span></h2>
                     <th mat-header-cell *matHeaderCellDef>Link</th>
                     <td mat-cell *matCellDef="let element">
                         <div class="dialog-container__link">
-                            <a mat-icon-button *ngIf="element.link" [routerLink]="element.link"
+                            <a mat-icon-button *ngIf="element.link"
+                               [routerLink]="element.link.split('?')[0]"
+                               [queryParams]="{highlight: element.link.split('?')[1].split('=')[1]}"
                                     tabindex="-1" (click)="markAsRead(element)" matDialogClose>
                                 <mat-icon>arrow_forward</mat-icon>
                             </a>

src/app/core/services/user-notification.service.ts

@@ -8,21 +8,46 @@ import {tap} from "rxjs/operators";
 })
 export class UserNotificationService {
     private notificationData = new Subject<IncomingNotification>();
-    private notification$ = this.notificationData.asObservable();
+    private notifiedNotificationData = new Subject<IncomingNotification>();
+    private notification$ = this.notifiedNotificationData.asObservable();
     private readonly hasVibrationSupport;
+    private readonly hasNotificationSupport;
+    private hasGrantedNotificationSupport;
 
     constructor() {
         this.hasVibrationSupport = !!window.navigator.vibrate;
-    }
-
-    getNotification(): Observable<IncomingNotification> {
-        return this.notification$.pipe(
+        this.hasNotificationSupport = !!window.Notification;
+        if(this.hasNotificationSupport){
+            this.hasGrantedNotificationSupport = Notification.permission === "granted";
+            if(!this.hasGrantedNotificationSupport){
+                Notification.requestPermission().then(()=>{
+                    this.hasGrantedNotificationSupport = Notification.permission === "granted";
+                });
+            }
+        }
+        this.notificationData.pipe(
             tap(val =>  {
-                if (this.hasVibrationSupport) {
-                    window.navigator.vibrate(400);
+                if(this.hasNotificationSupport && this.hasGrantedNotificationSupport){
+                    console.log(`Notifying`, val);
+                    new Notification('RiverSurf', {
+                        body: val.content,
+                        tag: val.surfEventName,
+                        icon: '/assets/icons/icon-512x512.png',
+                        vibrate: 400
+                    });
+                } else {
+                    if (this.hasVibrationSupport) {
+                        window.navigator.vibrate(400);
+                    }
                 }
             })
-        );
+        ).subscribe(val => {
+            this.notifiedNotificationData.next(val);
+        });
+    }
+
+    getNotification(): Observable<IncomingNotification> {
+        return this.notification$;
     }
 
     showNotification(notification: IncomingNotification) {

src/app/core/services/web-socket.service.ts

@@ -116,7 +116,7 @@ export class WebSocketService {
         };
 
         if (message.payload.timestamp && message.payload.content) {
-            notificationMessage.payload.surfEventName = message.payload.surfeventName;
+            notificationMessage.payload.surfEventName = message.payload.surfEventName;
             notificationMessage.payload.timestamp = message.payload.timestamp;
             notificationMessage.payload.content = message.payload.content;
             notificationMessage.payload.link = message.payload.link;

src/app/surf-event/result-view/result-view.component.ts

@@ -64,9 +64,11 @@ export class ResultViewComponent implements OnInit, AfterViewInit, OnDestroy {
 
     qrCodeLink?: string;
     selectedDivision?: Division;
-    isOffline: boolean = false;
+    isOffline!: boolean;
+
     private windowResizeSubject$ = new Subject<number | null>();
     private selectedSurfEvent: string = '';
+
     private destroy$ = new Subject();
 
     constructor(private cd: ChangeDetectorRef,
@@ -131,12 +133,14 @@ export class ResultViewComponent implements OnInit, AfterViewInit, OnDestroy {
         this.qrCodeLink = window.location.toString();
 
         this.surfEventService.getCompetitionUpdates().subscribe(
-            () => {
+            (competitions) => {
                 if (this.competition) {
-                    this.lines = [];
-                    this.points = [];
-                    this.cd.detectChanges();
-                    this.getPointsAndLines();
+                    if (competitions.findIndex(competition => competition.id === this.competition.id) !== -1) {
+                        this.lines = [];
+                        this.points = [];
+                        this.cd.detectChanges();
+                        this.getPointsAndLines();
+                    }
                 }
             }
         )
@@ -369,10 +373,7 @@ export class ResultViewComponent implements OnInit, AfterViewInit, OnDestroy {
         this.highlightActive = false;
         this.router.navigate(['../', this.selectedDivision], {
             relativeTo: this.route
-        }).then(
-            () => {
-            }
-        );
+        }).then();
 
 
     }