Skip to content

Commit 59bc5f1

Browse files
trslatertrslater
authored
Merge pull request #2335 from bcgov/feature/2309
2309: Apply new document open system to portal/public search
2 parents 930274f + 50e6b03 commit 59bc5f1

File tree

97 files changed

+344
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+344
-226
lines changed

‎portal-frontend/src/app/app-routing.module.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ import { LoginComponent } from './features/login/login.component';
55
import { MaintenanceComponent } from './features/maintenance/maintenance.component';
66
import { AlcsAuthGuard } from './services/authentication/alcs-auth.guard';
77
import { AuthGuard } from './services/authentication/auth.guard';
8+
import { DocumentFileLoader } from './shared/document-file-loader/document-file-loader.component';
89

910
const routes: Routes = [
11+
{
12+
path: 'document/:uuid',
13+
canActivate: [AuthGuard],
14+
component: DocumentFileLoader,
15+
},
1016
{
1117
title: 'Login',
1218
path: 'login',

‎portal-frontend/src/app/features/applications/application-details/application-details.component.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ <h3>3. Primary Contact</h3>
9191
[showRequired]="showErrors && needsAuthorizationLetter"
9292
></app-no-data>
9393
<div *ngFor="let file of authorizationLetters">
94-
<a (click)="openFile(file)" data-testid="authorization-letter">{{ file.fileName }}</a>
94+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank" data-testid="authorization-letter">{{
95+
file.fileName
96+
}}</a>
9597
</div>
9698
<app-validation-error *ngIf="!needsAuthorizationLetter && authorizationLetters.length > 0">
9799
Authorization letters are not required, please remove them
@@ -321,7 +323,7 @@ <h3>7. Optional Documents</h3>
321323

322324
<ng-container *ngFor="let file of otherFiles">
323325
<div class="grid-1" data-testid="optional-document-file-name">
324-
<a (click)="openFile(file)">{{ file.fileName }}</a>
326+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">{{ file.fileName }}</a>
325327
</div>
326328
<div class="grid-2" data-testid="optional-document-type">
327329
{{ file.type?.label }}
@@ -337,11 +339,11 @@ <h3>7. Optional Documents</h3>
337339
</div>
338340
</div>
339341
<div *ngIf="isMobile">
340-
<app-optional-attachments-mobile-card
341-
*ngFor="let file of otherFiles; let last = last"
342+
<app-optional-attachments-mobile-card
343+
*ngFor="let file of otherFiles; let last = last"
342344
[file]="file"
343345
[isLast]="last"
344-
(fileClicked)="openFile(file)">
346+
>
345347
</app-optional-attachments-mobile-card>
346348
<app-no-data *ngIf="otherFiles.length === 0" [showRequired]="false"></app-no-data>
347349
</div>

‎portal-frontend/src/app/features/applications/application-details/application-details.module.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { RosoDetailsComponent } from './roso-details/roso-details.component';
1414
import { SubdDetailsComponent } from './subd-details/subd-details.component';
1515
import { TurDetailsComponent } from './tur-details/tur-details.component';
1616
import { ExclDetailsComponent } from './excl-details/excl-details.component';
17+
import { RouterModule } from '@angular/router';
1718

1819
@NgModule({
1920
declarations: [
@@ -30,7 +31,7 @@ import { ExclDetailsComponent } from './excl-details/excl-details.component';
3031
InclDetailsComponent,
3132
CoveDetailsComponent,
3233
],
33-
imports: [CommonModule, SharedModule, NgxMaskPipe],
34+
imports: [CommonModule, SharedModule, NgxMaskPipe, RouterModule],
3435
exports: [ApplicationDetailsComponent],
3536
})
3637
export class ApplicationDetailsModule {}

‎portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
5454
<div class="grid-double">
55-
<a *ngFor="let map of proposalMap" (click)="openFile(map)">
55+
<a *ngFor="let map of proposalMap" routerLink="/document/{{ map.documentUuid }}" target="_blank">
5656
{{ map.fileName }}
5757
</a>
5858
<app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>
@@ -70,7 +70,7 @@
7070
<div class="subheading2 grid-1">Draft Covenant</div>
7171
<div class="grid-double">
7272
<div *ngFor="let file of srwTerms">
73-
<a (click)="openFile(file)">
73+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
7474
{{ file.fileName }}
7575
</a>
7676
</div>

