Skip to content

Commit 1116a13

Browse files
trslatertrslater
authored
Merge pull request #2293 from bcgov/feature/ALCS-2542
ALCS-2542: Implement new inline document links and replace all ALCS links
2 parents 68bb05f + 1c25a12 commit 1116a13

File tree

55 files changed

+318
-90
lines changed

Some content is hidden

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

55 files changed

+318
-90
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,20 @@ import { ProvisionComponent } from './features/provision/provision.component';
77
import { AuthGuard } from './services/authentication/auth.guard';
88
import { ALL_ROLES, ROLES } from './services/authentication/authentication.service';
99
import { HasRolesGuard } from './services/authentication/hasRoles.guard';
10+
import { DocumentFileLoader } from './shared/document-file-loader/document-file-loader.component';
1011

1112
export const ROLES_ALLOWED_APPLICATIONS = [ROLES.ADMIN, ROLES.LUP, ROLES.APP_SPECIALIST, ROLES.GIS, ROLES.SOIL_OFFICER];
1213
export const ROLES_ALLOWED_BOARDS = ROLES_ALLOWED_APPLICATIONS;
1314

1415
const routes: Routes = [
16+
{
17+
path: 'document/:uuid',
18+
canActivate: [HasRolesGuard],
19+
data: {
20+
roles: ROLES_ALLOWED_APPLICATIONS,
21+
},
22+
component: DocumentFileLoader,
23+
},
1524
{
1625
path: 'board',
1726
canActivate: [HasRolesGuard],

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ <h4>Primary Contact Information</h4>
8484
<div class="subheading2 grid-1">Authorization Letter(s)</div>
8585
<div class="grid-double">
8686
<div *ngFor="let file of authorizationLetters">
87-
<a (click)="openFile(file)" data-testid="authorization-letter">{{ file.fileName }}</a>
87+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank" data-testid="authorization-letter">{{
88+
file.fileName
89+
}}</a>
8890
</div>
8991
</div>
9092
</ng-container>
@@ -229,7 +231,7 @@ <h4>Optional Documents</h4>
229231

230232
<ng-container *ngFor="let file of otherFiles">
231233
<div class="grid-1" data-testid="optional-document-file-name">
232-
<a (click)="openFile(file)">{{ file.fileName }}</a>
234+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">{{ file.fileName }}</a>
233235
</div>
234236
<div class="grid-2" data-testid="optional-document-type">
235237
{{ file.type?.label }}

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

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

1718
@NgModule({
1819
declarations: [
@@ -29,7 +30,7 @@ import { ExclDetailsComponent } from './excl-details/excl-details.component';
2930
InclDetailsComponent,
3031
CoveDetailsComponent,
3132
],
32-
imports: [CommonModule, SharedModule],
33+
imports: [CommonModule, SharedModule, RouterModule],
3334
exports: [ApplicationDetailsComponent],
3435
})
3536
export class ApplicationDetailsModule {}

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

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

4646
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
4747
<div class="grid-double">
48-
<a *ngFor="let map of proposalMap" (click)="openFile(map)">
48+
<a *ngFor="let map of proposalMap" routerLink="/document/{{ map.documentUuid }}" target="_blank">
4949
{{ map.fileName }}
5050
</a>
5151
<app-no-data *ngIf="proposalMap.length === 0"></app-no-data>
@@ -62,7 +62,7 @@
6262
<div class="subheading2 grid-1">Draft Covenant</div>
6363
<div class="grid-double">
6464
<div *ngFor="let file of srwTerms">
65-
<a (click)="openFile(file)">
65+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
6666
{{ file.fileName }}
6767
</a>
6868
</div>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828

2929
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
3030
<div class="grid-double">
31-
<a *ngFor="let file of proposalMap" (click)="openFile(file)">
31+
<a *ngFor="let file of proposalMap" routerLink="/document/{{ file.documentUuid }}" target="_blank">
3232
{{ file.fileName }}
3333
</a>
3434
</div>
3535

