From ecd372a2555d2724ac3b1c0a5d3f5ba9e8a446ef Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:39:48 -0700
Subject: [PATCH 1/6] Show goto button on incoming files' details page

---
 .../details-header.component.html             |  2 +-
 .../details-header.component.ts               | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

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
index 7f684ccb4..f6fe65a47 100644
--- a/alcs-frontend/src/app/shared/details-header/details-header.component.html
+++ b/alcs-frontend/src/app/shared/details-header/details-header.component.html
@@ -39,7 +39,7 @@ <h5 class="detail-heading">
         </div>
       </button>
       <button
-        *ngIf="isCommissioner && hasMeetings"
+        *ngIf="isCommissioner && (hasMeetings || isIncoming)"
         class="menu-item"
         mat-flat-button
         color="accent"
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
index f66bab93e..48b65b264 100644
--- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts
+++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts
@@ -27,6 +27,8 @@ import { AuthenticationService, ROLES } from '../../services/authentication/auth
 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';
+import { IncomingFileService } from '../../services/incoming-file/incoming-file.service';
+import { IncomingFileBoardMapDto } from 'src/app/services/incoming-file/incomig-file.dto';
 
 @Component({
   selector: 'app-details-header[application]',
@@ -133,19 +135,25 @@ export class DetailsHeaderComponent implements OnInit, OnDestroy {
 
   isCommissioner: boolean = false;
   hasMeetings: boolean = false;
+  isIncoming: boolean = false;
 
   $meetingsByBoard = new Subject<UpcomingMeetingBoardMapDto>();
+  $incomingFilesByBoard = new Subject<IncomingFileBoardMapDto>();
   $application = new Subject<ApplicationDto | CommissionerApplicationDto | NoticeOfIntentDto | NotificationDto>();
 
+  private incomingFiles: IncomingFileBoardMapDto | undefined;
+
   constructor(
     private router: Router,
     private authService: AuthenticationService,
     private boardService: BoardService,
     private meetingService: DecisionMeetingService,
+    private incomingFileService: IncomingFileService,
   ) {}
 
   ngOnInit(): void {
     this.loadMeetings();
+    this.loadIncomingFiles();
 
     this.authService.$currentUser.pipe(takeUntil(this.$destroy)).subscribe((currentUser) => {
       this.isCommissioner =
@@ -156,9 +164,9 @@ export class DetailsHeaderComponent implements OnInit, OnDestroy {
     });
 
     this.boardService.$boards
-      .pipe(combineLatestWith(this.$meetingsByBoard, this.$application))
+      .pipe(combineLatestWith(this.$meetingsByBoard, this.$incomingFilesByBoard, this.$application))
       .pipe(takeUntil(this.$destroy))
-      .subscribe(([boards, meetingsByBoard, application]) => {
+      .subscribe(([boards, meetingsByBoard, incomingFilesByBoard, application]) => {
         if (boards && meetingsByBoard && application) {
           const visibleBoardCodes = boards.filter((board) => board.showOnSchedule).map((board) => board.code);
 
@@ -166,9 +174,17 @@ export class DetailsHeaderComponent implements OnInit, OnDestroy {
             visibleBoardCodes.includes(code),
           );
 
+          const visibleBoardCodeIncomingFilePairs = Object.entries(incomingFilesByBoard!).filter(([code, _]) =>
+            visibleBoardCodes.includes(code),
+          );
+
           this.hasMeetings = visibleBoardCodeMeetingPairs.some(([_, meetings]) =>
             meetings.some((meeting) => meeting.fileNumber === application?.fileNumber),
           );
+
+          this.isIncoming = visibleBoardCodeIncomingFilePairs.some(([_, incomingFiles]) =>
+            incomingFiles.some((file) => file.fileNumber === application?.fileNumber),
+          );
         }
       });
   }
@@ -181,6 +197,14 @@ export class DetailsHeaderComponent implements OnInit, OnDestroy {
     }
   }
 
+  async loadIncomingFiles() {
+    const incomingFilesByBoard = await this.incomingFileService.fetchAndSort();
+
+    if (incomingFilesByBoard !== undefined) {
+      this.$incomingFilesByBoard.next(incomingFilesByBoard);
+    }
+  }
+
   async onGoToCard(card: CardDto) {
     const boardCode = card.boardCode;
     const cardUuid = card.uuid;

From 93939d80ea5da8b597f062013d7a30e007e7e3a8 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:40:17 -0700
Subject: [PATCH 2/6] Remove unused search handler

---
 .../app/shared/meeting-overview/meeting-overview.component.ts | 4 ----
 1 file changed, 4 deletions(-)

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
index b6583ac29..46c45b661 100644
--- a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.ts
+++ b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.ts
@@ -165,10 +165,6 @@ export class MeetingOverviewComponent implements OnInit, OnDestroy {
     }
   }
 
-  onSearch() {
-    this.findAndExpandAll(this.searchText);
-  }
-
   findAndExpandAll(fileNumber: string) {
     let foundResult = false;
     this.viewData = this.viewData.map((board) => {

From da402ee49fdadbf59046b563c28ac0dc228a4c3d Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 11 Sep 2024 11:18:31 -0700
Subject: [PATCH 3/6] Expand and highlight cards in incoming column

---
 .../meeting-overview/meeting-overview.component.ts  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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
index 46c45b661..7c06bf897 100644
--- a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.ts
+++ b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.ts
@@ -25,7 +25,7 @@ type BoardWithDecisionMeetings = {
   pastMeetings: MeetingCollection[];
   upcomingMeetings: MeetingCollection[];
   nextMeeting: MeetingCollection | undefined;
-  incomingFiles: IncomingFileDto[];
+  incomingFiles: (IncomingFileDto & { isHighlighted?: boolean })[];
   isExpanded: boolean;
 };
 
@@ -184,6 +184,17 @@ export class MeetingOverviewComponent implements OnInit, OnDestroy {
         }
       }
 
+      if (board.incomingFiles) {
+        board.incomingFiles.forEach((file) => {
+          if (file.fileNumber === fileNumber) {
+            board.isExpanded = true;
+            file.isHighlighted = true;
+            foundResult = true;
+            this.scrollToApplication(fileNumber);
+          }
+        });
+      }
+
       board.upcomingMeetings = board.upcomingMeetings.map((meeting) => {
         const res = this.findAndExpand(meeting, board, fileNumber);
         if (res.isExpanded) {

From e812c72e5ef2c1da1e967f1ca62e6dedb8289909 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 11 Sep 2024 11:19:44 -0700
Subject: [PATCH 4/6] Fix typo

---
 .../incoming-file/{incomig-file.dto.ts => incoming-file.dto.ts} | 0
 .../app/services/incoming-file/incoming-file.service.spec.ts    | 2 +-
 .../src/app/services/incoming-file/incoming-file.service.ts     | 2 +-
 .../app/shared/meeting-overview/meeting-overview.component.ts   | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename alcs-frontend/src/app/services/incoming-file/{incomig-file.dto.ts => incoming-file.dto.ts} (100%)

diff --git a/alcs-frontend/src/app/services/incoming-file/incomig-file.dto.ts b/alcs-frontend/src/app/services/incoming-file/incoming-file.dto.ts
similarity index 100%
rename from alcs-frontend/src/app/services/incoming-file/incomig-file.dto.ts
rename to alcs-frontend/src/app/services/incoming-file/incoming-file.dto.ts
diff --git a/alcs-frontend/src/app/services/incoming-file/incoming-file.service.spec.ts b/alcs-frontend/src/app/services/incoming-file/incoming-file.service.spec.ts
index 02c2e6742..d1f5fa23a 100644
--- a/alcs-frontend/src/app/services/incoming-file/incoming-file.service.spec.ts
+++ b/alcs-frontend/src/app/services/incoming-file/incoming-file.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { IncomingFileService } from './incoming-file.service';
-import { IncomingFileBoardMapDto } from './incomig-file.dto';
+import { IncomingFileBoardMapDto } from './incoming-file.dto';
 import { CardType } from '../../shared/card/card.component';
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { HttpClient } from '@angular/common/http';
diff --git a/alcs-frontend/src/app/services/incoming-file/incoming-file.service.ts b/alcs-frontend/src/app/services/incoming-file/incoming-file.service.ts
index cb08e9e94..f6e3e393a 100644
--- a/alcs-frontend/src/app/services/incoming-file/incoming-file.service.ts
+++ b/alcs-frontend/src/app/services/incoming-file/incoming-file.service.ts
@@ -3,7 +3,7 @@ import { environment } from '../../../environments/environment';
 import { HttpClient } from '@angular/common/http';
 import { ToastService } from '../toast/toast.service';
 import { firstValueFrom } from 'rxjs';
-import { IncomingFileBoardMapDto } from './incomig-file.dto';
+import { IncomingFileBoardMapDto } from './incoming-file.dto';
 
 @Injectable({
   providedIn: 'root',
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
index 7c06bf897..a3b7fb747 100644
--- a/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.ts
+++ b/alcs-frontend/src/app/shared/meeting-overview/meeting-overview.component.ts
@@ -9,7 +9,7 @@ import { ToastService } from '../../services/toast/toast.service';
 import { UserService } from '../../services/user/user.service';
 import { CardType } from '../card/card.component';
 import { IncomingFileService } from '../../services/incoming-file/incoming-file.service';
-import { IncomingFileBoardMapDto, IncomingFileDto } from '../../services/incoming-file/incomig-file.dto';
+import { IncomingFileBoardMapDto, IncomingFileDto } from '../../services/incoming-file/incoming-file.dto';
 import { ActivatedRoute, Router } from '@angular/router';
 
 type MeetingCollection = {

From 9a28c27cb866d4b33aa74465426b47f533736fd5 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 11 Sep 2024 11:21:46 -0700
Subject: [PATCH 5/6] Fix missed import rename

---
 .../src/app/shared/details-header/details-header.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 48b65b264..c35993421 100644
--- a/alcs-frontend/src/app/shared/details-header/details-header.component.ts
+++ b/alcs-frontend/src/app/shared/details-header/details-header.component.ts
@@ -28,7 +28,7 @@ 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';
 import { IncomingFileService } from '../../services/incoming-file/incoming-file.service';
-import { IncomingFileBoardMapDto } from 'src/app/services/incoming-file/incomig-file.dto';
+import { IncomingFileBoardMapDto } from 'src/app/services/incoming-file/incoming-file.dto';
 
 @Component({
   selector: 'app-details-header[application]',

From 2c0feacc5dc0b17898b18db14945b5b057393bcc Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 11 Sep 2024 11:45:36 -0700
Subject: [PATCH 6/6] Remove test for removed search

---
 .../meeting-overview/meeting-overview.component.spec.ts  | 9 ---------
 1 file changed, 9 deletions(-)

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
index aa3741089..08b06c481 100644
--- 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
@@ -106,13 +106,4 @@ describe('MeetingOverviewComponent', () => {
     await component.loadMeetings();
     expect(component.viewData.length).toEqual(1);
   });
-
-  it('should show an error toast if searched application is not found', async () => {
-    await sleep(1);
-
-    component.searchText = '5555';
-    component.onSearch();
-
-    expect(mockToastService.showErrorToast).toHaveBeenCalledTimes(1);
-  });
 });