‎portal-frontend/src/app/features/applications/application-details/excl-details/excl-details.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
3939
<div class="grid-double">
40-
<a *ngFor="let map of proposalMap" (click)="openFile(map)">
40+
<a *ngFor="let map of proposalMap" routerLink="/document/{{ map.documentUuid }}" target="_blank">
4141
{{ map.fileName }}
4242
</a>
4343
<app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>
@@ -46,7 +46,7 @@
4646
<div class="subheading2 grid-1">Notice of Public Hearing (Advertisement)</div>
4747
<div class="grid-double">
4848
<div *ngFor="let file of noticeOfPublicHearing">
49-
<a (click)="openFile(file)">
49+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
5050
{{ file.fileName }}
5151
</a>
5252
</div>
@@ -56,7 +56,7 @@
5656
<div class="subheading2 grid-1">Proof of Signage</div>
5757
<div class="grid-double">
5858
<div *ngFor="let file of proofOfSignage">
59-
<a (click)="openFile(file)">
59+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
6060
{{ file.fileName }}
6161
</a>
6262
</div>
@@ -66,7 +66,7 @@
6666
<div class="subheading2 grid-1">Report of Public Hearing</div>
6767
<div class="grid-double">
6868
<div *ngFor="let file of reportOfPublicHearing">
69-
<a (click)="openFile(file)">
69+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
7070
{{ file.fileName }}
7171
</a>
7272
</div>

‎portal-frontend/src/app/features/applications/application-details/incl-details/incl-details.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
2929
<div class="grid-double">
30-
<a *ngFor="let map of proposalMap" (click)="openFile(map)">
30+
<a *ngFor="let map of proposalMap" routerLink="/document/{{ map.documentUuid }}" target="_blank">
3131
{{ map.fileName }}
3232
</a>
3333
<app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>
@@ -52,7 +52,7 @@
5252
<div class="subheading2 grid-1">Notice of Public Hearing (Advertisement)</div>
5353
<div class="grid-double">
5454
<div *ngFor="let file of noticeOfPublicHearing">
55-
<a (click)="openFile(file)">
55+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
5656
{{ file.fileName }}
5757
</a>
5858
</div>
@@ -62,7 +62,7 @@
6262
<div class="subheading2 grid-1">Proof of Signage</div>
6363
<div class="grid-double">
6464
<div *ngFor="let file of proofOfSignage">
65-
<a (click)="openFile(file)">
65+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
6666
{{ file.fileName }}
6767
</a>
6868
</div>
@@ -72,7 +72,7 @@
7272
<div class="subheading2 grid-1">Report of Public Hearing</div>
7373
<div class="grid-double">
7474
<div *ngFor="let file of reportOfPublicHearing">
75-
<a (click)="openFile(file)">
75+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
7676
{{ file.fileName }}
7777
</a>
7878
</div>

‎portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,15 @@
234234

235235
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
236236
<div class="grid-double">
237-
<a *ngFor="let map of proposalMap" (click)="openFile(map)">
237+
<a *ngFor="let map of proposalMap" routerLink="/document/{{ map.documentUuid }}" target="_blank">
238238
{{ map.fileName }}
239239
</a>
240240
<app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>
241241
</div>
242242

243243
<div class="subheading2 grid-1">Detailed Building Plan(s)</div>
244244
<div class="grid-double">
245-
<a *ngFor="let plan of buildingPlans" (click)="openFile(plan)">
245+
<a *ngFor="let plan of buildingPlans" routerLink="/document/{{ plan.documentUuid }}" target="_blank">
246246
{{ plan.fileName }}
247247
</a>
248248
<app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>

‎portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</div>
2323
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
2424
<div class="grid-double">
25-
<a *ngFor="let map of proposalMap" (click)="openFile(map)">
25+
<a *ngFor="let map of proposalMap" routerLink="/document/{{ map.documentUuid }}" target="_blank">
2626
{{ map.fileName }}
2727
</a>
2828
<app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>