3636
<div class="subheading2 grid-1">Notice of Public Hearing (Advertisement)</div>
3737
<div class="grid-double">
3838
<div *ngFor="let file of noticeOfPublicHearing">
39-
<a (click)="openFile(file)">
39+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
4040
{{ file.fileName }}
4141
</a>
4242
</div>
@@ -45,7 +45,7 @@
4545
<div class="subheading2 grid-1">Proof of Signage</div>
4646
<div class="grid-double">
4747
<div *ngFor="let file of proofOfSignage">
48-
<a (click)="openFile(file)">
48+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
4949
{{ file.fileName }}
5050
</a>
5151
</div>
@@ -54,7 +54,7 @@
5454
<div class="subheading2 grid-1">Report of Public Hearing</div>
5555
<div class="grid-double">
5656
<div *ngFor="let file of reportOfPublicHearing">
57-
<a (click)="openFile(file)">
57+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
5858
{{ file.fileName }}
5959
</a>
6060
</div>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
2525
<div class="grid-double">
2626
<div *ngFor="let file of proposalMap">
27-
<a (click)="openFile(file)">
27+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
2828
{{ file.fileName }}
2929
</a>
3030
</div>
@@ -43,7 +43,7 @@
4343
<div class="subheading2 grid-1">Notice of Public Hearing (Advertisement)</div>
4444
<div class="grid-double">
4545
<div *ngFor="let file of noticeOfPublicHearing">
46-
<a (click)="openFile(file)">
46+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
4747
{{ file.fileName }}
4848
</a>
4949
</div>
@@ -52,7 +52,7 @@
5252
<div class="subheading2 grid-1">Proof of Signage</div>
5353
<div class="grid-double">
5454
<div *ngFor="let file of proofOfSignage">
55-
<a (click)="openFile(file)">
55+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
5656
{{ file.fileName }}
5757
</a>
5858
</div>
@@ -61,7 +61,7 @@
6161
<div class="subheading2 grid-1">Report of Public Hearing</div>
6262
<div class="grid-double">
6363
<div *ngFor="let file of reportOfPublicHearing">
64-
<a (click)="openFile(file)">
64+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
6565
{{ file.fileName }}
6666
</a>
6767
</div>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
170170
<div class="grid-double">
171171
<div *ngFor="let file of proposalMap">
172-
<a (click)="openFile(file)">
172+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
173173
{{ file.fileName }}
174174
</a>
175175
</div>
@@ -178,7 +178,7 @@
178178
<div class="subheading2 grid-1">Detailed Building Plan(s)</div>
179179
<div class="grid-double">
180180
<div *ngFor="let file of buildingPlans">
181-
<a (click)="openFile(file)">
181+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
182182
{{ file.fileName }}
183183
</a>
184184
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
1919
<div class="grid-double">
2020
<div *ngFor="let file of proposalMap">
21-
<a (click)="openFile(file)">
21+
<a routerLink="/document/{{ file.documentUuid }}" target="_blank">
2222
{{ file.fileName }}
2323
</a>
2424
</div>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ <h5 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}</h5>
6565
[attr.data-testid]="'parcel-' + (parcelInd + 1) + '-certificate-of-title'"
6666
>
6767
<div *ngIf="parcel.certificateOfTitle">
68-
<a (click)="openFile(parcel.certificateOfTitle)">{{ parcel.certificateOfTitle.fileName }}</a>
68+
<a routerLink="/document/{{ parcel.certificateOfTitle.documentUuid }}" target="_blank">{{
69+
parcel.certificateOfTitle.fileName
70+
}}</a>
6971
</div>
7072
<app-no-data *ngIf="!parcel.certificateOfTitle"></app-no-data>
7173
</div>
@@ -130,7 +132,11 @@ <h5>Government Parcel Contact</h5>
130132
{{ owner.email }}
131133
</div>
132134
<div [attr.data-testid]="'parcel-' + (parcelInd + 1) + '-owner-corporate-summary'">
133-
<a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">
135+
<a
136+
*ngIf="owner.corporateSummary"
137+
routerLink="/document/{{ owner.corporateSummary.documentUuid }}"
138+
target="_blank"
139+
>
134140
{{ owner.corporateSummary.fileName }}
135141
</a>
136142
<div class="no-data" *ngIf="!owner.corporateSummary">

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

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

227227
<div class="subheading2 grid-1">Proposal Map / Site Plan</div>
228228
<div class="grid-double">
229-
<a *ngFor="let file of proposalMap" (click)="openFile(file)">
229+
<a *ngFor="let file of proposalMap" routerLink="/document/{{ file.documentUuid }}" target="_blank">
230230
{{ file.fileName }}
231231
</a>
232232
</div>
@@ -235,15 +235,15 @@
235235
<div class="subheading2 grid-1">Cross Sections</div>
236236
<div class="grid-double multiple-documents">
237237
<div>
238-
<a *ngFor="let file of crossSections" (click)="openFile(file)">
238+
<a *ngFor="let file of crossSections" routerLink="/document/{{ file.documentUuid }}" target="_blank">
239239
{{ file.fileName }}
240240
</a>
241241
</div>
242242
</div>
243243

244244
<div class="subheading2 grid-1">Reclamation Plan</div>
245245
<div class="grid-double multiple-documents">
246-
<a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
246+
<a *ngFor="let file of reclamationPlans" routerLink="/document/{{ file.documentUuid }}" target="_blank">
247247
{{ file.fileName }}
248248
</a>
249249
</div>
@@ -252,7 +252,7 @@
252252
<ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
253253
<div class="subheading2 grid-1">Detailed Building Plan(s)</div>
254254
<div class="grid-double multiple-documents">
255-
<a *ngFor="let file of buildingPlans" (click)="openFile(file)">
255+
<a *ngFor="let file of buildingPlans" routerLink="/document/{{ file.documentUuid }}" target="_blank">
256256
{{ file.fileName }}
257257
</a>
258258
<app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
@@ -278,7 +278,7 @@
278278

279279
<div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="subheading2 grid-1">Notice of Work</div>
280280
<div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double multiple-documents">
281-
<a *ngFor="let file of noticeOfWork" (click)="openFile(file)">
281+
<a *ngFor="let file of noticeOfWork" routerLink="/document/{{ file.documentUuid }}" target="_blank">
282282
{{ file.fileName }}
283283
</a>
284284
</div>

0 commit comments

Comments
 (0)