Merge pull request #927 from bcgov/feature/ALCS-1098

Bug Fixes Pt 2

portal-frontend/src/app/features/applications/edit-submission/select-government/select-government.component.ts

@@ -47,6 +47,10 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit,
       }
     });
 
+    if (this.draftMode) {
+      this.localGovernment.disable();
+    }
+
     this.filteredLocalGovernments = this.localGovernment.valueChanges.pipe(
       startWith(''),
       map((value) => this.filter(value || ''))

portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.html

@@ -28,7 +28,7 @@ <h4>Application Documents</h4>
     <ng-container matColumnDef='actions'>
       <th mat-header-cell *matHeaderCellDef>Actions</th>
       <td mat-cell *matCellDef='let element'>
-        <button mat-icon-button (click)='openFile(element.uuid)'>
+        <button mat-icon-button (click)='downloadFile(element.uuid)'>
           <mat-icon>file_download</mat-icon>
         </button>
       </td>

portal-frontend/src/app/features/applications/view-submission/alc-review/submission-documents/submission-documents.component.ts

@@ -36,6 +36,21 @@ export class SubmissionDocumentsComponent implements OnInit, OnDestroy {
     }
   }
 
+  async downloadFile(uuid: string) {
+    const res = await this.applicationDocumentService.downloadFile(uuid);
+    if (res) {
+      const downloadLink = document.createElement('a');
+      downloadLink.href = res.url;
+      downloadLink.download = res.url.split('/').pop()!;
+      if (window.webkitURL == null) {
+        downloadLink.onclick = (event: MouseEvent) => document.body.removeChild(<Node>event.target);
+        downloadLink.style.display = 'none';
+        document.body.appendChild(downloadLink);
+      }
+      downloadLink.click();
+    }
+  }
+
   ngOnDestroy(): void {
     this.$destroy.next();
     this.$destroy.complete();

portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.html

@@ -45,11 +45,6 @@ <h2>Government</h2>
   submit, you will need to contact the ALC directly: &nbsp;<a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a
   >&nbsp;/&nbsp;<a href="tel:236-468-3342">236-468-3342</a>
 </app-warning-banner>
-<app-warning-banner *ngIf="selectedOwnGovernment" class="full-row">
-  You're logged in with a Business BCeID that is associated with the government selected above. You will have the
-  opportunity to complete the local or first nation government review form immediately after this notice of intent is
-  submitted.
-</app-warning-banner>
 <p>
   Please Note: If your Local or First Nation Government is not listed, please contact the ALC directly.
   <a href="mailto:ALC.Portal@gov.bc.ca">ALC.Portal@gov.bc.ca</a> / <a href="tel:236-468-3342">236-468-3342</a>

portal-frontend/src/app/features/notice-of-intents/edit-submission/select-government/select-government.component.ts

@@ -21,7 +21,6 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit,
 
   localGovernment = new FormControl<string | any>('', [Validators.required]);
   showWarning = false;
-  selectedOwnGovernment = false;
   selectGovernmentUuid = '';
   localGovernments: LocalGovernmentDto[] = [];
   filteredLocalGovernments!: Observable<LocalGovernmentDto[]>;
@@ -74,8 +73,6 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit,
         } else {
           this.localGovernment.setErrors({ invalid: localGovernment.hasGuid });
         }
-
-        this.selectedOwnGovernment = localGovernment.matchesUserGuid;
       }
     }
   }
@@ -141,7 +138,6 @@ export class SelectGovernmentComponent extends StepComponent implements OnInit,
       if (!lg.hasGuid) {
         this.localGovernment.setErrors({ invalid: true });
       }
-      this.selectedOwnGovernment = lg.matchesUserGuid;
     }
   }
 }

portal-frontend/src/app/services/application-document/application-document.service.ts

@@ -54,6 +54,16 @@ export class ApplicationDocumentService {
     return undefined;
   }
 
+  async downloadFile(fileUuid: string) {
+    try {
+      return await firstValueFrom(this.httpClient.get<{ url: string }>(`${this.serviceUrl}/${fileUuid}/download`));
+    } catch (e) {
+      console.error(e);
+      this.toastService.showErrorToast('Failed to download the document, please try again');
+    }
+    return undefined;
+  }
+
   async deleteExternalFile(fileUuid: string) {
     try {
       this.overlayService.showSpinner();

services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts

@@ -265,6 +265,10 @@ export class ApplicationDecisionProfile extends AutomapperProfile {
         mapper,
         ApplicationDecision,
         ApplicationPortalDecisionDto,
+        forMember(
+          (ad) => ad.date,
+          mapFrom((a) => a.date?.getTime()),
+        ),
         forMember(
           (a) => a.reconsiders,
           mapFrom((dec) =>

services/apps/alcs/src/portal/application-decision/application-decision.dto.ts

@@ -9,7 +9,6 @@ export class ApplicationPortalDecisionDto {
   @AutoMap()
   uuid: string;
 
-  @AutoMap()
   date: number;
 
   @AutoMap(() => ApplicationDecisionOutcomeCodeDto)

services/apps/alcs/src/portal/application-document/application-document.controller.spec.ts

@@ -117,7 +117,7 @@ describe('ApplicationDocumentController', () => {
     );
   });
 
-  it('should call through for download', async () => {
+  it('should call through for open', async () => {
     const fakeUrl = 'fake-url';
     appDocumentService.getInlineUrl.mockResolvedValue(fakeUrl);
     appDocumentService.get.mockResolvedValue(mockDocument);
@@ -131,6 +131,20 @@ describe('ApplicationDocumentController', () => {
     expect(res.url).toEqual(fakeUrl);
   });
 
+  it('should call through for download', async () => {
+    const fakeUrl = 'fake-url';
+    appDocumentService.getDownloadUrl.mockResolvedValue(fakeUrl);
+    appDocumentService.get.mockResolvedValue(mockDocument);
+
+    const res = await controller.download('fake-uuid', {
+      user: {
+        entity: {},
+      },
+    });
+
+    expect(res.url).toEqual(fakeUrl);
+  });
+
   it('should call out to service to attach external document', async () => {
     const user = { user: { entity: 'Bruce' } };
     const fakeUuid = 'fakeUuid';

services/apps/alcs/src/portal/application-document/application-document.controller.ts

@@ -73,6 +73,20 @@ export class ApplicationDocumentController {
     return { url };
   }
 
+  @Get('/:uuid/download')
+  async download(@Param('uuid') fileUuid: string, @Req() req) {
+    const document = await this.applicationDocumentService.get(fileUuid);
+
+    //TODO: How do we know which documents applicant can access?
+    // await this.applicationSubmissionService.verifyAccess(
+    //   document.applicationUuid,
+    //   req.user.entity,
+    // );
+
+    const url = await this.applicationDocumentService.getDownloadUrl(document);
+    return { url };
+  }
+
   @Patch('/application/:fileNumber')
   async update(
     @Param('fileNumber') fileNumber: string,