Merge pull request #1821 from bcgov/feature/ALCS-2117

trslater · web-flow · commit 2491f42904c4 · 2024-08-29T08:44:01.000-07:00
Add 'Go to card' button for Commissioners
diff --git a/alcs-frontend/src/app/services/decision-meeting/decision-meeting.service.ts b/alcs-frontend/src/app/services/decision-meeting/decision-meeting.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { ToastService } from '../toast/toast.service';
-import { UpcomingMeetingBoardMapDto } from './decision-meeting.dto';
+import { UpcomingMeetingBoardMapDto, UpcomingMeetingDto } from './decision-meeting.dto';
 
 @Injectable({
   providedIn: 'root',
@@ -16,7 +16,16 @@ export class DecisionMeetingService {
     private toastService: ToastService,
   ) {}
 
-  async fetch() {
+  async fetch(fileNumber?: string) {
+    if (fileNumber !== undefined) {
+      try {
+        const meetings = await firstValueFrom(this.http.get<UpcomingMeetingDto[]>(`${this.url}/${fileNumber}`));
+        const record: UpcomingMeetingBoardMapDto = { all: meetings };
+        return record;
+      } catch (err) {
+        this.toastService.showErrorToast('Failed to fetch scheduled discussions');
+      }
+    }
     try {
       return await firstValueFrom(this.http.get<UpcomingMeetingBoardMapDto>(`${this.url}/overview/meetings`));
     } catch (err) {
diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.html b/alcs-frontend/src/app/shared/details-header/details-header.component.html
@@ -38,6 +38,18 @@ <h5 class="detail-heading">
           <mat-icon style="transform: scale(1.1)">arrow_right_alt</mat-icon>
         </div>
       </button>
+      <button
+        *ngIf="isCommissioner && hasMeetings"
+        class="menu-item"
+        mat-flat-button
+        color="accent"
+        (click)="onGoToSchedule(_application.fileNumber)"
+      >
+        <div class="center">
+          Go to card
+          <mat-icon style="transform: scale(1.1)">arrow_right_alt</mat-icon>
+        </div>
+      </button>
       <ng-container *ngIf="linkedCards.length > 1">
         <button class="menu-item center" mat-flat-button color="accent" [matMenuTriggerFor]="goToMenu">
           Go to card ▾
diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.spec.ts
@@ -1,4 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { DetailsHeaderComponent } from './details-header.component';
@@ -9,7 +10,7 @@ describe('DetailsHeaderComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [RouterTestingModule],
+      imports: [RouterTestingModule, HttpClientTestingModule],
       declarations: [DetailsHeaderComponent],
       providers: [],
     }).compileComponents();
diff --git a/alcs-frontend/src/app/shared/details-header/details-header.component.ts b/alcs-frontend/src/app/shared/details-header/details-header.component.ts
@@ -1,6 +1,6 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { Subject } from 'rxjs';
+import { combineLatestWith, Subject, takeUntil } from 'rxjs';
 import { ApplicationTypeDto } from '../../services/application/application-code.dto';
 import { ApplicationModificationDto } from '../../services/application/application-modification/application-modification.dto';
 import { ApplicationReconsiderationDto } from '../../services/application/application-reconsideration/application-reconsideration.dto';
@@ -23,14 +23,18 @@ import {
 import { TimeTrackable } from '../time-tracker/time-tracker.component';
 import { ApplicationDetailService } from '../../services/application/application-detail.service';
 import { ApplicationSubmissionService } from '../../services/application/application-submission/application-submission.service';
+import { AuthenticationService, ROLES } from '../../services/authentication/authentication.service';
+import { BoardService } from '../../services/board/board.service';
+import { DecisionMeetingService } from '../../services/decision-meeting/decision-meeting.service';
+import { UpcomingMeetingBoardMapDto } from '../../services/decision-meeting/decision-meeting.dto';
 
 @Component({
   selector: 'app-details-header[application]',
   templateUrl: './details-header.component.html',
   styleUrls: ['./details-header.component.scss'],
 })
-export class DetailsHeaderComponent {
-  destroy = new Subject<void>();
+export class DetailsHeaderComponent implements OnInit, OnDestroy {
+  $destroy = new Subject<void>();
 
   @Input() heading = 'Title Here';
   @Input() days = 'Calendar Days';
@@ -96,6 +100,8 @@ export class DetailsHeaderComponent {
             this.currentStatus = DEFAULT_NO_STATUS;
           });
       }
+
+      this.$application.next(application);
     }
   }
 
@@ -125,7 +131,55 @@ export class DetailsHeaderComponent {
   isNOI = false;
   currentStatus?: ApplicationSubmissionStatusPill;
 
-  constructor(private router: Router) {}
+  isCommissioner: boolean = false;
+  hasMeetings: boolean = false;
+
+  $meetingsByBoard = new Subject<UpcomingMeetingBoardMapDto>();
+  $application = new Subject<ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto>();
+
+  constructor(
+    private router: Router,
+    private authService: AuthenticationService,
+    private boardService: BoardService,
+    private meetingService: DecisionMeetingService,
+  ) {}
+
+  ngOnInit(): void {
+    this.loadMeetings();
+
+    this.authService.$currentUser.pipe(takeUntil(this.$destroy)).subscribe((currentUser) => {
+      this.isCommissioner =
+        !!currentUser &&
+        !!currentUser.client_roles &&
+        currentUser.client_roles.length === 1 &&
+        currentUser.client_roles.includes(ROLES.COMMISSIONER);
+    });
+
+    this.boardService.$boards
+      .pipe(combineLatestWith(this.$meetingsByBoard, this.$application))
+      .pipe(takeUntil(this.$destroy))
+      .subscribe(([boards, meetingsByBoard, application]) => {
+        if (boards && meetingsByBoard && application) {
+          const visibleBoardCodes = boards.filter((board) => board.showOnSchedule).map((board) => board.code);
+
+          const visibleBoardCodeMeetingPairs = Object.entries(meetingsByBoard).filter(([code, _]) =>
+            visibleBoardCodes.includes(code),
+          );
+
+          this.hasMeetings = visibleBoardCodeMeetingPairs.some(([_, meetings]) =>
+            meetings.some((meeting) => meeting.fileNumber === application?.fileNumber),
+          );
+        }
+      });
+  }
+
+  async loadMeetings() {
+    const meetingsByBoards = await this.meetingService.fetch();
+
+    if (meetingsByBoards !== undefined) {
+      this.$meetingsByBoard.next(meetingsByBoards);
+    }
+  }
 
   async onGoToCard(card: CardDto) {
     const boardCode = card.boardCode;
@@ -134,6 +188,12 @@ export class DetailsHeaderComponent {
     await this.router.navigateByUrl(`/board/${boardCode}?card=${cardUuid}&type=${cardTypeCode}`);
   }
 
+  async onGoToSchedule(fileNumber: string) {
+    if (this.isCommissioner) {
+      await this.router.navigateByUrl(`/home?file_number=${fileNumber}`);
+    }
+  }
+
   async setupLinkedCards() {
     const application = this._application;
     const result = [];
@@ -168,4 +228,9 @@ export class DetailsHeaderComponent {
       await this.applicationSubmissionService?.update(this._application?.fileNumber, { applicant });
     }
   }
+
+  ngOnDestroy(): void {
+    this.$destroy.next();
+    this.$destroy.complete();
+  }
 }
diff --git a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.spec.ts
@@ -10,6 +10,7 @@ import { ToastService } from '../../services/toast/toast.service';
 import { AssigneeDto, UserDto } from '../../services/user/user.dto';
 import { UserService } from '../../services/user/user.service';
 import { CardType } from '../card/card.component';
+import { RouterTestingModule } from '@angular/router/testing';
 
 import { MeetingOverviewComponent } from './meeting-overview.component';
 
@@ -34,6 +35,7 @@ describe('MeetingOverviewComponent', () => {
     mockToastService = createMock();
 
     await TestBed.configureTestingModule({
+      imports: [RouterTestingModule],
       providers: [
         {
           provide: DecisionMeetingService,
diff --git a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.ts b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.ts
@@ -1,13 +1,14 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import * as moment from 'moment';
-import { Subject, takeUntil } from 'rxjs';
+import { combineLatestWith, Subject, takeUntil } from 'rxjs';
 import { ROLES } from '../../services/authentication/authentication.service';
 import { BoardService, BoardWithFavourite } from '../../services/board/board.service';
 import { UpcomingMeetingBoardMapDto, UpcomingMeetingDto } from '../../services/decision-meeting/decision-meeting.dto';
 import { DecisionMeetingService } from '../../services/decision-meeting/decision-meeting.service';
 import { ToastService } from '../../services/toast/toast.service';
 import { UserService } from '../../services/user/user.service';
 import { CardType } from '../card/card.component';
+import { ActivatedRoute, Router } from '@angular/router';
 
 type MeetingCollection = {
   meetingDate: number;
@@ -45,13 +46,22 @@ export class MeetingOverviewComponent implements OnInit, OnDestroy {
     private boardService: BoardService,
     private toastService: ToastService,
     private userService: UserService,
+    private route: ActivatedRoute,
+    private router: Router,
   ) {}
 
   ngOnInit(): void {
-    this.boardService.$boards.pipe(takeUntil(this.destroy)).subscribe((boards) => {
-      this.boards = boards;
-      this.loadMeetings();
-    });
+    this.boardService.$boards
+      .pipe(combineLatestWith(this.route.queryParams))
+      .pipe(takeUntil(this.destroy))
+      .subscribe(async ([boards, params]) => {
+        this.boards = boards;
+        await this.loadMeetings();
+
+        if (this.viewData.length > 0 && params['file_number'] !== undefined) {
+          this.findAndExpandAll(params['file_number']);
+        }
+      });
 
     this.userService.$userProfile.pipe(takeUntil(this.destroy)).subscribe((currentUser) => {
       if (currentUser) {
@@ -72,11 +82,11 @@ export class MeetingOverviewComponent implements OnInit, OnDestroy {
     const meetings = await this.meetingService.fetch();
     if (meetings) {
       this.meetings = meetings;
-      this.populateViewData();
+      await this.populateViewData();
     }
   }
 
-  private populateViewData() {
+  private async populateViewData() {
     if (this.meetings && this.boards.length > 0) {
       this.viewData = this.boards
         .filter((board) => board.showOnSchedule)
@@ -146,26 +156,30 @@ export class MeetingOverviewComponent implements OnInit, OnDestroy {
   }
 
   onSearch() {
+    this.findAndExpandAll(this.searchText);
+  }
+
+  findAndExpandAll(fileNumber: string) {
     let foundResult = false;
     this.viewData = this.viewData.map((board) => {
       board.isExpanded = false;
       board.pastMeetings = board.pastMeetings.map((meeting) => {
-        const res = this.findAndExpand(meeting, board);
+        const res = this.findAndExpand(meeting, board, fileNumber);
         if (res.isExpanded) {
           foundResult = true;
         }
         return res;
       });
 
       if (board.nextMeeting) {
-        const res = this.findAndExpand(board.nextMeeting, board);
+        const res = this.findAndExpand(board.nextMeeting, board, fileNumber);
         if (res.isExpanded) {
           foundResult = true;
         }
       }
 
       board.upcomingMeetings = board.upcomingMeetings.map((meeting) => {
-        const res = this.findAndExpand(meeting, board);
+        const res = this.findAndExpand(meeting, board, fileNumber);
         if (res.isExpanded) {
           foundResult = true;
         }
@@ -182,11 +196,11 @@ export class MeetingOverviewComponent implements OnInit, OnDestroy {
     }
   }
 
-  private findAndExpand(meeting: MeetingCollection, board: BoardWithDecisionMeetings) {
+  private findAndExpand(meeting: MeetingCollection, board: BoardWithDecisionMeetings, fileNumber: string) {
     meeting.isExpanded = false;
     meeting.meetings = meeting.meetings.map((application) => {
       application.isHighlighted = false;
-      if (application.fileNumber === this.searchText) {
+      if (application.fileNumber === fileNumber) {
         meeting.isExpanded = true;
         board.isExpanded = true;
         application.isHighlighted = true;
@@ -243,10 +257,10 @@ export class MeetingOverviewComponent implements OnInit, OnDestroy {
     return el ? el.offsetWidth < el.scrollWidth : false;
   }
 
-  openMeetings(fileNumber: string, type: CardType) {
+  async openMeetings(fileNumber: string, type: CardType) {
     this.clearHighlight();
     const target = type === CardType.PLAN ? 'planning-review' : 'application';
     const url = this.isCommissioner ? `/commissioner/${target}/${fileNumber}` : `/${target}/${fileNumber}/review`;
-    window.open(url, '_blank');
+    await this.router.navigateByUrl(url);
   }
 }