‎portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
9898
[attr.data-testid]="'parcel-' + (parcelInd + 1) + '-certificate-of-title'"
9999
>
100100
<div *ngIf="parcel.certificateOfTitle">
101-
<a (click)="onOpenFile(parcel.certificateOfTitle)">{{ parcel.certificateOfTitle.fileName }}</a>
101+
<a routerLink="/document/{{ parcel.certificateOfTitle.documentUuid }}" target="_blank">{{
102+
parcel.certificateOfTitle.fileName
103+
}}</a>
102104
</div>
103105
<app-no-data
104106
[showRequired]="showErrors && !!parcel.validation?.isCertificateRequired"
@@ -175,9 +177,12 @@ <h5>Government Parcel Contact</h5>
175177
{{ owner.email }}
176178
</div>
177179
<div [attr.data-testid]="'parcel-' + (parcelInd + 1) + '-owner-corporate-summary'">
178-
<a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary)">{{
179-
owner.corporateSummary.fileName
180-
}}</a>
180+
<a
181+
*ngIf="owner.corporateSummary"
182+
routerLink="/document/{{ owner.corporateSummary.documentUuid }}"
183+
target="_blank"
184+
>{{ owner.corporateSummary.fileName }}</a
185+
>
181186
<div class="no-data" *ngIf="!owner.corporateSummary">
182187
<div class="no-data-text">Not Applicable</div>
183188
</div>
@@ -186,12 +191,12 @@ <h5>Government Parcel Contact</h5>
186191
</div>
187192
<ng-container *ngIf="isMobile">
188193
<div class="subheading2">Land Owner(s)</div>
189-
<app-parcel-owner-mobile-card
194+
<app-parcel-owner-mobile-card
190195
*ngFor="let owner of parcel.owners; let last = last"
191196
[owner]="owner"
192197
[isLast]="last"
193198
[isReviewStep]="true"
194-
(openFileClicked)="onOpenFile(owner.corporateSummary!)">
199+
>
195200
</app-parcel-owner-mobile-card>
196201
</ng-container>
197202
<div class="full-width">

‎portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313

314314
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
315315
<div class="grid-double">
316-
<a *ngFor="let map of proposalMap" (click)="openFile(map)">
316+
<a *ngFor="let map of proposalMap" routerLink="/document/{{ map.documentUuid }}" target="_blank">
317317
{{ map.fileName }}
318318
</a>
319319
<app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>
@@ -322,15 +322,15 @@
322322
<ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
323323
<div class="subheading2 grid-1">Cross Sections</div>
324324
<div class="grid-double multiple-documents">
325-
<a *ngFor="let file of crossSections" (click)="openFile(file)">
325+
<a *ngFor="let file of crossSections" routerLink="/document/{{ file.documentUuid }}" target="_blank">
326326
{{ file.fileName }}
327327
</a>
328328
<app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
329329
</div>
330330

331331
<div class="subheading2 grid-1">Reclamation Plan</div>
332332
<div class="grid-double multiple-documents">
333-
<a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
333+
<a *ngFor="let file of reclamationPlans" routerLink="/document/{{ file.documentUuid }}" target="_blank">
334334
{{ file.fileName }}
335335
</a>
336336
<app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
@@ -340,7 +340,7 @@
340340
<ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
341341
<div class="subheading2 grid-1">Detailed Building Plan(s)</div>
342342
<div class="grid-double multiple-documents">
343-
<a *ngFor="let file of buildingPlans" (click)="openFile(file)">
343+
<a *ngFor="let file of buildingPlans" routerLink="/document/{{ file.documentUuid }}" target="_blank">
344344
{{ file.fileName }}
345345
</a>
346346
<app-no-data [showRequired]="showErrors" *ngIf="buildingPlans.length === 0"></app-no-data>
@@ -374,7 +374,7 @@
374374

375375
<div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="subheading2 grid-1">Notice of Work</div>
376376
<div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double multiple-documents">
377-
<a *ngFor="let file of noticeOfWork" (click)="openFile(file)">
377+
<a *ngFor="let file of noticeOfWork" routerLink="/document/{{ file.documentUuid }}" target="_blank">
378378
{{ file.fileName }}
379379
</a>
380380
<app-no-data [showRequired]="showErrors" *ngIf="noticeOfWork.length === 0"></app-no-data>

0 commit comments

Comments
 (0)