Merge pull request #1748 from bcgov/develop

Deployment PR - 1225
bcgov · Jul 11, 2024 · 3d1406f · 3d1406f
2 parents 3668666 + c168dc7
commit 3d1406f
Show file tree

Hide file tree

Showing 168 changed files with 1,151 additions and 411 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -8,6 +8,16 @@ on:
         options:
           - https://alcs-dev-portal.apps.silver.devops.gov.bc.ca
           - https://alcs-test-portal.apps.silver.devops.gov.bc.ca
+      alcsBaseUrl:
+        type: choice
+        description: ALCS Base URL
+        options:
+          - https://alcs-dev.apps.silver.devops.gov.bc.ca
+          - https://alcs-test.apps.silver.devops.gov.bc.ca
+      branch:
+        type: string
+        description: 'Branch to checkout'
+        default: 'develop'
   schedule:
     # 5:23 am daily
     - cron: "23 5 * * *"
@@ -19,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           # This does not need to align with URL
-          ref: develop
+          ref: ${{ inputs.branch || 'develop' }}
       - uses: actions/setup-node@v4
       - name: Install dependencies
         working-directory: ./e2e
@@ -32,6 +42,7 @@ jobs:
         env:
           # Default to dev
           PORTAL_BASE_URL: ${{ inputs.portalBaseUrl || 'https://alcs-dev-portal.apps.silver.devops.gov.bc.ca' }}
+          ALCS_BASE_URL: ${{ inputs.alcsBaseUrl || 'https://alcs-dev.apps.silver.devops.gov.bc.ca' }}
           BCEID_BASIC_USERNAME: ${{ secrets.BCEID_BASIC_USERNAME }}
           BCEID_BASIC_PASSWORD: ${{ secrets.BCEID_BASIC_PASSWORD }}
         run: npx playwright test

diff --git a/alcs-frontend/package-lock.json b/alcs-frontend/package-lock.json
diff --git a/alcs-frontend/package.json b/alcs-frontend/package.json
@@ -30,6 +30,7 @@
     "@bcgov/bc-sans": "^2.1.0",
     "@ng-matero/extensions": "^17.2.0",
     "@ng-select/ng-option-highlight": "^12.0.6",
+    "@types/validator": "^13.12.0",
     "angular-mentions": "^1.5.0",
     "jwt-decode": "^4.0.0",
     "moment": "^2.30.1",
@@ -38,6 +39,7 @@
     "rxjs": "~7.8.1",
     "source-map-support": "^0.5.21",
     "tslib": "^2.6.2",
