Merge pull request #2297 from bcgov/develop

Deployment PR - 1609

Author: trslater

alcs-frontend/package-lock.json

@@ -30,7 +30,7 @@
     "@bcgov/bc-sans": "^2.1.0",
     "@ng-matero/extensions": "^17.3.8",
     "@ng-select/ng-option-highlight": "^12.0.6",
-    "@types/validator": "^13.12.3",
+    "@types/validator": "^13.15.0",
     "angular-mentions": "^1.5.0",
     "jwt-decode": "^4.0.0",
     "moment": "^2.30.1",
@@ -44,15 +44,15 @@
   },
   "devDependencies": {
     "@angular-builders/jest": "^17.0.3",
-    "@angular-devkit/build-angular": "^17.3.16",
+    "@angular-devkit/build-angular": "^17.3.17",
     "@angular-eslint/builder": "^17.5.3",
     "@angular-eslint/eslint-plugin": "^17.5.3",
     "@angular-eslint/eslint-plugin-template": "^17.5.3",
     "@angular-eslint/schematics": "^17.5.3",
     "@angular-eslint/template-parser": "^17.5.3",
-    "@angular/cli": "~17.3.14",
+    "@angular/cli": "~17.3.17",
     "@angular/compiler-cli": "^17.3.3",
-    "@golevelup/ts-jest": "^0.6.2",
+    "@golevelup/ts-jest": "^0.7.0",
     "@types/jest": "^29.5.14",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",

alcs-frontend/package.json

@@ -7,11 +7,20 @@ import { ProvisionComponent } from './features/provision/provision.component';
 import { AuthGuard } from './services/authentication/auth.guard';
 import { ALL_ROLES, ROLES } from './services/authentication/authentication.service';
 import { HasRolesGuard } from './services/authentication/hasRoles.guard';
+import { DocumentFileLoader } from './shared/document-file-loader/document-file-loader.component';
 
 export const ROLES_ALLOWED_APPLICATIONS = [ROLES.ADMIN, ROLES.LUP, ROLES.APP_SPECIALIST, ROLES.GIS, ROLES.SOIL_OFFICER];
 export const ROLES_ALLOWED_BOARDS = ROLES_ALLOWED_APPLICATIONS;
 
 const routes: Routes = [
+  {
+    path: 'document/:uuid',
+    canActivate: [HasRolesGuard],
+    data: {
+      roles: ALL_ROLES,
+    },
+    component: DocumentFileLoader,
+  },
   {
     path: 'board',
     canActivate: [HasRolesGuard],

alcs-frontend/src/app/app-routing.module.ts

@@ -41,6 +41,14 @@ <h4>{{ isEdit ? 'Edit' : 'Create' }} Board</h4>
         </mat-button-toggle-group>
       </div>
 
+      <div class="full-width">
+        <mat-label>Include filtering by assignee</mat-label>
+        <mat-button-toggle-group [formControl]="hasAssigneeFilter">
+          <mat-button-toggle [value]="true">Yes</mat-button-toggle>
+          <mat-button-toggle [value]="false">No</mat-button-toggle>
+        </mat-button-toggle-group>
+      </div>
+
       <div>
         <div>Click to add columns*</div>
         <div class="subtext">Disabled columns have cards and cannot be removed from the board</div>

alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.html

@@ -34,6 +34,7 @@ export class BoardManagementDialogComponent implements OnInit {
   permittedCardTypes = new FormControl<CardType[]>([], [Validators.required]);
   createCardTypes = new FormControl<CardType[]>([]);
   showOnSchedule = new FormControl<string>('true', [Validators.required]);
+  hasAssigneeFilter = new FormControl<boolean>(false, [Validators.required]);
 
   step = 1;
 
@@ -43,6 +44,7 @@ export class BoardManagementDialogComponent implements OnInit {
     permittedCardTypes: this.permittedCardTypes,
     createCardTypes: this.createCardTypes,
     showOnSchedule: this.showOnSchedule,
+    hasAssigneeFilter: this.hasAssigneeFilter,
   });
 
   isLoading = false;
@@ -101,6 +103,7 @@ export class BoardManagementDialogComponent implements OnInit {
         createCardTypes: board.createCardTypes,
         permittedCardTypes: board.allowedCardTypes,
         showOnSchedule: board.showOnSchedule ? 'true' : 'false',
+        hasAssigneeFilter: board.hasAssigneeFilter,
       });
 
       await this.loadCardStatuses(board);
@@ -158,6 +161,7 @@ export class BoardManagementDialogComponent implements OnInit {
       allowedCardTypes: this.permittedCardTypes.value ?? [],
       createCardTypes: this.createCardTypes.value ?? [],
       showOnSchedule: this.showOnSchedule.value === 'true',
+      hasAssigneeFilter: this.hasAssigneeFilter.value ?? false,
     };
 
     if (this.isEdit) {

alcs-frontend/src/app/features/admin/board-management/board-management-dialog/board-management-dialog.component.ts

@@ -84,7 +84,9 @@ <h4>Primary Contact Information</h4>
       <div class="subheading2 grid-1">Authorization Letter(s)</div>
       <div class="grid-double">
         <div *ngFor="let file of authorizationLetters">
-          <a (click)="openFile(file)" data-testid="authorization-letter">{{ file.fileName }}</a>
+          <a routerLink="/document/{{ file.documentUuid }}" target="_blank" data-testid="authorization-letter">{{
+            file.fileName
+          }}</a>
         </div>
       </div>
     </ng-container>
@@ -229,7 +231,7 @@ <h4>Optional Documents</h4>
 
       <ng-container *ngFor="let file of otherFiles">
         <div class="grid-1" data-testid="optional-document-file-name">
-          <a (click)="openFile(file)">{{ file.fileName }}</a>
+          <a routerLink="/document/{{ file.documentUuid }}" target="_blank">{{ file.fileName }}</a>
         </div>
         <div class="grid-2" data-testid="optional-document-type">
           {{ file.type?.label }}

alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.html

@@ -13,6 +13,7 @@ import { RosoDetailsComponent } from './roso-details/roso-details.component';
 import { SubdDetailsComponent } from './subd-details/subd-details.component';
 import { TurDetailsComponent } from './tur-details/tur-details.component';
 import { ExclDetailsComponent } from './excl-details/excl-details.component';
+import { RouterModule } from '@angular/router';
 
 @NgModule({
   declarations: [
@@ -29,7 +30,7 @@ import { ExclDetailsComponent } from './excl-details/excl-details.component';
     InclDetailsComponent,
     CoveDetailsComponent,
   ],
-  imports: [CommonModule, SharedModule],
+  imports: [CommonModule, SharedModule, RouterModule],
   exports: [ApplicationDetailsComponent],
 })
 export class ApplicationDetailsModule {}

alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.module.ts

@@ -45,7 +45,7 @@
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
-    <a *ngFor="let map of proposalMap" (click)="openFile(map)">
+    <a *ngFor="let map of proposalMap" routerLink="/document/{{ map.documentUuid }}" target="_blank">
       {{ map.fileName }}
     </a>
     <app-no-data *ngIf="proposalMap.length === 0"></app-no-data>
@@ -62,7 +62,7 @@
   <div class="subheading2 grid-1">Draft Covenant</div>
   <div class="grid-double">
     <div *ngFor="let file of srwTerms">
-      <a (click)="openFile(file)">
+      <a routerLink="/document/{{ file.documentUuid }}" target="_blank">
         {{ file.fileName }}
       </a>
     </div>