Merge pull request #365 from sancsoft/364-psr-header-not-updating-aft…

…er-changing-editing-time

Added shared refresh service between calculations and time list

src/angular/hq/src/app/psr/Services/psr-refresh.service.ts

@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PsrRefreshService {
+  private refreshSubject = new BehaviorSubject<boolean>(false);
+
+  triggerRefresh() {
+    this.refreshSubject.next(true);
+  }
+
+  getRefreshObservable() {
+    return this.refreshSubject.asObservable();
+  }
+}

src/angular/hq/src/app/psr/psr-details-header/psr-details-header.component.ts

@@ -5,13 +5,15 @@ import {
   combineLatest,
   debounceTime,
   map,
+  merge,
   shareReplay,
   switchMap,
 } from 'rxjs';
 import { GetPSRRecordV1 } from '../../models/PSR/get-PSR-v1';
 import { ActivatedRoute, RouterLink } from '@angular/router';
 import { HQService } from '../../services/hq.service';
 import { Period } from '../../enums/period';
+import { PsrRefreshService } from '../Services/psr-refresh.service';
 
 @Component({
   selector: 'hq-psr-details-header',
@@ -26,14 +28,23 @@ export class PsrDetailsHeaderComponent {
   constructor(
     private activatedRoute: ActivatedRoute,
     private hqService: HQService,
+    private psrRefreshService: PsrRefreshService,
   ) {
     this.projectReportId$ = activatedRoute.paramMap.pipe(
       map((params) => params.get('psrId')),
     );
     const request$ = combineLatest({
       id: this.projectReportId$,
     });
-    const response$ = request$.pipe(
+
+    const requestTrigger$ = merge(
+      request$,
+      this.psrRefreshService
+        .getRefreshObservable()
+        .pipe(switchMap(() => request$)),
+    );
+
+    const response$ = requestTrigger$.pipe(
       debounceTime(500),
       switchMap((request) => this.hqService.getPSRV1(request)),
       shareReplay({ bufferSize: 1, refCount: false }),
@@ -45,7 +56,6 @@ export class PsrDetailsHeaderComponent {
       }),
     );
   }
-
   getPeriodName(period: Period) {
     return Period[period];
   }

src/angular/hq/src/app/psr/psrtime-list/psrtime-list.component.ts

@@ -1,3 +1,4 @@
+import { PsrRefreshService } from './../Services/psr-refresh.service';
 import { SelectInputOptionDirective } from './../../core/directives/select-input-option.directive';
 import { HQConfirmationModalService } from './../../common/confirmation-modal/services/hq-confirmation-modal-service';
 import { HQSnackBarService } from './../../common/hq-snack-bar/services/hq-snack-bar-service';
@@ -124,6 +125,7 @@ export class PSRTimeListComponent implements OnInit, OnDestroy {
     private modalService: ModalService,
     private toastService: ToastService,
     private oidcSecurityService: OidcSecurityService,
+    private psrRefreshService: PsrRefreshService,
   ) {
     this.sortOption$ = new BehaviorSubject<SortColumn>(SortColumn.Date);
     this.sortDirection$ = new BehaviorSubject<SortDirection>(SortDirection.Asc);
@@ -228,7 +230,10 @@ export class PSRTimeListComponent implements OnInit, OnDestroy {
 
     const refresh$ = this.refresh$.pipe(
       switchMap(() => apiResponse$),
-      tap(() => this.deselectAll()),
+      tap(() => {
+        this.deselectAll();
+        this.psrRefreshService.triggerRefresh();
+      }),
     );
 
     const response$ = merge(apiResponse$, refresh$).pipe(