+    "validator": "^13.12.0",
     "zone.js": "~0.14.4"
   },
   "devDependencies": {

diff --git a/...end/src/app/features/admin/local-government/dialog/local-government-dialog.component.html b/...end/src/app/features/admin/local-government/dialog/local-government-dialog.component.html
@@ -60,8 +60,10 @@ <h4>{{ title }} Government</h4>
           [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
           [matChipInputAddOnBlur]="true"
           (matChipInputTokenEnd)="addEmail($event)"
+          [formControl]="email"
         />
       </mat-form-field>
+      <mat-error *ngIf="email.invalid"><mat-icon>warning</mat-icon>&nbsp;Please type a valid email address</mat-error>
     </div>
 
     <div>

diff --git a/...end/src/app/features/admin/local-government/dialog/local-government-dialog.component.scss b/...end/src/app/features/admin/local-government/dialog/local-government-dialog.component.scss
@@ -18,4 +18,10 @@
   .mat-mdc-form-field-infix {
     display: flex;
   }
+
+  mat-error {
+    display: flex;
+    font-size: 15px;
+    font-weight: bold;
+  }
 }
diff --git a/...ntend/src/app/features/admin/local-government/dialog/local-government-dialog.component.ts b/...ntend/src/app/features/admin/local-government/dialog/local-government-dialog.component.ts
@@ -7,6 +7,8 @@ import { LocalGovernmentDto } from '../../../../services/admin-local-government/
 import { AdminLocalGovernmentService } from '../../../../services/admin-local-government/admin-local-government.service';
 import { ApplicationRegionDto } from '../../../../services/application/application-code.dto';
 import { ApplicationService } from '../../../../services/application/application.service';
+import { FormControl } from '@angular/forms';
+import { strictEmailValidator } from '../../../../shared/validators/email-validator';
 
 @Component({
   selector: 'app-admin-local-government-dialog',
@@ -29,6 +31,8 @@ export class LocalGovernmentDialogComponent implements OnInit, OnDestroy {
   };
   regions: ApplicationRegionDto[] = [];
 
+  email = new FormControl<string | null>(null, [strictEmailValidator]);
+
   isLoading = false;
 
   constructor(
@@ -48,7 +52,7 @@ export class LocalGovernmentDialogComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    if (this.data) {
+    if (Object.keys(this.data).length !== 0) {
       this.model = {
         ...this.data,
         isFirstNation: this.data.isFirstNation ? 'true' : 'false',
@@ -100,6 +104,10 @@ export class LocalGovernmentDialogComponent implements OnInit, OnDestroy {
   }
 
   addEmail(event: MatChipInputEvent): void {
+    if (this.email.invalid) {
+      return;
+    }
+
     const value = (event.value || '').trim();
     if (value) {
       this.model.emails.push(value);

diff --git a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.html b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.html
@@ -1,20 +1,17 @@
-<div class="applicant-info">
-  <div *ngIf="application && submission">
-    <div *ngIf="submission.returnedComment" class="comment-container">
-      <div><strong>Comment for Applicant</strong></div>
-      {{ submission.returnedComment }}
-    </div>
-
-    <app-application-details
-      [submission]="submission"
-      [fileNumber]="fileNumber"
-      [applicationType]="application.type.code"
-      [isSubmittedToAlc]="isSubmittedToAlc"
-      [wasSubmittedToLfng]="wasSubmittedToLfng"
-      [showEdit]="true"
-    ></app-application-details>
-  </div>
-  <div class="center">
-    <mat-spinner *ngIf="!application || !submission"></mat-spinner>
+<div *ngIf="application && submission">
+  <div *ngIf="submission.returnedComment" class="comment-container">
+    <div><strong>Comment for Applicant</strong></div>
+    {{ submission.returnedComment }}
   </div>
+  <app-application-details
+    [submission]="submission"
+    [fileNumber]="fileNumber"
+    [applicationType]="application.type.code"
+    [isSubmittedToAlc]="isSubmittedToAlc"
+    [wasSubmittedToLfng]="wasSubmittedToLfng"
+    [showEdit]="true"
+  ></app-application-details>
+</div>
+<div class="center">
+  <mat-spinner *ngIf="!application || !submission"></mat-spinner>
 </div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.scss b/alcs-frontend/src/app/features/application/applicant-info/applicant-info.component.scss
@@ -1,11 +1,5 @@
 @use '../../../../styles/colors';
 
-.applicant-info {
-  & > div {
-    margin: 12px 0;
-  }
-}
-
 .subheading1 {
   margin-bottom: 4px !important;
 }

diff --git a/...eatures/application/applicant-info/application-details/application-details.component.html b/...eatures/application/applicant-info/application-details/application-details.component.html
@@ -1,3 +1,6 @@
+<div class="split header">
+  <h3>Applicant Info</h3>  
+</div>
 <section>
   <app-parcel *ngIf="submission" [application]="submission"></app-parcel>
   <div class="review-table edit-section">
@@ -9,7 +12,7 @@
   </div>
 </section>
 <section>
-  <h3>Other Owned Parcels</h3>
+  <h4>Other Owned Parcels</h4>
   <div *ngIf="submission" class="review-table">
     <div class="subheading2 grid-1">
       Do any of the land owners added previously own or lease other parcels that might inform this application process?
@@ -39,7 +42,7 @@ <h3>Other Owned Parcels</h3>
   </div>
 </section>
 <section>
-  <h3>Primary Contact Information</h3>
+  <h4>Primary Contact Information</h4>
   <div *ngIf="submission" class="review-table">
     <div class="subheading2 grid-1">Type</div>
     <div class="grid-double" data-testid="primary-contact-type">
@@ -93,10 +96,10 @@ <h3>Primary Contact Information</h3>
   </div>
 </section>
 <section *ngIf="showFullApp">
-  <h3>Land Use</h3>
+  <h4>Land Use</h4>
   <div *ngIf="submission" class="review-table">
     <div class="full-width">
-      <h4>Land Use of Parcel(s) under Application</h4>
+      <h5>Land Use of Parcel(s) under Application</h5>
     </div>
     <div class="subheading2 grid-1">Describe all agriculture that currently takes place on the parcel(s).</div>
     <div class="grid-double" data-testid="parcels-agriculture-description">
@@ -111,7 +114,7 @@ <h4>Land Use of Parcel(s) under Application</h4>
       {{ submission.parcelsNonAgricultureUseDescription }}
     </div>
     <div class="full-width">
-      <h4>Land Use of Adjacent Parcels</h4>
+      <h5>Land Use of Adjacent Parcels</h5>
     </div>
     <div class="adjacent-parcels full-width">
       <div class="grid-1 subheading2"></div>
@@ -154,7 +157,7 @@ <h4>Land Use of Adjacent Parcels</h4>
   </div>
 </section>
 <section *ngIf="showFullApp">
-  <h3>Proposal</h3>
+  <h4>Proposal</h4>
   <app-nfu-details
     *ngIf="submission && applicationType === 'NFUP'"
     [applicationSubmission]="submission"
@@ -217,7 +220,7 @@ <h3>Proposal</h3>
   </div>
 </section>
 <section *ngIf="showFullApp">
-  <h3>Optional Documents</h3>
+  <h4>Optional Documents</h4>
   <div *ngIf="submission" class="review-table">
     <div class="other-attachments full-width">
       <div class="grid-1 subheading2">File Name</div>

diff --git a/...eatures/application/applicant-info/application-details/application-details.component.scss b/...eatures/application/applicant-info/application-details/application-details.component.scss
@@ -68,7 +68,6 @@
   .adjacent-parcels {
     display: grid;
     grid-template-columns: 1fr 1fr 2fr;
-    overflow-x: auto;
     grid-column-gap: 36px;
     grid-row-gap: 12px;
 
@@ -118,3 +117,7 @@
 .edit-section {
   margin-top: -40px;
 }
+
+.header {
+  margin-bottom: 42px;
+}
diff --git a/.../app/features/application/applicant-info/application-details/parcel/parcel.component.html b/.../app/features/application/applicant-info/application-details/parcel/parcel.component.html
@@ -1,6 +1,6 @@
-<h3 class="flex-item">
+<h4 class="flex-item">
   {{ pageTitle }}
-</h3>
+</h4>
 
 <div class="review-table">
   <div *ngIf="!parcels" class="center full-width">
@@ -9,7 +9,7 @@ <h3 class="flex-item">
 
   <ng-container *ngFor="let parcel of parcels; let parcelInd = index">
     <div class="full-width flex-space-between-wrap">
-      <h4 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}</h4>
+      <h5 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}</h5>
     </div>
     <div class="subheading2 grid-1">Ownership Type</div>
     <div class="grid-double" [attr.data-testid]="'parcel-' + (parcelInd + 1) + '-type'">

diff --git a/alcs-frontend/src/app/features/application/application.component.html b/alcs-frontend/src/app/features/application/application.component.html
@@ -6,6 +6,8 @@
       [reconsiderations]="reconsiderations"
       [showStatus]="true"
       [submissionStatusService]="applicationStatusService"
+      [applicationDetailService]="applicationDetailService"
+      [applicationSubmissionService]="applicationSubmissionService"
       days="Business Days"
       heading="Application"
     ></app-details-header>

diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts
@@ -188,8 +188,8 @@ export class ApplicationComponent implements OnInit, OnDestroy {
   showSubmittedToLfngMenuItems = false;
 
   constructor(
-    private applicationDetailService: ApplicationDetailService,
-    private applicationSubmissionService: ApplicationSubmissionService,
+    public applicationDetailService: ApplicationDetailService,
+    public applicationSubmissionService: ApplicationSubmissionService,
     private reconsiderationService: ApplicationReconsiderationService,
     private modificationService: ApplicationModificationService,
     private route: ActivatedRoute,

diff --git a/...p/features/application/decision/decision-v2/decision-component/basic/basic.component.html b/...p/features/application/decision/decision-v2/decision-component/basic/basic.component.html
@@ -8,5 +8,6 @@
     [value]="component.alrArea?.toString()"
     (save)="onSaveAlrArea($event)"
     [decimals]="5"
+    [nonZeroEmptyValidation]="nonZeroEmptyValidation"
   ></app-inline-number>
 </div>
diff --git a/...app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts b/...app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts
@@ -9,6 +9,7 @@ import { ApplicationDecisionComponentDto } from '../../../../../../services/appl
 export class BasicComponent {
   @Input() component!: ApplicationDecisionComponentDto;
   @Input() fillRow = false;
+  @Input() nonZeroEmptyValidation = false;
   @Output() saveAlrArea = new EventEmitter<string | null>();
 
   constructor() {}